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.226 by root, Tue May 23 23:14:46 2006 UTC vs.
Revision 1.238 by root, Thu May 25 21:48:22 2006 UTC

… …
50 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
51} 51}
52 52
53# class methods for events 53# class methods for events
54sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 55 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 56 if $FOCUS;
57} 57}
58 58
59sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 60 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 61 if $FOCUS;
62} 62}
63 63
64sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
65 my ($ev) = @_; 65 my ($ev) = @_;
… …
74 check_tooltip; 74 check_tooltip;
75 } 75 }
76 76
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 78
79 if ($GRAB) { 79 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 80 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 81}
84 82
85sub feed_sdl_button_up_event { 83sub feed_sdl_button_up_event {
86 my ($ev) = @_; 84 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
88 86
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 87 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 88
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 90
93 if ($GRAB) { 91 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 92 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 93
98 if (!$BUTTON_STATE) { 94 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 95 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 96 $grab->update if $grab;
101 $GRAB->update if $GRAB; 97 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 113 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 114
119 check_tooltip; 115 check_tooltip;
120 } 116 }
121 117
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 118 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 119 if $HOVER;
126} 120}
127 121
128# convert position array to integers 122# convert position array to integers
129sub harmonize { 123sub harmonize {
130 my ($vals) = @_; 124 my ($vals) = @_;
… …
144 138
145 $_->update 139 $_->update
146 for @widgets; 140 for @widgets;
147} 141}
148 142
143sub reconfigure_widgets {
144 # make a copy, otherwise C<for> complains about freed values.
145 my @widgets = values %WIDGET;
146
147 $_->reconfigure
148 for @widgets;
149}
150
149# call when resolution changes etc. 151# call when resolution changes etc.
150sub rescale_widgets { 152sub rescale_widgets {
151 my ($sx, $sy) = @_; 153 my ($sx, $sy) = @_;
152 154
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 155 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 156 if ($widget->{is_toplevel}) {
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w}; 160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
166 } 165 }
167
168 $widget->reconfigure;
169 } 166 }
167
168 reconfigure_widgets;
170} 169}
171 170
172############################################################################# 171#############################################################################
173 172
174package CFClient::UI::Base; 173package CFClient::UI::Base;
… …
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 }, 224 },
226 ); 225 );
227} 226}
228 227
229sub hide { 228sub set_invisible {
230 my ($self) = @_; 229 my ($self) = @_;
230
231 # broken show/hide model
232
233 delete $self->{visible};
231 234
232 undef $GRAB if $GRAB == $self; 235 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self; 236 undef $HOVER if $HOVER == $self;
237
238 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self;
240
241 $self->focus_out;
242}
243
244sub hide {
245 my ($self) = @_;
246
247 $self->set_invisible;
234 248
235 $self->{parent}->remove ($self) 249 $self->{parent}->remove ($self)
236 if $self->{parent}; 250 if $self->{parent};
237} 251}
238 252
… …
308} 322}
309 323
310sub set_tooltip { 324sub set_tooltip {
311 my ($self, $tooltip) = @_; 325 my ($self, $tooltip) = @_;
312 326
327 $tooltip =~ s/^\s+//;
328 $tooltip =~ s/\s+$//;
329
330 return if $self->{tooltip} eq $tooltip;
331
313 $self->{tooltip} = $tooltip; 332 $self->{tooltip} = $tooltip;
314 333
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 334 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 335 delete $CFClient::UI::TOOLTIP->{owner};
317 CFClient::UI::check_tooltip; 336 CFClient::UI::check_tooltip;
… …
338 return if $FOCUS == $self; 357 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 358 return unless $self->{can_focus};
340 359
341 my $focus = $FOCUS; $FOCUS = $self; 360 my $focus = $FOCUS; $FOCUS = $self;
342 361
343 $self->emit (focus_in => $focus); 362 $self->_emit (focus_in => $focus);
344 363
345 $focus->update if $focus; 364 $focus->update if $focus;
346 $FOCUS->update; 365 $FOCUS->update;
347} 366}
348 367
… …
351 370
352 return unless $FOCUS == $self; 371 return unless $FOCUS == $self;
353 372
354 my $focus = $FOCUS; undef $FOCUS; 373 my $focus = $FOCUS; undef $FOCUS;
355 374
356 $self->emit (focus_out => $focus); 375 $self->_emit (focus_out => $focus);
357 376
358 $focus->update if $focus; #? 377 $focus->update if $focus; #?
378
379 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
380 unless $FOCUS;
359} 381}
360 382
361sub mouse_motion { } 383sub mouse_motion { }
362sub button_up { } 384sub button_up { }
363sub key_down { } 385sub key_down { }
364sub key_up { } 386sub key_up { }
365 387
366sub button_down { 388sub button_down {
367 my ($self, $ev, $x, $y) = @_; 389 my ($self, $ev, $x, $y) = @_;
368 390
369 $self->focus_in; 391 $self->focus_in;
… …
403 if ($ENV{PCLIENT_DEBUG}) { 425 if ($ENV{PCLIENT_DEBUG}) {
404 glPushMatrix; 426 glPushMatrix;
405 glColor 1, 1, 0, 1; 427 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP; 429 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0; 430 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 431 glVertex $self->{w} - 1, 0;
410 glVertex $self->{w}, $self->{h}; 432 glVertex $self->{w} - 1, $self->{h} - 1;
411 glVertex 0 , $self->{h}; 433 glVertex 0 , $self->{h} - 1;
412 glEnd; 434 glEnd;
413 glPopMatrix; 435 glPopMatrix;
414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 436 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415 } 437 }
416} 438}
… …
436sub set_parent { 458sub set_parent {
437 my ($self, $parent) = @_; 459 my ($self, $parent) = @_;
438 460
439 Scalar::Util::weaken ($self->{parent} = $parent); 461 Scalar::Util::weaken ($self->{parent} = $parent);
440 462
463 $self->{root} = $parent->{root};
464 $self->{visible} = $parent->{visible};
465
441 # TODO: req_w _does_change after ->reconfigure 466 # TODO: req_w _does_change after ->reconfigure
442 $self->check_size 467 $self->check_size
443 unless exists $self->{req_w}; 468 unless exists $self->{req_w};
444 469
445 $self->show; 470 $self->show;
… …
463 my ($self, $signal, $cb) = @_; 488 my ($self, $signal, $cb) = @_;
464 489
465 push @{ $self->{signal_cb}{$signal} }, $cb; 490 push @{ $self->{signal_cb}{$signal} }, $cb;
466} 491}
467 492
493sub _emit {
494 my ($self, $signal, @args) = @_;
495
496 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
497}
498
468sub emit { 499sub emit {
469 my ($self, $signal, @args) = @_; 500 my ($self, $signal, @args) = @_;
470 501
471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 502 $self->_emit ($signal, @args)
503 || $self->$signal (@args);
472} 504}
473 505
474sub DESTROY { 506sub DESTROY {
475 my ($self) = @_; 507 my ($self) = @_;
476 508
… …
589 delete $child->{parent}; 621 delete $child->{parent};
590 $child->hide; 622 $child->hide;
591 623
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 624 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 625
594 $self->check_size; 626 $self->check_size (1);
595 $self->update; 627 $self->update;
596} 628}
597 629
598sub clear { 630sub clear {
599 my ($self) = @_; 631 my ($self) = @_;
… …
739 771
740package CFClient::UI::ViewPort; 772package CFClient::UI::ViewPort;
741 773
742our @ISA = CFClient::UI::Window::; 774our @ISA = CFClient::UI::Window::;
743 775
776sub new {
777 my $class = shift;
778
779 $class->SUPER::new (
780 scroll_x => 0,
781 scroll_y => 1,
782 @_,
783 )
784}
785
744sub size_request { 786sub size_request {
745 my ($self) = @_; 787 my ($self) = @_;
746 788
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 789 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
748 790
… …
750} 792}
751 793
752sub size_allocate { 794sub size_allocate {
753 my ($self, $w, $h) = @_; 795 my ($self, $w, $h) = @_;
754 796
755 my ($cw, $ch) = @$self{qw(child_w child_h)}; 797 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
756# $w = $self->{w}; 798 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
799
757 $self->child->configure (0, 0, $cw, $ch); 800 $self->child->configure (0, 0, $w, $h);
758 $self->update; 801 $self->update;
759} 802}
760 803
761sub set_offset { 804sub set_offset {
762 my ($self, $x, $y) = @_; 805 my ($self, $x, $y) = @_;
… …
816 859
817 my $slider = new CFClient::UI::Slider 860 my $slider = new CFClient::UI::Slider
818 vertical => 1, 861 vertical => 1,
819 range => [0, 0, 1, 0.01], # HACK fix 862 range => [0, 0, 1, 0.01], # HACK fix
820 connect_changed => sub { 863 connect_changed => sub {
821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 864 $self->{vp}->set_offset (0, $_[1]);
822 }, 865 },
823 ; 866 ;
824 867
825 $self = $class->SUPER::new ( 868 $self = $class->SUPER::new (
826 vp => (new CFClient::UI::ViewPort expand => 1), 869 vp => (new CFClient::UI::ViewPort expand => 1),
… …
831 $self->{vp}->add ($self->{scrolled}); 874 $self->{vp}->add ($self->{scrolled});
832 $self->add ($self->{vp}); 875 $self->add ($self->{vp});
833 $self->add ($self->{slider}); 876 $self->add ($self->{slider});
834 877
835 $self 878 $self
879}
880
881sub size_allocate {
882 my ($self, $w, $h) = @_;
883
884 $self->SUPER::size_allocate ($w, $h);
885
886 my $child = $self->{vp}->child;
887 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
836} 888}
837 889
838#TODO# update range on size_allocate depending on child 890#TODO# update range on size_allocate depending on child
839# update viewport offset on scroll 891# update viewport offset on scroll
840 892
… …
894 my $class = shift; 946 my $class = shift;
895 947
896 # TODO: user_x, user_y, overwrite moveto? 948 # TODO: user_x, user_y, overwrite moveto?
897 949
898 my $self = $class->SUPER::new ( 950 my $self = $class->SUPER::new (
899 bg => [1, 1, 1, 1], 951 bg => [1, 1, 1, 1],
900 border_bg => [1, 1, 1, 1], 952 border_bg => [1, 1, 1, 1],
901 border => 0.6, 953 border => 0.6,
902 toplevel => 1, 954 is_toplevel => 1,
903 can_events => 1, 955 can_events => 1,
904 @_ 956 @_
905 ); 957 );
906 958
907 $self->{title} &&= new CFClient::UI::Label 959 $self->{title} &&= new CFClient::UI::Label
908 align => 0, 960 align => 0,
… …
1048sub new { 1100sub new {
1049 my $class = shift; 1101 my $class = shift;
1050 1102
1051 $class->SUPER::new ( 1103 $class->SUPER::new (
1052 col_expand => [], 1104 col_expand => [],
1053 @_ 1105 @_,
1054 ) 1106 )
1107}
1108
1109sub children {
1110 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1055} 1111}
1056 1112
1057sub add { 1113sub add {
1058 my ($self, $x, $y, $child) = @_; 1114 my ($self, $x, $y, $child) = @_;
1059 1115
1060 $child->set_parent ($self); 1116 $child->set_parent ($self);
1061 $self->{children}[$y][$x] = $child; 1117 $self->{children}[$y][$x] = $child;
1062 1118
1063 $child->check_size; 1119 $self->check_size (1);
1064} 1120}
1065 1121
1066sub children {
1067 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1068}
1069
1070# TODO: move to container class maybe? send childs a signal on removal? 1122# TODO: move to container class maybe? send children a signal on removal?
1071sub clear { 1123sub clear {
1072 my ($self) = @_; 1124 my ($self) = @_;
1073 1125
1074 my @children = $self->children; 1126 my @children = $self->children;
1075 delete $self->{children}; 1127 delete $self->{children};
… …
1077 for (@children) { 1129 for (@children) {
1078 delete $_->{parent}; 1130 delete $_->{parent};
1079 $_->hide; 1131 $_->hide;
1080 } 1132 }
1081 1133
1134 $self->check_size (1);
1082 $self->update; 1135 $self->update;
1083} 1136}
1084 1137
1085sub get_wh { 1138sub get_wh {
1086 my ($self) = @_; 1139 my ($self) = @_;
… …
1118sub size_allocate { 1171sub size_allocate {
1119 my ($self, $w, $h) = @_; 1172 my ($self, $w, $h) = @_;
1120 1173
1121 my ($ws, $hs) = $self->get_wh; 1174 my ($ws, $hs) = $self->get_wh;
1122 1175
1123 my $req_w = sum @$ws; 1176 my $req_w = (sum @$ws) || 1;
1124 my $req_h = sum @$hs; 1177 my $req_h = (sum @$hs) || 1;
1125 1178
1126 # TODO: nicer code && do row_expand 1179 # TODO: nicer code && do row_expand
1127 my @col_expand = @{$self->{col_expand}}; 1180 my @col_expand = @{$self->{col_expand}};
1128 @col_expand = (1) x @$ws unless @col_expand; 1181 @col_expand = (1) x @$ws unless @col_expand;
1129 my $col_expand = (sum @col_expand) || 1; 1182 my $col_expand = (sum @col_expand) || 1;
… …
1510 $self->{text} = $text; 1563 $self->{text} = $text;
1511 1564
1512 $text =~ s/./*/g if $self->{hidden}; 1565 $text =~ s/./*/g if $self->{hidden};
1513 $self->{layout}->set_text ("$text "); 1566 $self->{layout}->set_text ("$text ");
1514 1567
1515 $self->emit (changed => $self->{text}); 1568 $self->_emit (changed => $self->{text});
1516} 1569}
1517 1570
1518sub set_text { 1571sub set_text {
1519 my ($self, $text) = @_; 1572 my ($self, $text) = @_;
1520 1573
… …
1532 my ($self) = @_; 1585 my ($self) = @_;
1533 1586
1534 my ($w, $h) = $self->SUPER::size_request; 1587 my ($w, $h) = $self->SUPER::size_request;
1535 1588
1536 ($w + 1, $h) # add 1 for cursor 1589 ($w + 1, $h) # add 1 for cursor
1537}
1538
1539sub size_allocate {
1540 my ($self, $w, $h) = @_;
1541
1542 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1543} 1590}
1544 1591
1545sub key_down { 1592sub key_down {
1546 my ($self, $ev) = @_; 1593 my ($self, $ev) = @_;
1547 1594
… …
1562 } elsif ($sym == CFClient::SDLK_HOME) { 1609 } elsif ($sym == CFClient::SDLK_HOME) {
1563 $self->{cursor} = 0; 1610 $self->{cursor} = 0;
1564 } elsif ($sym == CFClient::SDLK_END) { 1611 } elsif ($sym == CFClient::SDLK_END) {
1565 $self->{cursor} = length $text; 1612 $self->{cursor} = length $text;
1566 } elsif ($uni == 27) { 1613 } elsif ($uni == 27) {
1567 $self->emit ('escape'); 1614 $self->_emit ('escape');
1568 } elsif ($uni) { 1615 } elsif ($uni) {
1569 substr $text, $self->{cursor}++, 0, chr $uni; 1616 substr $text, $self->{cursor}++, 0, chr $uni;
1570 } 1617 }
1571 1618
1572 $self->_set_text ($text); 1619 $self->_set_text ($text);
… …
1659 if ($sym == 13) { 1706 if ($sym == 13) {
1660 unshift @{$self->{history}}, 1707 unshift @{$self->{history}},
1661 my $txt = $self->get_text; 1708 my $txt = $self->get_text;
1662 $self->{history_pointer} = -1; 1709 $self->{history_pointer} = -1;
1663 $self->{history_saveback} = ''; 1710 $self->{history_saveback} = '';
1664 $self->emit (activate => $txt); 1711 $self->_emit (activate => $txt);
1665 $self->update; 1712 $self->update;
1666 1713
1667 } elsif ($sym == CFClient::SDLK_UP) { 1714 } elsif ($sym == CFClient::SDLK_UP) {
1668 if ($self->{history_pointer} < 0) { 1715 if ($self->{history_pointer} < 0) {
1669 $self->{history_saveback} = $self->get_text; 1716 $self->{history_saveback} = $self->get_text;
… …
1717 can_events => 1, 1764 can_events => 1,
1718 @_ 1765 @_
1719 ) 1766 )
1720} 1767}
1721 1768
1769sub activate { }
1770
1722sub button_up { 1771sub button_up {
1723 my ($self, $ev, $x, $y) = @_; 1772 my ($self, $ev, $x, $y) = @_;
1724 1773
1774 $self->emit ("activate")
1725 if ($x >= 0 && $x < $self->{w} 1775 if $x >= 0 && $x < $self->{w}
1726 && $y >= 0 && $y < $self->{h}) { 1776 && $y >= 0 && $y < $self->{h};
1727 $self->emit ("activate");
1728 }
1729} 1777}
1730 1778
1731sub _draw { 1779sub _draw {
1732 my ($self) = @_; 1780 my ($self) = @_;
1733 1781
… …
1785 my ($self, $ev, $x, $y) = @_; 1833 my ($self, $ev, $x, $y) = @_;
1786 1834
1787 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1835 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1788 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1836 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1789 $self->{state} = !$self->{state}; 1837 $self->{state} = !$self->{state};
1790 $self->emit (changed => $self->{state}); 1838 $self->_emit (changed => $self->{state});
1791 } 1839 }
1792} 1840}
1793 1841
1794sub _draw { 1842sub _draw {
1795 my ($self) = @_; 1843 my ($self) = @_;
… …
2070 my $self = $class->SUPER::new ( 2118 my $self = $class->SUPER::new (
2071 fg => [1, 1, 1], 2119 fg => [1, 1, 1],
2072 active_fg => [0, 0, 0], 2120 active_fg => [0, 0, 0],
2073 bg => [0, 0, 0, 0.2], 2121 bg => [0, 0, 0, 0.2],
2074 active_bg => [1, 1, 1, 0.5], 2122 active_bg => [1, 1, 1, 0.5],
2075 range => [0, 0, 100, 10], 2123 range => [0, 0, 100, 10, 0],
2076 req_w => $::WIDTH / 80, 2124 req_w => $::WIDTH / 80,
2077 req_h => $::WIDTH / 80, 2125 req_h => $::WIDTH / 80,
2078 vertical => 0, 2126 vertical => 0,
2079 can_hover => 1, 2127 can_hover => 1,
2080 inner_pad => 0.02, 2128 inner_pad => 0.02,
… …
2100 2148
2101 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2149 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2102 2150
2103 $hi = $lo + 1 if $hi <= $lo; 2151 $hi = $lo + 1 if $hi <= $lo;
2104 2152
2153 $page = $hi - $lo if $page > $hi - $lo;
2154
2105 $value = $lo if $value < $lo; 2155 $value = $lo if $value < $lo;
2106 $value = $hi if $value > $hi; 2156 $value = $hi - $page if $value > $hi - $page;
2107 2157
2108 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2158 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2109 if $unit; 2159 if $unit;
2110 2160
2111 $page = $hi - $lo if $page > $hi - $lo;
2112
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2161 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114 2162
2115 if ($value != $old_value) { 2163 if ($value != $old_value) {
2116 $self->emit (changed => $value); 2164 $self->_emit (changed => $value);
2117 $self->update; 2165 $self->update;
2118 } 2166 }
2119} 2167}
2120 2168
2121sub size_request { 2169sub size_request {
… …
2129 2177
2130sub button_down { 2178sub button_down {
2131 my ($self, $ev, $x, $y) = @_; 2179 my ($self, $ev, $x, $y) = @_;
2132 2180
2133 $self->SUPER::button_down ($ev, $x, $y); 2181 $self->SUPER::button_down ($ev, $x, $y);
2182
2183 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2184
2134 $self->mouse_motion ($ev, $x, $y); 2185 $self->mouse_motion ($ev, $x, $y);
2135} 2186}
2136 2187
2137sub mouse_motion { 2188sub mouse_motion {
2138 my ($self, $ev, $x, $y) = @_; 2189 my ($self, $ev, $x, $y) = @_;
… …
2140 if ($GRAB == $self) { 2191 if ($GRAB == $self) {
2141 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2192 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2142 2193
2143 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2194 my (undef, $lo, $hi, $page) = @{$self->{range}};
2144 2195
2145 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2196 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2146 2197
2147 $self->set_value ($x * ($hi - $lo) + $lo); 2198 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2148 } 2199 }
2149} 2200}
2150 2201
2151sub update { 2202sub update {
2152 my ($self) = @_; 2203 my ($self) = @_;
2153 2204
2154 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2205 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2155 $self->set_value ($self->{range}[0]); 2206 $self->set_value ($self->{range}[0]);
2156 2207
2157 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2208 my ($value, $lo, $hi, $page) = @{$self->{range}};
2209 my $range = ($hi - $page - $lo) || 1e-100;
2158 2210
2159 my $inner_w = 1 - 2 * $self->{inner_pad}; 2211 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2160 2212
2161 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2213 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2214 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2162 2215
2163 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2216 $value = ($value - $lo) / $range;
2164 $value = $self->{scale} * ($value - $lo); 2217 $value = $value * $self->{scale} + $self->{offset};
2165 2218
2166 $value = $self->{inner_pad} + ($value - $page * 0.5);
2167
2168 $value = 0 if $value < 0;
2169 $page = 1 - $value if $value + $page > 1;
2170
2171 $self->{knob_x} = $value; 2219 $self->{knob_x} = $value - $knob_w * 0.5;
2172 $self->{knob_w} = $page; 2220 $self->{knob_w} = $knob_w;
2173 }); 2221 });
2174 2222
2175 $self->SUPER::update; 2223 $self->SUPER::update;
2176} 2224}
2177 2225
… …
2293 $self->{layout}->set_width ($self->{children}[0]{w}); 2341 $self->{layout}->set_width ($self->{children}[0]{w});
2294 2342
2295 $self->reflow; 2343 $self->reflow;
2296} 2344}
2297 2345
2298sub text_height { 2346sub text_size {
2299 my ($self, $text, $indent) = @_; 2347 my ($self, $text, $indent) = @_;
2300 2348
2301 my $layout = $self->{layout}; 2349 my $layout = $self->{layout};
2302 2350
2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2351 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2304 $layout->set_width ($self->{children}[0]{w} - $indent); 2352 $layout->set_width ($self->{children}[0]{w} - $indent);
2305 $layout->set_markup ($text); 2353 $layout->set_markup ($text);
2306 2354
2307 ($layout->size)[1] 2355 $layout->size
2308} 2356}
2309 2357
2310sub reflow { 2358sub reflow {
2311 my ($self) = @_; 2359 my ($self) = @_;
2312 2360
2313 $self->{need_reflow}++; 2361 $self->{need_reflow}++;
2314 $self->update; 2362 $self->update;
2315} 2363}
2316 2364
2365sub set_offset {
2366 my ($self, $offset) = @_;
2367
2368 # todo: base offset on lines or so, not on pixels
2369 $self->{children}[1]->set_value ($offset);
2370}
2371
2317sub clear { 2372sub clear {
2318 my ($self) = @_; 2373 my ($self) = @_;
2319 2374
2320 $self->{par} = []; 2375 $self->{par} = [];
2321 $self->{height} = 0; 2376 $self->{height} = 0;
2322 2377 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2323 $self->reflow;
2324} 2378}
2325 2379
2326sub add_paragraph { 2380sub add_paragraph {
2327 my ($self, $color, $text, $indent) = @_; 2381 my ($self, $color, $text, $indent) = @_;
2328 2382
2329 for my $line (split /\n/, $text) { 2383 for my $line (split /\n/, $text) {
2330 my $height = $self->text_height ($line); 2384 my ($w, $h) = $self->text_size ($line);
2331 $self->{height} += $height; 2385 $self->{height} += $h;
2332 push @{$self->{par}}, [$height, $color, $indent, $line]; 2386 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2333 } 2387 }
2334 2388
2335 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2389 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2336 $self->{children}[1]->update;
2337} 2390}
2338 2391
2339sub update { 2392sub update {
2340 my ($self) = @_; 2393 my ($self) = @_;
2341 2394
… …
2344 return unless $self->{h} > 0; 2397 return unless $self->{h} > 0;
2345 2398
2346 delete $self->{texture}; 2399 delete $self->{texture};
2347 2400
2348 $ROOT->on_post_alloc ($self, sub { 2401 $ROOT->on_post_alloc ($self, sub {
2402 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2403
2349 if (delete $self->{need_reflow}) { 2404 if (delete $self->{need_reflow}) {
2350 my $height = 0; 2405 my $height = 0;
2351 2406
2352 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2407 my $layout = $self->{layout};
2408
2409 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2410
2353 for @{$self->{par}}; 2411 for (@{$self->{par}}) {
2412 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2413 $layout->set_width ($W - $_->[3]);
2414 $layout->set_markup ($_->[4]);
2415 my ($w, $h) = $layout->size;
2416 $_->[0] = $w + $_->[3];
2417 $_->[1] = $h;
2418 }
2419
2420 $height += $_->[1];
2421 }
2354 2422
2355 $self->{height} = $height; 2423 $self->{height} = $height;
2356 2424
2357 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2425 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2358 $self->{children}[1]->update;
2359 2426
2360 delete $self->{texture}; 2427 delete $self->{texture};
2361 } 2428 }
2362 2429
2363 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2430 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2364 glClearColor 0.5, 0.5, 0.5, 0; 2431 glClearColor 0.5, 0.5, 0.5, 0;
2365 glClear GL_COLOR_BUFFER_BIT; 2432 glClear GL_COLOR_BUFFER_BIT;
2366 2433
2367 my $top = int $self->{children}[1]{range}[0]; 2434 my $top = int $self->{children}[1]{range}[0];
2368 2435
2369 my $y0 = $top; 2436 my $y0 = $top;
2370 my $y1 = $top + $self->{h}; 2437 my $y1 = $top + $H;
2371 2438
2372 my $y = 0; 2439 my $y = 0;
2373 2440
2374 my $layout = $self->{layout}; 2441 my $layout = $self->{layout};
2375 2442
2376 $layout->set_font ($self->{font}) if $self->{font}; 2443 $layout->set_font ($self->{font}) if $self->{font};
2377 2444
2378 glEnable GL_BLEND; 2445 glEnable GL_BLEND;
2446 #TODO# not correct in windows where rgba is forced off
2379 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2447 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2380 2448
2381 for my $par (@{$self->{par}}) { 2449 for my $par (@{$self->{par}}) {
2382 my $h = $par->[0]; 2450 my $h = $par->[1];
2383 2451
2384 if ($y0 < $y + $h && $y < $y1) { 2452 if ($y0 < $y + $h && $y < $y1) {
2385 $layout->set_foreground (@{ $par->[1] }); 2453 $layout->set_foreground (@{ $par->[2] });
2386 $layout->set_width ($self->{w} - $par->[2]); 2454 $layout->set_width ($W - $par->[3]);
2387 $layout->set_markup ($par->[3]); 2455 $layout->set_markup ($par->[4]);
2388 2456
2389 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2457 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2390 2458
2391 glRasterPos $par->[2], $y - $y0; 2459 glRasterPos $par->[3], $y - $y0;
2392 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2460 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2393 } 2461 }
2394 2462
2395 $y += $h; 2463 $y += $h;
2396 } 2464 }
… …
2483 2551
2484 # TODO: use animation 2552 # TODO: use animation
2485 if ($self->{state} = !$self->{state}) { 2553 if ($self->{state} = !$self->{state}) {
2486 $CFClient::UI::ROOT->add ($self->{other}); 2554 $CFClient::UI::ROOT->add ($self->{other});
2487 $self->{other}->move ($self->coord2global (0, $self->{h})); 2555 $self->{other}->move ($self->coord2global (0, $self->{h}));
2488 $self->emit ("open"); 2556 $self->_emit ("open");
2489 } else { 2557 } else {
2490 $CFClient::UI::ROOT->remove ($self->{other}); 2558 $CFClient::UI::ROOT->remove ($self->{other});
2491 $self->emit ("close"); 2559 $self->_emit ("close");
2492 } 2560 }
2493 2561
2494 $self->emit (changed => $self->{state}); 2562 $self->_emit (changed => $self->{state});
2495} 2563}
2496 2564
2497############################################################################# 2565#############################################################################
2498 2566
2499package CFClient::UI::Tooltip; 2567package CFClient::UI::Tooltip;
… …
2575 2643
2576sub new { 2644sub new {
2577 my $class = shift; 2645 my $class = shift;
2578 2646
2579 my $self = $class->SUPER::new ( 2647 my $self = $class->SUPER::new (
2580 aspect => 1, 2648 aspect => 1,
2649 can_events => 0,
2581 @_, 2650 @_,
2582 ); 2651 );
2583 2652
2584 if ($self->{anim} && $self->{animspeed}) { 2653 if ($self->{anim} && $self->{animspeed}) {
2585 Scalar::Util::weaken (my $widget = $self); 2654 Scalar::Util::weaken (my $widget = $self);
… …
2611} 2680}
2612 2681
2613sub _draw { 2682sub _draw {
2614 my ($self) = @_; 2683 my ($self) = @_;
2615 2684
2616 return unless $::CONN;#d# manage and cache textures differently 2685 return unless $::CONN;
2617 2686
2618 my $face; 2687 my $face;
2619 2688
2620 if ($self->{frame}) { 2689 if ($self->{frame}) {
2621 my $anim = $::CONN->{anim}[$self->{anim}]; 2690 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2644 $self->SUPER::DESTROY; 2713 $self->SUPER::DESTROY;
2645} 2714}
2646 2715
2647############################################################################# 2716#############################################################################
2648 2717
2649package CFClient::UI::InventoryItem; 2718package CFClient::UI::Inventory;
2650 2719
2651our @ISA = CFClient::UI::HBox::; 2720our @ISA = CFClient::UI::ScrolledWindow::;
2652
2653sub _item_to_desc {
2654 my ($item) = @_;
2655
2656 my $desc =
2657 $item->{nrof} < 2
2658 ? $item->{name}
2659 : "$item->{nrof} × $item->{name_pl}";
2660
2661 $item->{flags} & Crossfire::Protocol::F_OPEN
2662 and $desc .= " (open)";
2663 $item->{flags} & Crossfire::Protocol::F_APPLIED
2664 and $desc .= " (applied)";
2665 $item->{flags} & Crossfire::Protocol::F_UNPAID
2666 and $desc .= " (unpaid)";
2667 $item->{flags} & Crossfire::Protocol::F_MAGIC
2668 and $desc .= " (magic)";
2669 $item->{flags} & Crossfire::Protocol::F_CURSED
2670 and $desc .= " (cursed)";
2671 $item->{flags} & Crossfire::Protocol::F_DAMNED
2672 and $desc .= " (damned)";
2673 $item->{flags} & Crossfire::Protocol::F_LOCKED
2674 and $desc .= " *";
2675
2676 $desc
2677}
2678 2721
2679sub new { 2722sub new {
2680 my $class = shift; 2723 my $class = shift;
2681 2724
2682 my %args = @_;
2683
2684 my $item = delete $args{item};
2685
2686 my $desc = _item_to_desc ($item);
2687
2688 my $self = $class->SUPER::new ( 2725 my $self = $class->SUPER::new (
2689 can_hover => 1,
2690 can_events => 1,
2691 tooltip => ((CFClient::UI::Label::escape $desc)
2692 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2693 connect_button_down => sub {
2694 my ($self, $ev, $x, $y) = @_;
2695
2696 # todo: maybe put examine on 1? but should just be a tooltip :(
2697 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2698 my $targ = $::CONN->{player}{tag};
2699
2700 if ($item->{container} == $::CONN->{player}{tag}) {
2701 $targ = $main::OPENCONT;
2702 }
2703
2704 $::CONN->send ("move $targ $item->{tag} 0");
2705 } elsif ($ev->{button} == 1) {
2706 $::CONN->send ("examine $item->{tag}");
2707 } elsif ($ev->{button} == 2) {
2708 $::CONN->send ("apply $item->{tag}");
2709 } elsif ($ev->{button} == 3) {
2710 my @menu_items = (
2711 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2712 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2713 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2714 (
2715 $item->{flags} & Crossfire::Protocol::F_LOCKED
2716 ? (
2717 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2718 )
2719 : (
2720 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2721 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2722 )
2723 ),
2724 );
2725
2726 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2727 }
2728
2729 1
2730 },
2731 %args
2732 );
2733
2734
2735 $self->add (new CFClient::UI::Face
2736 can_events => 0,
2737 face => $item->{face},
2738 anim => $item->{anim},
2739 animspeed => $item->{animspeed},
2740 );
2741
2742 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2743
2744 $self->{item} = $item;
2745
2746 $self->update_item;
2747
2748 $self
2749}
2750
2751sub update_item {
2752 my ($self) = @_;
2753
2754 my $desc = _item_to_desc ($self->{item});
2755
2756 $self->{name_lbl}->set_text ($desc);
2757}
2758
2759#############################################################################
2760
2761package CFClient::UI::Inventory;
2762
2763our @ISA = CFClient::UI::ScrolledWindow::;
2764
2765sub new {
2766 my $class = shift;
2767
2768 my $self = $class->SUPER::new (
2769 scrolled => (new CFClient::UI::Table), 2726 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2770 @_, 2727 @_,
2771 ); 2728 );
2772 2729
2773 $self 2730 $self
2774} 2731}
… …
2784 or ($a->{name} cmp $b->{name}) 2741 or ($a->{name} cmp $b->{name})
2785 } @$items; 2742 } @$items;
2786 2743
2787 $self->{real_items} = \@items; 2744 $self->{real_items} = \@items;
2788 2745
2746 my $row = 0;
2789 for my $item (@items) { 2747 for my $item (@items) {
2790 $item->{item} = $item; 2748 CFClient::Item::update_widgets $item;
2791 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2792 $item->update_item ();
2793 }
2794 2749
2795 my $i = 0; 2750 $self->{scrolled}->add (0, $row, $item->{face_widget});
2796 for (@items) { 2751 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2797 $self->{scrolled}->add (0, $i, $_); 2752 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2798 my $nrof = $_->{item}->{nrof} || 1; 2753
2799 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000); 2754 $row++;
2800 } 2755 }
2801 2756
2802# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2757# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2803} 2758}
2804 2759
… …
2847 2802
2848# popup given the event (must be a mouse button down event currently) 2803# popup given the event (must be a mouse button down event currently)
2849sub popup { 2804sub popup {
2850 my ($self, $ev) = @_; 2805 my ($self, $ev) = @_;
2851 2806
2852 $self->emit ("popdown"); 2807 $self->_emit ("popdown");
2853 2808
2854 # maybe save $GRAB? must be careful about events... 2809 # maybe save $GRAB? must be careful about events...
2855 $GRAB = $self; 2810 $GRAB = $self;
2856 $self->{button} = $ev->{button}; 2811 $self->{button} = $ev->{button};
2857 2812
… …
2872 2827
2873 if ($ev->{button} == $self->{button}) { 2828 if ($ev->{button} == $self->{button}) {
2874 undef $GRAB; 2829 undef $GRAB;
2875 $self->hide; 2830 $self->hide;
2876 2831
2877 $self->emit ("popdown"); 2832 $self->_emit ("popdown");
2878 $self->{hover}[1]->() if $self->{hover}; 2833 $self->{hover}[1]->() if $self->{hover};
2879 } 2834 }
2880} 2835}
2881 2836
2882############################################################################# 2837#############################################################################
… …
2944sub add { 2899sub add {
2945 my ($self, $text, %arg) = @_; 2900 my ($self, $text, %arg) = @_;
2946 2901
2947 $text =~ s/^\s+//; 2902 $text =~ s/^\s+//;
2948 $text =~ s/\s+$//; 2903 $text =~ s/\s+$//;
2904
2905 return unless $text;
2949 2906
2950 my $timeout = time + ((delete $arg{timeout}) || 60); 2907 my $timeout = time + ((delete $arg{timeout}) || 60);
2951 2908
2952 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 2909 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2953 2910
… …
3024} 2981}
3025 2982
3026sub size_allocate { 2983sub size_allocate {
3027 my ($self, $w, $h) = @_; 2984 my ($self, $w, $h) = @_;
3028 2985
3029 my $old_w = $self->{old_w}; $self->{old_w} = $w;
3030 my $old_h = $self->{old_h}; $self->{old_h} = $h;
3031
3032 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3033 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3034
3035 for my $child ($self->children) { 2986 for my $child ($self->children) {
3036 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 2987 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3037 2988
3038 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 2989 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3039 if exists $child->{req_x}; 2990 if exists $child->{req_x};
… …
3068} 3019}
3069 3020
3070sub add { 3021sub add {
3071 my ($self, @children) = @_; 3022 my ($self, @children) = @_;
3072 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
3073 for my $child (@children) { 3030 for my $child (@children) {
3074 $child->{toplevel} = 1; 3031 $child->{is_toplevel} = 1;
3075 3032
3076 # integerise window positions 3033 # integerise window positions
3077 $child->{x} = int $child->{x}; 3034 $child->{x} = int $child->{x};
3078 $child->{y} = int $child->{y}; 3035 $child->{y} = int $child->{y};
3079 } 3036 }
3080 3037
3081 $self->SUPER::add (@children); 3038 $self->SUPER::add (@children);
3039}
3040
3041sub remove {
3042 my ($self, @children) = @_;
3043
3044 $self->SUPER::remove (@children);
3082 3045
3083 while (@children) { 3046 while (@children) {
3084 my $w = pop @children; 3047 my $w = pop @children;
3085 push @children, $w->children; 3048 push @children, $w->children;
3086 $w->{visible} = 1; 3049 $w->set_invisible;
3087 }
3088}
3089
3090sub remove {
3091 my ($self, @children) = @_;
3092
3093 $self->SUPER::remove (@children);
3094
3095 while (@children) {
3096 my $w = pop @children;
3097 push @children, $w->children;
3098 delete $w->{visible};
3099 } 3050 }
3100} 3051}
3101 3052
3102sub on_refresh { 3053sub on_refresh {
3103 my ($self, $id, $cb) = @_; 3054 my ($self, $id, $cb) = @_;
… …
3157 $w = 0 if $w < 0; 3108 $w = 0 if $w < 0;
3158 $h = 0 if $h < 0; 3109 $h = 0 if $h < 0;
3159 3110
3160 $widget->{w} = $w; 3111 $widget->{w} = $w;
3161 $widget->{h} = $h; 3112 $widget->{h} = $h;
3162 $widget->size_allocate ($w, $h);
3163 $widget->emit (size_allocate => $w, $h); 3113 $widget->emit (size_allocate => $w, $h);
3164 } 3114 }
3165 } 3115 }
3166 3116
3167 while ($self->{post_alloc_hook}) { 3117 while ($self->{post_alloc_hook}) {

Diff Legend

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