ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.231 by root, Thu May 25 00:26:19 2006 UTC vs.
Revision 1.243 by root, Sat May 27 20:46:54 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20
21sub 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
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
18 38
19sub check_tooltip { 39sub 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}) {
… …
186 can_events => 1, 206 can_events => 1,
187 @_ 207 @_
188 }, $class; 208 }, $class;
189 209
190 for (keys %$self) { 210 for (keys %$self) {
191 if (/^connect_(.*)$/) { 211 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 212 $self->connect ($1 => delete $self->{$_});
193 } 213 }
194 } 214 }
195 215
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH;
220 $self->{user_y} = $layout->{y} * $::HEIGHT;
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
223 }
197 224
198 $self 225 $self
199} 226}
200 227
201sub destroy { 228sub destroy {
… …
228sub set_invisible { 255sub set_invisible {
229 my ($self) = @_; 256 my ($self) = @_;
230 257
231 # broken show/hide model 258 # broken show/hide model
232 259
260 delete $self->{root};
233 delete $self->{visible}; 261 delete $self->{visible};
234 262
235 undef $GRAB if $GRAB == $self; 263 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 264 undef $HOVER if $HOVER == $self;
265
266 CFClient::UI::check_tooltip
267 if $CFClient::UI::TOOLTIP->{owner} == $self;
237 268
238 $self->focus_out; 269 $self->focus_out;
239} 270}
240 271
241sub hide { 272sub hide {
… …
318 delete $self->{max_h}; $self->{max_h} = $h if $h; 349 delete $self->{max_h}; $self->{max_h} = $h if $h;
319} 350}
320 351
321sub set_tooltip { 352sub set_tooltip {
322 my ($self, $tooltip) = @_; 353 my ($self, $tooltip) = @_;
354
355 $tooltip =~ s/^\s+//;
356 $tooltip =~ s/\s+$//;
357
358 return if $self->{tooltip} eq $tooltip;
323 359
324 $self->{tooltip} = $tooltip; 360 $self->{tooltip} = $tooltip;
325 361
326 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 362 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
327 delete $CFClient::UI::TOOLTIP->{owner}; 363 delete $CFClient::UI::TOOLTIP->{owner};
… …
417 if ($ENV{PCLIENT_DEBUG}) { 453 if ($ENV{PCLIENT_DEBUG}) {
418 glPushMatrix; 454 glPushMatrix;
419 glColor 1, 1, 0, 1; 455 glColor 1, 1, 0, 1;
420 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 456 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
421 glBegin GL_LINE_LOOP; 457 glBegin GL_LINE_LOOP;
422 glVertex 0 , 0; 458 glVertex 0 , 0;
423 glVertex $self->{w}, 0; 459 glVertex $self->{w} - 1, 0;
424 glVertex $self->{w}, $self->{h}; 460 glVertex $self->{w} - 1, $self->{h} - 1;
425 glVertex 0 , $self->{h}; 461 glVertex 0 , $self->{h} - 1;
426 glEnd; 462 glEnd;
427 glPopMatrix; 463 glPopMatrix;
428 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 464 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
429 } 465 }
430} 466}
… …
449 485
450sub set_parent { 486sub set_parent {
451 my ($self, $parent) = @_; 487 my ($self, $parent) = @_;
452 488
453 Scalar::Util::weaken ($self->{parent} = $parent); 489 Scalar::Util::weaken ($self->{parent} = $parent);
490
491 $self->{root} = $parent->{root};
492 $self->{visible} = $parent->{visible} + 1;
454 493
455 # TODO: req_w _does_change after ->reconfigure 494 # TODO: req_w _does_change after ->reconfigure
456 $self->check_size 495 $self->check_size
457 unless exists $self->{req_w}; 496 unless exists $self->{req_w};
458 497
… …
610 delete $child->{parent}; 649 delete $child->{parent};
611 $child->hide; 650 $child->hide;
612 651
613 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 652 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
614 653
615 $self->check_size; 654 $self->check_size (1);
616 $self->update; 655 $self->update;
617} 656}
618 657
619sub clear { 658sub clear {
620 my ($self) = @_; 659 my ($self) = @_;
… …
760 799
761package CFClient::UI::ViewPort; 800package CFClient::UI::ViewPort;
762 801
763our @ISA = CFClient::UI::Window::; 802our @ISA = CFClient::UI::Window::;
764 803
804sub new {
805 my $class = shift;
806
807 $class->SUPER::new (
808 scroll_x => 0,
809 scroll_y => 1,
810 @_,
811 )
812}
813
765sub size_request { 814sub size_request {
766 my ($self) = @_; 815 my ($self) = @_;
767 816
768 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 817 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
769 818
… …
771} 820}
772 821
773sub size_allocate { 822sub size_allocate {
774 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
775 824
776 my ($cw, $ch) = @$self{qw(child_w child_h)}; 825 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
777# $w = $self->{w}; 826 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
827
778 $self->child->configure (0, 0, $cw, $ch); 828 $self->child->configure (0, 0, $w, $h);
779 $self->update; 829 $self->update;
780} 830}
781 831
782sub set_offset { 832sub set_offset {
783 my ($self, $x, $y) = @_; 833 my ($self, $x, $y) = @_;
… …
834 my $class = shift; 884 my $class = shift;
835 885
836 my $self; 886 my $self;
837 887
838 my $slider = new CFClient::UI::Slider 888 my $slider = new CFClient::UI::Slider
839 vertical => 1, 889 vertical => 1,
840 range => [0, 0, 1, 0.01], # HACK fix 890 range => [0, 0, 1, 0.01], # HACK fix
841 connect_changed => sub { 891 on_changed => sub {
842 $self->{vp}->set_offset (0, $_[1]); 892 $self->{vp}->set_offset (0, $_[1]);
843 }, 893 },
844 ; 894 ;
845 895
846 $self = $class->SUPER::new ( 896 $self = $class->SUPER::new (
… …
852 $self->{vp}->add ($self->{scrolled}); 902 $self->{vp}->add ($self->{scrolled});
853 $self->add ($self->{vp}); 903 $self->add ($self->{vp});
854 $self->add ($self->{slider}); 904 $self->add ($self->{slider});
855 905
856 $self 906 $self
907}
908
909sub update {
910 my ($self) = @_;
911
912 $self->SUPER::update;
913
914 # todo: overwrite size_allocate of child
915 my $child = $self->{vp}->child;
916 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
857} 917}
858 918
859sub size_allocate { 919sub size_allocate {
860 my ($self, $w, $h) = @_; 920 my ($self, $w, $h) = @_;
861 921
… …
991 my ($ev, $x, $y) = @_; 1051 my ($ev, $x, $y) = @_;
992 1052
993 my $dx = $ev->{x} - $ox; 1053 my $dx = $ev->{x} - $ox;
994 my $dy = $ev->{y} - $oy; 1054 my $dy = $ev->{y} - $oy;
995 1055
1056 $self->{user_x} = $wx + $dx * $mx;
1057 $self->{user_y} = $wy + $dy * $my;
996 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1058 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
997 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1059 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
998 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1060 $self->move ($self->{user_x}, $self->{user_y});
999 $self->check_size; 1061 $self->check_size;
1000 }; 1062 };
1001 1063
1002 } elsif ($lr ^ $td) { 1064 } elsif ($lr ^ $td) {
1003 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1065 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1006 $self->{motion} = sub { 1068 $self->{motion} = sub {
1007 my ($ev, $x, $y) = @_; 1069 my ($ev, $x, $y) = @_;
1008 1070
1009 ($x, $y) = ($ev->{x}, $ev->{y}); 1071 ($x, $y) = ($ev->{x}, $ev->{y});
1010 1072
1011 $self->move ($bx + $x - $ox, $by + $y - $oy); 1073 $self->{user_x} = $bx + $x - $ox;
1074 $self->{user_y} = $by + $y - $oy;
1075 $self->move ($self->{user_x}, $self->{user_y});
1012 $self->update; 1076 $self->update;
1013 }; 1077 };
1014 } 1078 }
1015} 1079}
1016 1080
… …
1078sub new { 1142sub new {
1079 my $class = shift; 1143 my $class = shift;
1080 1144
1081 $class->SUPER::new ( 1145 $class->SUPER::new (
1082 col_expand => [], 1146 col_expand => [],
1083 @_ 1147 @_,
1084 ) 1148 )
1149}
1150
1151sub children {
1152 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1085} 1153}
1086 1154
1087sub add { 1155sub add {
1088 my ($self, $x, $y, $child) = @_; 1156 my ($self, $x, $y, $child) = @_;
1089 1157
1090 $child->set_parent ($self); 1158 $child->set_parent ($self);
1091 $self->{children}[$y][$x] = $child; 1159 $self->{children}[$y][$x] = $child;
1092 1160
1093 $child->check_size; 1161 $self->check_size (1);
1094} 1162}
1095 1163
1096sub children {
1097 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1098}
1099
1100# TODO: move to container class maybe? send childs a signal on removal? 1164# TODO: move to container class maybe? send children a signal on removal?
1101sub clear { 1165sub clear {
1102 my ($self) = @_; 1166 my ($self) = @_;
1103 1167
1104 my @children = $self->children; 1168 my @children = $self->children;
1105 delete $self->{children}; 1169 delete $self->{children};
… …
1107 for (@children) { 1171 for (@children) {
1108 delete $_->{parent}; 1172 delete $_->{parent};
1109 $_->hide; 1173 $_->hide;
1110 } 1174 }
1111 1175
1176 $self->check_size (1);
1112 $self->update; 1177 $self->update;
1113} 1178}
1114 1179
1115sub get_wh { 1180sub get_wh {
1116 my ($self) = @_; 1181 my ($self) = @_;
… …
1148sub size_allocate { 1213sub size_allocate {
1149 my ($self, $w, $h) = @_; 1214 my ($self, $w, $h) = @_;
1150 1215
1151 my ($ws, $hs) = $self->get_wh; 1216 my ($ws, $hs) = $self->get_wh;
1152 1217
1153 my $req_w = sum @$ws; 1218 my $req_w = (sum @$ws) || 1;
1154 my $req_h = sum @$hs; 1219 my $req_h = (sum @$hs) || 1;
1155 1220
1156 # TODO: nicer code && do row_expand 1221 # TODO: nicer code && do row_expand
1157 my @col_expand = @{$self->{col_expand}}; 1222 my @col_expand = @{$self->{col_expand}};
1158 @col_expand = (1) x @$ws unless @col_expand; 1223 @col_expand = (1) x @$ws unless @col_expand;
1159 my $col_expand = (sum @col_expand) || 1; 1224 my $col_expand = (sum @col_expand) || 1;
… …
1562 my ($self) = @_; 1627 my ($self) = @_;
1563 1628
1564 my ($w, $h) = $self->SUPER::size_request; 1629 my ($w, $h) = $self->SUPER::size_request;
1565 1630
1566 ($w + 1, $h) # add 1 for cursor 1631 ($w + 1, $h) # add 1 for cursor
1567}
1568
1569sub size_allocate {
1570 my ($self, $w, $h) = @_;
1571
1572 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1573} 1632}
1574 1633
1575sub key_down { 1634sub key_down {
1576 my ($self, $ev) = @_; 1635 my ($self, $ev) = @_;
1577 1636
… …
2119} 2178}
2120 2179
2121sub set_range { 2180sub set_range {
2122 my ($self, $range) = @_; 2181 my ($self, $range) = @_;
2123 2182
2124 $self->{range} = $range; 2183 ($range, $self->{range}) = ($self->{range}, $range);
2125 2184
2126 $self->update; 2185 $self->update
2186 if "@$range" ne "@{$self->{range}}";
2127} 2187}
2128 2188
2129sub set_value { 2189sub set_value {
2130 my ($self, $value) = @_; 2190 my ($self, $value) = @_;
2131 2191
… …
2514 2574
2515sub new { 2575sub new {
2516 my $class = shift; 2576 my $class = shift;
2517 2577
2518 my $self = $class->SUPER::new ( 2578 my $self = $class->SUPER::new (
2519 state => 0, 2579 state => 0,
2520 connect_activate => \&toggle_flopper, 2580 on_activate => \&toggle_flopper,
2521 @_ 2581 @_
2522 ); 2582 );
2523 2583
2524 if ($self->{state}) { 2584 if ($self->{state}) {
2525 $self->{state} = 0; 2585 $self->{state} = 0;
… …
2626 2686
2627sub new { 2687sub new {
2628 my $class = shift; 2688 my $class = shift;
2629 2689
2630 my $self = $class->SUPER::new ( 2690 my $self = $class->SUPER::new (
2631 aspect => 1, 2691 aspect => 1,
2692 can_events => 0,
2632 @_, 2693 @_,
2633 ); 2694 );
2634 2695
2635 if ($self->{anim} && $self->{animspeed}) { 2696 if ($self->{anim} && $self->{animspeed}) {
2636 Scalar::Util::weaken (my $widget = $self); 2697 Scalar::Util::weaken (my $widget = $self);
… …
2695 $self->SUPER::DESTROY; 2756 $self->SUPER::DESTROY;
2696} 2757}
2697 2758
2698############################################################################# 2759#############################################################################
2699 2760
2700package CFClient::UI::InventoryItem; 2761package CFClient::UI::Inventory;
2701 2762
2702our @ISA = CFClient::UI::HBox::; 2763our @ISA = CFClient::UI::ScrolledWindow::;
2703
2704sub _item_to_desc {
2705 my ($item) = @_;
2706
2707 my $desc =
2708 $item->{nrof} < 2
2709 ? $item->{name}
2710 : "$item->{nrof} × $item->{name_pl}";
2711
2712 $item->{flags} & Crossfire::Protocol::F_OPEN
2713 and $desc .= " (open)";
2714 $item->{flags} & Crossfire::Protocol::F_APPLIED
2715 and $desc .= " (applied)";
2716 $item->{flags} & Crossfire::Protocol::F_UNPAID
2717 and $desc .= " (unpaid)";
2718 $item->{flags} & Crossfire::Protocol::F_MAGIC
2719 and $desc .= " (magic)";
2720 $item->{flags} & Crossfire::Protocol::F_CURSED
2721 and $desc .= " (cursed)";
2722 $item->{flags} & Crossfire::Protocol::F_DAMNED
2723 and $desc .= " (damned)";
2724 $item->{flags} & Crossfire::Protocol::F_LOCKED
2725 and $desc .= " *";
2726
2727 $desc
2728}
2729 2764
2730sub new { 2765sub new {
2731 my $class = shift; 2766 my $class = shift;
2732 2767
2733 my %args = @_;
2734
2735 my $item = delete $args{item};
2736
2737 my $desc = _item_to_desc ($item);
2738
2739 my $self = $class->SUPER::new ( 2768 my $self = $class->SUPER::new (
2740 can_hover => 1,
2741 can_events => 1,
2742 tooltip => ((CFClient::UI::Label::escape $desc)
2743 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2744 connect_button_down => sub {
2745 my ($self, $ev, $x, $y) = @_;
2746
2747 # todo: maybe put examine on 1? but should just be a tooltip :(
2748 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2749 my $targ = $::CONN->{player}{tag};
2750
2751 if ($item->{container} == $::CONN->{player}{tag}) {
2752 $targ = $main::OPENCONT;
2753 }
2754
2755 $::CONN->send ("move $targ $item->{tag} 0");
2756 } elsif ($ev->{button} == 1) {
2757 $::CONN->send ("examine $item->{tag}");
2758 } elsif ($ev->{button} == 2) {
2759 $::CONN->send ("apply $item->{tag}");
2760 } elsif ($ev->{button} == 3) {
2761 my @menu_items = (
2762 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2763 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2764 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2765 (
2766 $item->{flags} & Crossfire::Protocol::F_LOCKED
2767 ? (
2768 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2769 )
2770 : (
2771 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2772 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2773 )
2774 ),
2775 );
2776
2777 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2778 }
2779
2780 1
2781 },
2782 %args
2783 );
2784
2785
2786 $self->add (new CFClient::UI::Face
2787 can_events => 0,
2788 face => $item->{face},
2789 anim => $item->{anim},
2790 animspeed => $item->{animspeed},
2791 );
2792
2793 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2794
2795 $self->{item} = $item;
2796
2797 $self->update_item;
2798
2799 $self
2800}
2801
2802sub update_item {
2803 my ($self) = @_;
2804
2805 my $desc = _item_to_desc ($self->{item});
2806
2807 $self->{name_lbl}->set_text ($desc);
2808}
2809
2810#############################################################################
2811
2812package CFClient::UI::Inventory;
2813
2814our @ISA = CFClient::UI::ScrolledWindow::;
2815
2816sub new {
2817 my $class = shift;
2818
2819 my $self = $class->SUPER::new (
2820 scrolled => (new CFClient::UI::Table), 2769 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2821 @_, 2770 @_,
2822 ); 2771 );
2823 2772
2824 $self 2773 $self
2825} 2774}
… …
2835 or ($a->{name} cmp $b->{name}) 2784 or ($a->{name} cmp $b->{name})
2836 } @$items; 2785 } @$items;
2837 2786
2838 $self->{real_items} = \@items; 2787 $self->{real_items} = \@items;
2839 2788
2789 my $row = 0;
2840 for my $item (@items) { 2790 for my $item (@items) {
2841 $item->{item} = $item; 2791 CFClient::Item::update_widgets $item;
2842 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2843 $item->update_item ();
2844 }
2845 2792
2846 my $i = 0; 2793 $self->{scrolled}->add (0, $row, $item->{face_widget});
2847 for (@items) { 2794 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2848 $self->{scrolled}->add (0, $i, $_); 2795 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2849 my $nrof = $_->{item}->{nrof} || 1;
2850 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2851 }
2852 2796
2853# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2797 $row++;
2798 }
2854} 2799}
2855 2800
2856sub size_request { 2801sub size_request {
2857 my ($self) = @_; 2802 my ($self) = @_;
2858 ($self->{req_w}, $self->{req_h}); 2803 ($self->{req_w}, $self->{req_h});
… …
2995sub add { 2940sub add {
2996 my ($self, $text, %arg) = @_; 2941 my ($self, $text, %arg) = @_;
2997 2942
2998 $text =~ s/^\s+//; 2943 $text =~ s/^\s+//;
2999 $text =~ s/\s+$//; 2944 $text =~ s/\s+$//;
2945
2946 return unless $text;
3000 2947
3001 my $timeout = time + ((delete $arg{timeout}) || 60); 2948 my $timeout = time + ((delete $arg{timeout}) || 60);
3002 2949
3003 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2950 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3004 2951
… …
3048 2995
3049sub new { 2996sub new {
3050 my $class = shift; 2997 my $class = shift;
3051 2998
3052 $class->SUPER::new ( 2999 $class->SUPER::new (
3000 visible => 1,
3053 @_, 3001 @_,
3054 ) 3002 )
3055} 3003}
3056 3004
3057sub configure { 3005sub configure {
… …
3115sub add { 3063sub add {
3116 my ($self, @children) = @_; 3064 my ($self, @children) = @_;
3117 3065
3118 for (my @widgets = @children; my $w = pop @widgets; ) { 3066 for (my @widgets = @children; my $w = pop @widgets; ) {
3119 push @widgets, $w->children; 3067 push @widgets, $w->children;
3120 $w->{root} = $self; 3068 $w->{root} = $self;
3121 $w->{visible} = 1; 3069 $w->{visible} = $self->{visible} + 1;
3122 } 3070 }
3123 3071
3124 for my $child (@children) { 3072 for my $child (@children) {
3125 $child->{is_toplevel} = 1; 3073 $child->{is_toplevel} = 1;
3126 3074
… …
3163 $_->() 3111 $_->()
3164 for values %{delete $self->{refresh_hook}}; 3112 for values %{delete $self->{refresh_hook}};
3165 } 3113 }
3166 3114
3167 if ($self->{check_size}) { 3115 if ($self->{check_size}) {
3168 my @queue = ([], []); 3116 my @queue;
3169 3117
3170 for (;;) { 3118 for (;;) {
3171 if ($self->{check_size}) { 3119 if ($self->{check_size}) {
3172 # heuristic: check containers last 3120 #TODO use array-of-depth approach
3173 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3121
3122 @queue = sort { $a->{visible} <=> $b->{visible} }
3174 for values %{delete $self->{check_size}} 3123 @queue, values %{delete $self->{check_size}};
3175 } 3124 }
3176 3125
3177 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3126 my $widget = pop @queue || last;
3127
3128 defined $widget->{visible} or last; # do not resize invisible widgets
3178 3129
3179 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3130 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3180 ? @$widget{qw(user_w user_h)} 3131 ? @$widget{qw(user_w user_h)}
3181 : $widget->size_request; 3132 : $widget->size_request;
3182 3133

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines