… | |
… | |
5 | |
5 | |
6 | use Scalar::Util (); |
6 | use Scalar::Util (); |
7 | use List::Util (); |
7 | use List::Util (); |
8 | |
8 | |
9 | use CFClient; |
9 | use CFClient; |
|
|
10 | use CFClient::Texture; |
10 | |
11 | |
11 | our ($FOCUS, $HOVER, $GRAB); # various widgets |
12 | our ($FOCUS, $HOVER, $GRAB); # various widgets |
12 | |
13 | |
|
|
14 | our $LAYOUT; |
13 | our $ROOT; |
15 | our $ROOT; |
14 | our $TOOLTIP; |
16 | our $TOOLTIP; |
15 | our $BUTTON_STATE; |
17 | our $BUTTON_STATE; |
16 | |
18 | |
17 | our %WIDGET; # all widgets, weak-referenced |
19 | our %WIDGET; # all widgets, weak-referenced |
|
|
20 | |
|
|
21 | sub get_layout { |
|
|
22 | for (grep { $_->{name} } values %WIDGET) { |
|
|
23 | $LAYOUT->{$_->{name}} = { |
|
|
24 | x => $_->{x} / $::WIDTH, |
|
|
25 | y => $_->{y} / $::HEIGHT, |
|
|
26 | w => $_->{w} / $::WIDTH, |
|
|
27 | h => $_->{h} / $::HEIGHT |
|
|
28 | }; |
|
|
29 | } |
|
|
30 | |
|
|
31 | return $LAYOUT; |
|
|
32 | } |
|
|
33 | |
|
|
34 | sub set_layout { |
|
|
35 | my ($layout) = @_; |
|
|
36 | $LAYOUT = $layout; |
|
|
37 | } |
18 | |
38 | |
19 | sub check_tooltip { |
39 | sub check_tooltip { |
20 | if (!$GRAB) { |
40 | if (!$GRAB) { |
21 | for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { |
41 | for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { |
22 | if (length $widget->{tooltip}) { |
42 | if (length $widget->{tooltip}) { |
… | |
… | |
155 | for my $widget (values %WIDGET) { |
175 | for my $widget (values %WIDGET) { |
156 | if ($widget->{is_toplevel}) { |
176 | if ($widget->{is_toplevel}) { |
157 | $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; |
177 | $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; |
158 | $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; |
178 | $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; |
159 | $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; |
179 | $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; |
160 | $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w}; |
|
|
161 | $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; |
180 | $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; |
162 | $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; |
181 | $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; |
163 | $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; |
182 | $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; |
164 | $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; |
|
|
165 | } |
183 | } |
166 | } |
184 | } |
167 | |
185 | |
168 | reconfigure_widgets; |
186 | reconfigure_widgets; |
169 | } |
187 | } |
… | |
… | |
186 | can_events => 1, |
204 | can_events => 1, |
187 | @_ |
205 | @_ |
188 | }, $class; |
206 | }, $class; |
189 | |
207 | |
190 | for (keys %$self) { |
208 | for (keys %$self) { |
191 | if (/^connect_(.*)$/) { |
209 | if (/^on_(.*)$/) { |
192 | $self->connect ($1 => delete $self->{$_}); |
210 | $self->connect ($1 => delete $self->{$_}); |
193 | } |
211 | } |
194 | } |
212 | } |
195 | |
213 | |
196 | Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); |
214 | Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); |
197 | |
215 | |
|
|
216 | if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { |
|
|
217 | $self->{req_x} = $layout->{x} * $::WIDTH; |
|
|
218 | $self->{req_y} = $layout->{y} * $::HEIGHT; |
|
|
219 | $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; |
|
|
220 | $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; |
|
|
221 | } |
|
|
222 | |
198 | $self |
223 | $self |
|
|
224 | } |
|
|
225 | |
|
|
226 | sub toggle_visibility { |
|
|
227 | my ($self) = @_; |
|
|
228 | |
|
|
229 | if ($self->{visible}) { |
|
|
230 | $self->hide; |
|
|
231 | } else { |
|
|
232 | $self->show; |
|
|
233 | } |
199 | } |
234 | } |
200 | |
235 | |
201 | sub destroy { |
236 | sub destroy { |
202 | my ($self) = @_; |
237 | my ($self) = @_; |
203 | |
238 | |
… | |
… | |
223 | $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); |
258 | $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); |
224 | }, |
259 | }, |
225 | ); |
260 | ); |
226 | } |
261 | } |
227 | |
262 | |
|
|
263 | sub set_visible { |
|
|
264 | my ($self) = @_; |
|
|
265 | |
|
|
266 | return if $self->{visible}; |
|
|
267 | |
|
|
268 | $self->{root} = $self->{parent}{root}; |
|
|
269 | $self->{visible} = $self->{parent}{visible} + 1; |
|
|
270 | |
|
|
271 | $self->emit (visibility_change => 1) |
|
|
272 | } |
|
|
273 | |
228 | sub set_invisible { |
274 | sub set_invisible { |
229 | my ($self) = @_; |
275 | my ($self) = @_; |
230 | |
276 | |
|
|
277 | return unless $self->{visible}; |
|
|
278 | |
231 | # broken show/hide model |
279 | # broken show/hide model |
232 | |
280 | |
|
|
281 | delete $self->{root}; |
233 | delete $self->{visible}; |
282 | delete $self->{visible}; |
234 | |
283 | |
235 | undef $GRAB if $GRAB == $self; |
284 | undef $GRAB if $GRAB == $self; |
236 | undef $HOVER if $HOVER == $self; |
285 | undef $HOVER if $HOVER == $self; |
237 | |
286 | |
238 | CFClient::UI::check_tooltip |
287 | CFClient::UI::check_tooltip |
239 | if $CFClient::UI::TOOLTIP->{owner} == $self; |
288 | if $CFClient::UI::TOOLTIP->{owner} == $self; |
240 | |
289 | |
241 | $self->focus_out; |
290 | $self->focus_out; |
|
|
291 | |
|
|
292 | $self->emit (visibility_change => 0); |
242 | } |
293 | } |
243 | |
294 | |
244 | sub hide { |
295 | sub hide { |
245 | my ($self) = @_; |
296 | my ($self) = @_; |
246 | |
297 | |
… | |
… | |
261 | } |
312 | } |
262 | |
313 | |
263 | sub set_size { |
314 | sub set_size { |
264 | my ($self, $w, $h) = @_; |
315 | my ($self, $w, $h) = @_; |
265 | |
316 | |
266 | $self->{user_w} = $w; |
317 | $self->{def_w} = $w; |
267 | $self->{user_h} = $h; |
318 | $self->{def_h} = $h; |
268 | |
319 | |
269 | $self->check_size; |
320 | $self->check_size; |
270 | } |
321 | } |
271 | |
322 | |
272 | sub size_request { |
323 | sub size_request { |
… | |
… | |
458 | sub set_parent { |
509 | sub set_parent { |
459 | my ($self, $parent) = @_; |
510 | my ($self, $parent) = @_; |
460 | |
511 | |
461 | Scalar::Util::weaken ($self->{parent} = $parent); |
512 | Scalar::Util::weaken ($self->{parent} = $parent); |
462 | |
513 | |
463 | $self->{root} = $parent->{root}; |
514 | $self->set_visible; |
464 | $self->{visible} = $parent->{visible}; |
|
|
465 | |
515 | |
466 | # TODO: req_w _does_change after ->reconfigure |
|
|
467 | $self->check_size |
516 | $self->check_size; |
468 | unless exists $self->{req_w}; |
|
|
469 | |
|
|
470 | $self->show; |
517 | $self->show; |
471 | } |
518 | } |
472 | |
519 | |
473 | sub check_size { |
520 | sub check_size { |
474 | my ($self, $forced) = @_; |
521 | my ($self, $forced) = @_; |
… | |
… | |
499 | sub emit { |
546 | sub emit { |
500 | my ($self, $signal, @args) = @_; |
547 | my ($self, $signal, @args) = @_; |
501 | |
548 | |
502 | $self->_emit ($signal, @args) |
549 | $self->_emit ($signal, @args) |
503 | || $self->$signal (@args); |
550 | || $self->$signal (@args); |
|
|
551 | } |
|
|
552 | |
|
|
553 | sub visibility_change { |
|
|
554 | #my ($self, $visible) = @_; |
504 | } |
555 | } |
505 | |
556 | |
506 | sub DESTROY { |
557 | sub DESTROY { |
507 | my ($self) = @_; |
558 | my ($self) = @_; |
508 | |
559 | |
… | |
… | |
856 | my $class = shift; |
907 | my $class = shift; |
857 | |
908 | |
858 | my $self; |
909 | my $self; |
859 | |
910 | |
860 | my $slider = new CFClient::UI::Slider |
911 | my $slider = new CFClient::UI::Slider |
861 | vertical => 1, |
912 | vertical => 1, |
862 | range => [0, 0, 1, 0.01], # HACK fix |
913 | range => [0, 0, 1, 0.01], # HACK fix |
863 | connect_changed => sub { |
914 | on_changed => sub { |
864 | $self->{vp}->set_offset (0, $_[1]); |
915 | $self->{vp}->set_offset (0, $_[1]); |
865 | }, |
916 | }, |
866 | ; |
917 | ; |
867 | |
918 | |
868 | $self = $class->SUPER::new ( |
919 | $self = $class->SUPER::new ( |
… | |
… | |
874 | $self->{vp}->add ($self->{scrolled}); |
925 | $self->{vp}->add ($self->{scrolled}); |
875 | $self->add ($self->{vp}); |
926 | $self->add ($self->{vp}); |
876 | $self->add ($self->{slider}); |
927 | $self->add ($self->{slider}); |
877 | |
928 | |
878 | $self |
929 | $self |
|
|
930 | } |
|
|
931 | |
|
|
932 | sub update { |
|
|
933 | my ($self) = @_; |
|
|
934 | |
|
|
935 | $self->SUPER::update; |
|
|
936 | |
|
|
937 | # todo: overwrite size_allocate of child |
|
|
938 | my $child = $self->{vp}->child; |
|
|
939 | $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); |
879 | } |
940 | } |
880 | |
941 | |
881 | sub size_allocate { |
942 | sub size_allocate { |
882 | my ($self, $w, $h) = @_; |
943 | my ($self, $w, $h) = @_; |
883 | |
944 | |
… | |
… | |
942 | map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } |
1003 | map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } |
943 | qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); |
1004 | qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); |
944 | |
1005 | |
945 | sub new { |
1006 | sub new { |
946 | my $class = shift; |
1007 | my $class = shift; |
947 | |
|
|
948 | # TODO: user_x, user_y, overwrite moveto? |
|
|
949 | |
1008 | |
950 | my $self = $class->SUPER::new ( |
1009 | my $self = $class->SUPER::new ( |
951 | bg => [1, 1, 1, 1], |
1010 | bg => [1, 1, 1, 1], |
952 | border_bg => [1, 1, 1, 1], |
1011 | border_bg => [1, 1, 1, 1], |
953 | border => 0.6, |
1012 | border => 0.6, |
… | |
… | |
1013 | my ($ev, $x, $y) = @_; |
1072 | my ($ev, $x, $y) = @_; |
1014 | |
1073 | |
1015 | my $dx = $ev->{x} - $ox; |
1074 | my $dx = $ev->{x} - $ox; |
1016 | my $dy = $ev->{y} - $oy; |
1075 | my $dy = $ev->{y} - $oy; |
1017 | |
1076 | |
|
|
1077 | $self->{user_x} = $wx + $dx * $mx; |
|
|
1078 | $self->{user_y} = $wy + $dy * $my; |
1018 | $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); |
1079 | $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); |
1019 | $self->{user_h} = $bh + $dy * ($my ? -1 : 1); |
1080 | $self->{def_h} = $bh + $dy * ($my ? -1 : 1); |
1020 | $self->move ($wx + $dx * $mx, $wy + $dy * $my); |
1081 | $self->move ($self->{user_x}, $self->{user_y}); |
1021 | $self->check_size; |
1082 | $self->check_size; |
1022 | }; |
1083 | }; |
1023 | |
1084 | |
1024 | } elsif ($lr ^ $td) { |
1085 | } elsif ($lr ^ $td) { |
1025 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
1086 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
… | |
… | |
1028 | $self->{motion} = sub { |
1089 | $self->{motion} = sub { |
1029 | my ($ev, $x, $y) = @_; |
1090 | my ($ev, $x, $y) = @_; |
1030 | |
1091 | |
1031 | ($x, $y) = ($ev->{x}, $ev->{y}); |
1092 | ($x, $y) = ($ev->{x}, $ev->{y}); |
1032 | |
1093 | |
1033 | $self->move ($bx + $x - $ox, $by + $y - $oy); |
1094 | $self->{user_x} = $bx + $x - $ox; |
|
|
1095 | $self->{user_y} = $by + $y - $oy; |
|
|
1096 | |
|
|
1097 | $self->move ($self->{user_x}, $self->{user_y}); |
1034 | $self->update; |
1098 | $self->update; |
1035 | }; |
1099 | }; |
1036 | } |
1100 | } |
1037 | } |
1101 | } |
1038 | |
1102 | |
… | |
… | |
1171 | sub size_allocate { |
1235 | sub size_allocate { |
1172 | my ($self, $w, $h) = @_; |
1236 | my ($self, $w, $h) = @_; |
1173 | |
1237 | |
1174 | my ($ws, $hs) = $self->get_wh; |
1238 | my ($ws, $hs) = $self->get_wh; |
1175 | |
1239 | |
1176 | my $req_w = sum @$ws; |
1240 | my $req_w = (sum @$ws) || 1; |
1177 | my $req_h = sum @$hs; |
1241 | my $req_h = (sum @$hs) || 1; |
1178 | |
1242 | |
1179 | # TODO: nicer code && do row_expand |
1243 | # TODO: nicer code && do row_expand |
1180 | my @col_expand = @{$self->{col_expand}}; |
1244 | my @col_expand = @{$self->{col_expand}}; |
1181 | @col_expand = (1) x @$ws unless @col_expand; |
1245 | @col_expand = (1) x @$ws unless @col_expand; |
1182 | my $col_expand = (sum @col_expand) || 1; |
1246 | my $col_expand = (sum @col_expand) || 1; |
… | |
… | |
1236 | } |
1300 | } |
1237 | } |
1301 | } |
1238 | |
1302 | |
1239 | ############################################################################# |
1303 | ############################################################################# |
1240 | |
1304 | |
1241 | package CFClient::UI::HBox; |
1305 | package CFClient::UI::Box; |
1242 | |
|
|
1243 | # TODO: wrap into common Box base class |
|
|
1244 | |
1306 | |
1245 | our @ISA = CFClient::UI::Container::; |
1307 | our @ISA = CFClient::UI::Container::; |
1246 | |
1308 | |
1247 | sub size_request { |
1309 | sub size_request { |
1248 | my ($self) = @_; |
1310 | my ($self) = @_; |
1249 | |
1311 | |
1250 | my @alloc = map [$_->size_request], @{$self->{children}}; |
1312 | $self->{vertical} |
1251 | |
1313 | ? ( |
1252 | ( |
1314 | (List::Util::max map $_->{req_w}, @{$self->{children}}), |
1253 | (List::Util::sum map $_->[0], @alloc), |
1315 | (List::Util::sum map $_->{req_h}, @{$self->{children}}), |
1254 | (List::Util::max map $_->[1], @alloc), |
1316 | ) |
1255 | ) |
1317 | : ( |
|
|
1318 | (List::Util::sum map $_->{req_w}, @{$self->{children}}), |
|
|
1319 | (List::Util::max map $_->{req_h}, @{$self->{children}}), |
|
|
1320 | ) |
1256 | } |
1321 | } |
1257 | |
1322 | |
1258 | sub size_allocate { |
1323 | sub size_allocate { |
1259 | my ($self, $w, $h) = @_; |
1324 | my ($self, $w, $h) = @_; |
1260 | |
1325 | |
1261 | ($h, $w) = ($w, $h); |
1326 | my $space = $self->{vertical} ? $h : $w; |
1262 | |
|
|
1263 | my $children = $self->{children}; |
1327 | my $children = $self->{children}; |
1264 | |
1328 | |
1265 | my @h = map $_->{req_w}, @$children; |
1329 | my @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; |
1266 | |
|
|
1267 | my $req_h = List::Util::sum @h; |
1330 | my $req = List::Util::sum @req; |
1268 | |
1331 | |
1269 | if ($req_h > $h) { |
1332 | if ($req > $space) { |
1270 | # ah well, not enough space |
1333 | # ah well, not enough space |
1271 | $_ *= $h / $req_h for @h; |
1334 | $_ *= $space / $req for @req; |
1272 | } else { |
1335 | } else { |
1273 | my $exp = List::Util::sum map $_->{expand}, @$children; |
1336 | my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; |
1274 | $exp ||= 1; |
|
|
1275 | |
1337 | |
|
|
1338 | $req[$_] += ($space - $req) * $children->[$_]{expand} / $expand |
1276 | for (0 .. $#$children) { |
1339 | for 0 .. $#$children; |
1277 | my $child = $children->[$_]; |
|
|
1278 | |
|
|
1279 | my $alloc_h = $h[$_]; |
|
|
1280 | $alloc_h += ($h - $req_h) * $child->{expand} / $exp; |
|
|
1281 | $h[$_] = $alloc_h; |
|
|
1282 | } |
|
|
1283 | } |
1340 | } |
1284 | |
1341 | |
1285 | CFClient::UI::harmonize \@h; |
1342 | CFClient::UI::harmonize \@req; |
1286 | |
1343 | |
1287 | my $y = 0; |
1344 | my $pos = 0; |
1288 | for (0 .. $#$children) { |
1345 | for (0 .. $#$children) { |
1289 | my $child = $children->[$_]; |
|
|
1290 | my $h = $h[$_]; |
1346 | my $alloc = $req[$_]; |
1291 | $child->configure ($y, 0, $h, $w); |
1347 | $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); |
1292 | |
1348 | |
1293 | $y += $h; |
1349 | $pos += $alloc; |
1294 | } |
1350 | } |
1295 | |
1351 | |
1296 | 1 |
1352 | 1 |
1297 | } |
1353 | } |
1298 | |
1354 | |
1299 | ############################################################################# |
1355 | ############################################################################# |
1300 | |
1356 | |
|
|
1357 | package CFClient::UI::HBox; |
|
|
1358 | |
|
|
1359 | our @ISA = CFClient::UI::Box::; |
|
|
1360 | |
|
|
1361 | sub new { |
|
|
1362 | my $class = shift; |
|
|
1363 | |
|
|
1364 | $class->SUPER::new ( |
|
|
1365 | vertical => 0, |
|
|
1366 | @_, |
|
|
1367 | ) |
|
|
1368 | } |
|
|
1369 | |
|
|
1370 | ############################################################################# |
|
|
1371 | |
1301 | package CFClient::UI::VBox; |
1372 | package CFClient::UI::VBox; |
1302 | |
1373 | |
1303 | # TODO: wrap into common Box base class |
|
|
1304 | |
|
|
1305 | our @ISA = CFClient::UI::Container::; |
1374 | our @ISA = CFClient::UI::Box::; |
1306 | |
1375 | |
1307 | sub size_request { |
1376 | sub new { |
1308 | my ($self) = @_; |
1377 | my $class = shift; |
1309 | |
1378 | |
1310 | my @alloc = map [$_->size_request], @{$self->{children}}; |
1379 | $class->SUPER::new ( |
1311 | |
1380 | vertical => 1, |
1312 | ( |
1381 | @_, |
1313 | (List::Util::max map $_->[0], @alloc), |
|
|
1314 | (List::Util::sum map $_->[1], @alloc), |
|
|
1315 | ) |
1382 | ) |
1316 | } |
|
|
1317 | |
|
|
1318 | sub size_allocate { |
|
|
1319 | my ($self, $w, $h) = @_; |
|
|
1320 | |
|
|
1321 | Carp::confess "negative size" if $w < 0 || $h < 0;#d# |
|
|
1322 | |
|
|
1323 | my $children = $self->{children}; |
|
|
1324 | |
|
|
1325 | my @h = map $_->{req_h}, @$children; |
|
|
1326 | |
|
|
1327 | my $req_h = List::Util::sum @h; |
|
|
1328 | |
|
|
1329 | if ($req_h > $h) { |
|
|
1330 | # ah well, not enough space |
|
|
1331 | $_ *= $h / $req_h for @h; |
|
|
1332 | } else { |
|
|
1333 | my $exp = List::Util::sum map $_->{expand}, @$children; |
|
|
1334 | $exp ||= 1; |
|
|
1335 | |
|
|
1336 | for (0 .. $#$children) { |
|
|
1337 | my $child = $children->[$_]; |
|
|
1338 | |
|
|
1339 | $h[$_] += ($h - $req_h) * $child->{expand} / $exp; |
|
|
1340 | } |
|
|
1341 | } |
|
|
1342 | |
|
|
1343 | CFClient::UI::harmonize \@h; |
|
|
1344 | |
|
|
1345 | my $y = 0; |
|
|
1346 | for (0 .. $#$children) { |
|
|
1347 | my $child = $children->[$_]; |
|
|
1348 | my $h = $h[$_]; |
|
|
1349 | $child->configure (0, $y, $w, $h); |
|
|
1350 | |
|
|
1351 | $y += $h; |
|
|
1352 | } |
|
|
1353 | |
|
|
1354 | 1 |
|
|
1355 | } |
1383 | } |
1356 | |
1384 | |
1357 | ############################################################################# |
1385 | ############################################################################# |
1358 | |
1386 | |
1359 | package CFClient::UI::Label; |
1387 | package CFClient::UI::Label; |
… | |
… | |
2136 | } |
2164 | } |
2137 | |
2165 | |
2138 | sub set_range { |
2166 | sub set_range { |
2139 | my ($self, $range) = @_; |
2167 | my ($self, $range) = @_; |
2140 | |
2168 | |
2141 | $self->{range} = $range; |
2169 | ($range, $self->{range}) = ($self->{range}, $range); |
2142 | |
2170 | |
2143 | $self->update; |
2171 | $self->update |
|
|
2172 | if "@$range" ne "@{$self->{range}}"; |
2144 | } |
2173 | } |
2145 | |
2174 | |
2146 | sub set_value { |
2175 | sub set_value { |
2147 | my ($self, $value) = @_; |
2176 | my ($self, $value) = @_; |
2148 | |
2177 | |
… | |
… | |
2531 | |
2560 | |
2532 | sub new { |
2561 | sub new { |
2533 | my $class = shift; |
2562 | my $class = shift; |
2534 | |
2563 | |
2535 | my $self = $class->SUPER::new ( |
2564 | my $self = $class->SUPER::new ( |
2536 | state => 0, |
2565 | state => 0, |
2537 | connect_activate => \&toggle_flopper, |
2566 | on_activate => \&toggle_flopper, |
2538 | @_ |
2567 | @_ |
2539 | ); |
2568 | ); |
2540 | |
2569 | |
2541 | if ($self->{state}) { |
|
|
2542 | $self->{state} = 0; |
|
|
2543 | $self->toggle_flopper; |
|
|
2544 | } |
|
|
2545 | |
|
|
2546 | $self |
2570 | $self |
2547 | } |
2571 | } |
2548 | |
2572 | |
2549 | sub toggle_flopper { |
2573 | sub toggle_flopper { |
2550 | my ($self) = @_; |
2574 | my ($self) = @_; |
2551 | |
2575 | |
2552 | # TODO: use animation |
2576 | $self->{other}->toggle_visibility; |
2553 | if ($self->{state} = !$self->{state}) { |
|
|
2554 | $CFClient::UI::ROOT->add ($self->{other}); |
|
|
2555 | $self->{other}->move ($self->coord2global (0, $self->{h})); |
|
|
2556 | $self->_emit ("open"); |
|
|
2557 | } else { |
|
|
2558 | $CFClient::UI::ROOT->remove ($self->{other}); |
|
|
2559 | $self->_emit ("close"); |
|
|
2560 | } |
|
|
2561 | |
|
|
2562 | $self->_emit (changed => $self->{state}); |
|
|
2563 | } |
2577 | } |
2564 | |
2578 | |
2565 | ############################################################################# |
2579 | ############################################################################# |
2566 | |
2580 | |
2567 | package CFClient::UI::Tooltip; |
2581 | package CFClient::UI::Tooltip; |
… | |
… | |
2751 | $self->{scrolled}->add (1, $row, $item->{desc_widget}); |
2765 | $self->{scrolled}->add (1, $row, $item->{desc_widget}); |
2752 | $self->{scrolled}->add (2, $row, $item->{weight_widget}); |
2766 | $self->{scrolled}->add (2, $row, $item->{weight_widget}); |
2753 | |
2767 | |
2754 | $row++; |
2768 | $row++; |
2755 | } |
2769 | } |
2756 | |
|
|
2757 | # $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; |
|
|
2758 | } |
|
|
2759 | |
|
|
2760 | sub size_request { |
|
|
2761 | my ($self) = @_; |
|
|
2762 | ($self->{req_w}, $self->{req_h}); |
|
|
2763 | } |
2770 | } |
2764 | |
2771 | |
2765 | ############################################################################# |
2772 | ############################################################################# |
2766 | |
2773 | |
2767 | package CFClient::UI::Menu; |
2774 | package CFClient::UI::Menu; |
… | |
… | |
2954 | |
2961 | |
2955 | sub new { |
2962 | sub new { |
2956 | my $class = shift; |
2963 | my $class = shift; |
2957 | |
2964 | |
2958 | $class->SUPER::new ( |
2965 | $class->SUPER::new ( |
|
|
2966 | visible => 1, |
2959 | @_, |
2967 | @_, |
2960 | ) |
2968 | ) |
2961 | } |
2969 | } |
2962 | |
2970 | |
2963 | sub configure { |
2971 | sub configure { |
… | |
… | |
2990 | if exists $child->{req_x}; |
2998 | if exists $child->{req_x}; |
2991 | |
2999 | |
2992 | $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 |
3000 | $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 |
2993 | if exists $child->{req_y}; |
3001 | if exists $child->{req_y}; |
2994 | |
3002 | |
|
|
3003 | delete @$child{qw(req_x req_y)}; |
|
|
3004 | |
2995 | $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; |
3005 | $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; |
2996 | $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; |
3006 | $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; |
2997 | |
3007 | |
2998 | $child->configure ($X, $Y, $W, $H); |
3008 | $child->configure ($X, $Y, $W, $H); |
2999 | } |
3009 | } |
… | |
… | |
3018 | $::WANT_REFRESH++; |
3028 | $::WANT_REFRESH++; |
3019 | } |
3029 | } |
3020 | |
3030 | |
3021 | sub add { |
3031 | sub add { |
3022 | my ($self, @children) = @_; |
3032 | my ($self, @children) = @_; |
3023 | |
|
|
3024 | for (my @widgets = @children; my $w = pop @widgets; ) { |
|
|
3025 | push @widgets, $w->children; |
|
|
3026 | $w->{root} = $self; |
|
|
3027 | $w->{visible} = 1; |
|
|
3028 | } |
|
|
3029 | |
3033 | |
3030 | for my $child (@children) { |
3034 | for my $child (@children) { |
3031 | $child->{is_toplevel} = 1; |
3035 | $child->{is_toplevel} = 1; |
3032 | |
3036 | |
3033 | # integerise window positions |
3037 | # integerise window positions |
3034 | $child->{x} = int $child->{x}; |
3038 | $child->{x} = int $child->{x}; |
3035 | $child->{y} = int $child->{y}; |
3039 | $child->{y} = int $child->{y}; |
3036 | } |
3040 | } |
3037 | |
3041 | |
3038 | $self->SUPER::add (@children); |
3042 | $self->SUPER::add (@children); |
|
|
3043 | |
|
|
3044 | for (my @widgets = @children; my $w = pop @widgets; ) { |
|
|
3045 | push @widgets, $w->children; |
|
|
3046 | $w->set_visible; |
|
|
3047 | } |
|
|
3048 | |
3039 | } |
3049 | } |
3040 | |
3050 | |
3041 | sub remove { |
3051 | sub remove { |
3042 | my ($self, @children) = @_; |
3052 | my ($self, @children) = @_; |
3043 | |
3053 | |
… | |
… | |
3069 | $_->() |
3079 | $_->() |
3070 | for values %{delete $self->{refresh_hook}}; |
3080 | for values %{delete $self->{refresh_hook}}; |
3071 | } |
3081 | } |
3072 | |
3082 | |
3073 | if ($self->{check_size}) { |
3083 | if ($self->{check_size}) { |
3074 | my @queue = ([], []); |
3084 | my @queue; |
3075 | |
3085 | |
3076 | for (;;) { |
3086 | for (;;) { |
3077 | if ($self->{check_size}) { |
3087 | if ($self->{check_size}) { |
3078 | # heuristic: check containers last |
3088 | #TODO use array-of-depth approach |
3079 | push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ |
3089 | |
|
|
3090 | @queue = sort { $a->{visible} <=> $b->{visible} } |
3080 | for values %{delete $self->{check_size}} |
3091 | @queue, values %{delete $self->{check_size}}; |
3081 | } |
3092 | } |
3082 | |
3093 | |
3083 | my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; |
3094 | my $widget = pop @queue || last; |
3084 | |
3095 | |
|
|
3096 | defined $widget->{visible} or last; # do not resize invisible widgets |
|
|
3097 | |
3085 | my ($w, $h) = $widget->{user_w} && $widget->{user_h} |
3098 | my ($w, $h) = $widget->{def_w} && $widget->{def_h} |
3086 | ? @$widget{qw(user_w user_h)} |
3099 | ? @$widget{qw(def_w def_h)} |
3087 | : $widget->size_request; |
3100 | : $widget->size_request; |
3088 | |
3101 | |
3089 | if (delete $widget->{force_alloc} |
3102 | if (delete $widget->{force_alloc} |
3090 | or $w != $widget->{req_w} or $h != $widget->{req_h}) { |
3103 | or $w != $widget->{req_w} or $h != $widget->{req_h}) { |
3091 | Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# |
3104 | Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# |