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.220 by root, Mon May 22 03:28:55 2006 UTC vs.
Revision 1.229 by root, Wed May 24 21:49:58 2006 UTC

… …
206 %$self = (); 206 %$self = ();
207} 207}
208 208
209sub show { 209sub show {
210 my ($self) = @_; 210 my ($self) = @_;
211
212 return if $self->{parent}; 211 return if $self->{parent};
213 212
214 $CFClient::UI::ROOT->add ($self); 213 $CFClient::UI::ROOT->add ($self);
214}
215
216sub show_centered {
217 my ($self) = @_;
218 return if $self->{parent};
219
220 $self->show;
221
222 $CFClient::UI::ROOT->on_post_alloc (
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
215} 227}
216 228
217sub hide { 229sub hide {
218 my ($self) = @_; 230 my ($self) = @_;
219 231
… …
427 Scalar::Util::weaken ($self->{parent} = $parent); 439 Scalar::Util::weaken ($self->{parent} = $parent);
428 440
429 # TODO: req_w _does_change after ->reconfigure 441 # TODO: req_w _does_change after ->reconfigure
430 $self->check_size 442 $self->check_size
431 unless exists $self->{req_w}; 443 unless exists $self->{req_w};
444
445 $self->show;
432} 446}
433 447
434sub check_size { 448sub check_size {
435 my ($self, $forced) = @_; 449 my ($self, $forced) = @_;
436 450
… …
729 743
730sub size_request { 744sub size_request {
731 my ($self) = @_; 745 my ($self) = @_;
732 746
733 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
734 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
735 748
736 @$self{qw(child_w child_h)} 749 @$self{qw(child_w child_h)}
737} 750}
738 751
739sub size_allocate { 752sub size_allocate {
740 my ($self, $w, $h) = @_; 753 my ($self, $w, $h) = @_;
741 754
755 my ($cw, $ch) = @$self{qw(child_w child_h)};
756# $w = $self->{w};
757 $self->child->configure (0, 0, $cw, $ch);
742 $self->update; 758 $self->update;
743} 759}
744 760
745sub set_offset { 761sub set_offset {
746 my ($self, $x, $y) = @_; 762 my ($self, $x, $y) = @_;
… …
800 816
801 my $slider = new CFClient::UI::Slider 817 my $slider = new CFClient::UI::Slider
802 vertical => 1, 818 vertical => 1,
803 range => [0, 0, 1, 0.01], # HACK fix 819 range => [0, 0, 1, 0.01], # HACK fix
804 connect_changed => sub { 820 connect_changed => sub {
805 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 821 $self->{vp}->set_offset (0, $_[1]);
806 }, 822 },
807 ; 823 ;
808 824
809 $self = $class->SUPER::new ( 825 $self = $class->SUPER::new (
810 vp => (new CFClient::UI::ViewPort expand => 1), 826 vp => (new CFClient::UI::ViewPort expand => 1),
… …
815 $self->{vp}->add ($self->{scrolled}); 831 $self->{vp}->add ($self->{scrolled});
816 $self->add ($self->{vp}); 832 $self->add ($self->{vp});
817 $self->add ($self->{slider}); 833 $self->add ($self->{slider});
818 834
819 $self 835 $self
836}
837
838sub size_allocate {
839 my ($self, $w, $h) = @_;
840
841 $self->SUPER::size_allocate ($w, $h);
842
843 my $child = $self->{vp}->child;
844 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
820} 845}
821 846
822#TODO# update range on size_allocate depending on child 847#TODO# update range on size_allocate depending on child
823# update viewport offset on scroll 848# update viewport offset on scroll
824 849
… …
1474 active_fg => [0, 0, 0], 1499 active_fg => [0, 0, 0],
1475 can_hover => 1, 1500 can_hover => 1,
1476 can_focus => 1, 1501 can_focus => 1,
1477 valign => 0, 1502 valign => 0,
1478 can_events => 1, 1503 can_events => 1,
1504 #text => ...
1479 @_ 1505 @_
1480 ) 1506 )
1481} 1507}
1482 1508
1483sub _set_text { 1509sub _set_text {
… …
2053 my $self = $class->SUPER::new ( 2079 my $self = $class->SUPER::new (
2054 fg => [1, 1, 1], 2080 fg => [1, 1, 1],
2055 active_fg => [0, 0, 0], 2081 active_fg => [0, 0, 0],
2056 bg => [0, 0, 0, 0.2], 2082 bg => [0, 0, 0, 0.2],
2057 active_bg => [1, 1, 1, 0.5], 2083 active_bg => [1, 1, 1, 0.5],
2058 range => [0, 0, 100, 10], 2084 range => [0, 0, 100, 10, 0],
2059 req_w => $::WIDTH / 80, 2085 req_w => $::WIDTH / 80,
2060 req_h => $::WIDTH / 80, 2086 req_h => $::WIDTH / 80,
2061 vertical => 0, 2087 vertical => 0,
2062 can_hover => 1, 2088 can_hover => 1,
2063 inner_pad => 0.02, 2089 inner_pad => 0.02,
… …
2068 $self->update; 2094 $self->update;
2069 2095
2070 $self 2096 $self
2071} 2097}
2072 2098
2099sub set_range {
2100 my ($self, $range) = @_;
2101
2102 $self->{range} = $range;
2103
2104 $self->update;
2105}
2106
2073sub set_value { 2107sub set_value {
2074 my ($self, $value) = @_; 2108 my ($self, $value) = @_;
2075 2109
2076 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2110 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2077 2111
2078 $hi = $lo + 1 if $hi <= $lo; 2112 $hi = $lo + 1 if $hi <= $lo;
2079 2113
2114 $page = $hi - $lo if $page > $hi - $lo;
2115
2080 $value = $lo if $value < $lo; 2116 $value = $lo if $value < $lo;
2081 $value = $hi if $value > $hi; 2117 $value = $hi - $page if $value > $hi - $page;
2082 2118
2083 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2119 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2084 if $unit; 2120 if $unit;
2085
2086 $page = $hi - $lo if $page > $hi - $lo;
2087 2121
2088 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2122 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2089 2123
2090 if ($value != $old_value) { 2124 if ($value != $old_value) {
2091 $self->emit (changed => $value); 2125 $self->emit (changed => $value);
… …
2104 2138
2105sub button_down { 2139sub button_down {
2106 my ($self, $ev, $x, $y) = @_; 2140 my ($self, $ev, $x, $y) = @_;
2107 2141
2108 $self->SUPER::button_down ($ev, $x, $y); 2142 $self->SUPER::button_down ($ev, $x, $y);
2143
2144 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2145
2109 $self->mouse_motion ($ev, $x, $y); 2146 $self->mouse_motion ($ev, $x, $y);
2110} 2147}
2111 2148
2112sub mouse_motion { 2149sub mouse_motion {
2113 my ($self, $ev, $x, $y) = @_; 2150 my ($self, $ev, $x, $y) = @_;
… …
2115 if ($GRAB == $self) { 2152 if ($GRAB == $self) {
2116 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2153 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2117 2154
2118 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2155 my (undef, $lo, $hi, $page) = @{$self->{range}};
2119 2156
2120 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2157 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2121 2158
2122 $self->set_value ($x * ($hi - $lo) + $lo); 2159 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2123 } 2160 }
2124} 2161}
2125 2162
2126sub update { 2163sub update {
2127 my ($self) = @_; 2164 my ($self) = @_;
2128 2165
2129 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2166 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2130 $self->set_value ($self->{range}[0]); 2167 $self->set_value ($self->{range}[0]);
2131 2168
2132 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2169 my ($value, $lo, $hi, $page) = @{$self->{range}};
2170 my $range = ($hi - $page - $lo) || 1e-100;
2133 2171
2134 my $inner_w = 1 - 2 * $self->{inner_pad}; 2172 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2135 2173
2136 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2174 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2175 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2137 2176
2138 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2177 $value = ($value - $lo) / $range;
2139 $value = $self->{scale} * ($value - $lo); 2178 $value = $value * $self->{scale} + $self->{offset};
2140 2179
2141 $value = $self->{inner_pad} + ($value - $page * 0.5);
2142
2143 $value = 0 if $value < 0;
2144 $page = 1 - $value if $value + $page > 1;
2145
2146 $self->{knob_x} = $value; 2180 $self->{knob_x} = $value - $knob_w * 0.5;
2147 $self->{knob_w} = $page; 2181 $self->{knob_w} = $knob_w;
2148 }); 2182 });
2149 2183
2150 $self->SUPER::update; 2184 $self->SUPER::update;
2151} 2185}
2152 2186
… …
2176 # draw handle 2210 # draw handle
2177 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2211 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2178 2212
2179 glDisable GL_TEXTURE_2D; 2213 glDisable GL_TEXTURE_2D;
2180} 2214}
2215
2216#############################################################################
2217
2218package CFClient::UI::ValSlider;
2219
2220our @ISA = CFClient::UI::HBox::;
2221
2222sub new {
2223 my ($class, %arg) = @_;
2224
2225 my $range = delete $arg{range};
2226
2227 my $self = $class->SUPER::new (
2228 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2229 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2230 to_value => sub { shift },
2231 from_value => sub { shift },
2232 %arg,
2233 );
2234
2235 $self->{slider}->connect (changed => sub {
2236 my ($self, $value) = @_;
2237 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2238 $self->{parent}->emit (changed => $value);
2239 });
2240
2241# $self->{entry}->connect (changed => sub {
2242# my ($self, $value) = @_;
2243# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2244# $self->{parent}->emit (changed => $value);
2245# });
2246
2247 $self->add ($self->{slider}, $self->{entry});
2248
2249 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2250
2251 $self
2252}
2253
2254sub set_range { shift->{slider}->set_range (@_) }
2255sub set_value { shift->{slider}->set_value (@_) }
2181 2256
2182############################################################################# 2257#############################################################################
2183 2258
2184package CFClient::UI::TextView; 2259package CFClient::UI::TextView;
2185 2260
… …
2227 $self->{layout}->set_width ($self->{children}[0]{w}); 2302 $self->{layout}->set_width ($self->{children}[0]{w});
2228 2303
2229 $self->reflow; 2304 $self->reflow;
2230} 2305}
2231 2306
2232sub text_height { 2307sub text_size {
2233 my ($self, $text, $indent) = @_; 2308 my ($self, $text, $indent) = @_;
2234 2309
2235 my $layout = $self->{layout}; 2310 my $layout = $self->{layout};
2236 2311
2237 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2312 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2238 $layout->set_width ($self->{children}[0]{w} - $indent); 2313 $layout->set_width ($self->{children}[0]{w} - $indent);
2239 $layout->set_markup ($text); 2314 $layout->set_markup ($text);
2240 2315
2241 ($layout->size)[1] 2316 $layout->size
2242} 2317}
2243 2318
2244sub reflow { 2319sub reflow {
2245 my ($self) = @_; 2320 my ($self) = @_;
2246 2321
2247 $self->{need_reflow}++; 2322 $self->{need_reflow}++;
2248 $self->update; 2323 $self->update;
2249} 2324}
2250 2325
2326sub set_offset {
2327 my ($self, $offset) = @_;
2328
2329 # todo: base offset on lines or so, not on pixels
2330 $self->{children}[1]->set_value ($offset);
2331}
2332
2333sub clear {
2334 my ($self) = @_;
2335
2336 $self->{par} = [];
2337 $self->{height} = 0;
2338 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2339}
2340
2251sub add_paragraph { 2341sub add_paragraph {
2252 my ($self, $color, $text, $indent) = @_; 2342 my ($self, $color, $text, $indent) = @_;
2253 2343
2254 #TODO: intelligently "reformat" paragraph
2255
2256 for my $line (split /\n/, $text) { 2344 for my $line (split /\n/, $text) {
2257 my $height = $self->text_height ($line); 2345 my ($w, $h) = $self->text_size ($line);
2258 $self->{height} += $height; 2346 $self->{height} += $h;
2259 push @{$self->{par}}, [$height, $color, $indent, $line]; 2347 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2260 } 2348 }
2261 2349
2262 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2350 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2263 $self->{children}[1]->update;
2264} 2351}
2265 2352
2266sub update { 2353sub update {
2267 my ($self) = @_; 2354 my ($self) = @_;
2268 2355
… …
2271 return unless $self->{h} > 0; 2358 return unless $self->{h} > 0;
2272 2359
2273 delete $self->{texture}; 2360 delete $self->{texture};
2274 2361
2275 $ROOT->on_post_alloc ($self, sub { 2362 $ROOT->on_post_alloc ($self, sub {
2363 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2364
2276 if (delete $self->{need_reflow}) { 2365 if (delete $self->{need_reflow}) {
2277 my $height = 0; 2366 my $height = 0;
2278 2367
2279 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2368 my $layout = $self->{layout};
2369
2370 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2371
2280 for @{$self->{par}}; 2372 for (@{$self->{par}}) {
2373 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2374 $layout->set_width ($W - $_->[3]);
2375 $layout->set_markup ($_->[4]);
2376 my ($w, $h) = $layout->size;
2377 $_->[0] = $w + $_->[3];
2378 $_->[1] = $h;
2379 }
2380
2381 $height += $_->[1];
2382 }
2281 2383
2282 $self->{height} = $height; 2384 $self->{height} = $height;
2283 2385
2284 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2386 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2285 $self->{children}[1]->update;
2286 2387
2287 delete $self->{texture}; 2388 delete $self->{texture};
2288 } 2389 }
2289 2390
2290 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2391 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2291 glClearColor 0.5, 0.5, 0.5, 0; 2392 glClearColor 0.5, 0.5, 0.5, 0;
2292 glClear GL_COLOR_BUFFER_BIT; 2393 glClear GL_COLOR_BUFFER_BIT;
2293 2394
2294 my $top = int $self->{children}[1]{range}[0]; 2395 my $top = int $self->{children}[1]{range}[0];
2295 2396
2296 my $y0 = $top; 2397 my $y0 = $top;
2297 my $y1 = $top + $self->{h}; 2398 my $y1 = $top + $H;
2298 2399
2299 my $y = 0; 2400 my $y = 0;
2300 2401
2301 my $layout = $self->{layout}; 2402 my $layout = $self->{layout};
2302 2403
2303 $layout->set_font ($self->{font}) if $self->{font}; 2404 $layout->set_font ($self->{font}) if $self->{font};
2304 2405
2305 glEnable GL_BLEND; 2406 glEnable GL_BLEND;
2407 #TODO# not correct in windows where rgba is forced off
2306 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2408 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2307 2409
2308 for my $par (@{$self->{par}}) { 2410 for my $par (@{$self->{par}}) {
2309 my $h = $par->[0]; 2411 my $h = $par->[1];
2310 2412
2311 if ($y0 < $y + $h && $y < $y1) { 2413 if ($y0 < $y + $h && $y < $y1) {
2312 $layout->set_foreground (@{ $par->[1] }); 2414 $layout->set_foreground (@{ $par->[2] });
2313 $layout->set_width ($self->{w} - $par->[2]); 2415 $layout->set_width ($W - $par->[3]);
2314 $layout->set_markup ($par->[3]); 2416 $layout->set_markup ($par->[4]);
2315 2417
2316 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2418 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2317 2419
2318 glRasterPos $par->[2], $y - $y0; 2420 glRasterPos $par->[3], $y - $y0;
2319 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2421 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2320 } 2422 }
2321 2423
2322 $y += $h; 2424 $y += $h;
2323 } 2425 }
… …
2527 2629
2528sub size_request { 2630sub size_request {
2529 (32, 8) 2631 (32, 8)
2530} 2632}
2531 2633
2634sub update {
2635 my ($self) = @_;
2636
2637 return unless $self->{visible};
2638
2639 $self->SUPER::update;
2640}
2641
2532sub _draw { 2642sub _draw {
2533 my ($self) = @_; 2643 my ($self) = @_;
2534 2644
2535 return unless $::CONN;#d# manage and cache textures differently 2645 return unless $::CONN;
2536 2646
2537 my $face; 2647 my $face;
2538 2648
2539 if ($self->{frame}) { 2649 if ($self->{frame}) {
2540 my $anim = $::CONN->{anim}[$self->{anim}]; 2650 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2606 2716
2607 my $self = $class->SUPER::new ( 2717 my $self = $class->SUPER::new (
2608 can_hover => 1, 2718 can_hover => 1,
2609 can_events => 1, 2719 can_events => 1,
2610 tooltip => ((CFClient::UI::Label::escape $desc) 2720 tooltip => ((CFClient::UI::Label::escape $desc)
2611 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2721 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2612 connect_button_down => sub { 2722 connect_button_down => sub {
2613 my ($self, $ev, $x, $y) = @_; 2723 my ($self, $ev, $x, $y) = @_;
2614 2724
2615 # todo: maybe put examine on 1? but should just be a tooltip :( 2725 # todo: maybe put examine on 1? but should just be a tooltip :(
2616 if ($ev->{button} == 1) { 2726 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2617 my $targ = $::CONN->{player}{tag}; 2727 my $targ = $::CONN->{player}{tag};
2618 2728
2619 if ($item->{container} == $::CONN->{player}{tag}) { 2729 if ($item->{container} == $::CONN->{player}{tag}) {
2620 $targ = $main::OPENCONT; 2730 $targ = $main::OPENCONT;
2621 } 2731 }
2622 2732
2623 $::CONN->send ("move $targ $item->{tag} 0"); 2733 $::CONN->send ("move $targ $item->{tag} 0");
2734 } elsif ($ev->{button} == 1) {
2735 $::CONN->send ("examine $item->{tag}");
2624 } elsif ($ev->{button} == 2) { 2736 } elsif ($ev->{button} == 2) {
2625 $::CONN->send ("apply $item->{tag}"); 2737 $::CONN->send ("apply $item->{tag}");
2626 } elsif ($ev->{button} == 3) { 2738 } elsif ($ev->{button} == 3) {
2627 my @menu_items = ( 2739 my @menu_items = (
2628 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2740 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
… …
2681 2793
2682sub new { 2794sub new {
2683 my $class = shift; 2795 my $class = shift;
2684 2796
2685 my $self = $class->SUPER::new ( 2797 my $self = $class->SUPER::new (
2686 scrolled => (new CFClient::UI::VBox), 2798 scrolled => (new CFClient::UI::Table),
2687 @_, 2799 @_,
2688 ); 2800 );
2689 2801
2690 $self 2802 $self
2691} 2803}
… …
2702 } @$items; 2814 } @$items;
2703 2815
2704 $self->{real_items} = \@items; 2816 $self->{real_items} = \@items;
2705 2817
2706 for my $item (@items) { 2818 for my $item (@items) {
2819 $item->{item} = $item;
2707 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2820 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2708 $item->update_item (); 2821 $item->update_item ();
2709 } 2822 }
2710 2823
2824 my $i = 0;
2825 for (@items) {
2711 $self->{scrolled}->add (@items); 2826 $self->{scrolled}->add (0, $i, $_);
2827 my $nrof = $_->{item}->{nrof} || 1;
2828 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2829 }
2712 2830
2713# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2831# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2714} 2832}
2715 2833
2716sub size_request { 2834sub size_request {
… …
2979} 3097}
2980 3098
2981sub add { 3099sub add {
2982 my ($self, @children) = @_; 3100 my ($self, @children) = @_;
2983 3101
3102 for (my @widgets = @children; my $w = pop @widgets; ) {
3103 push @widgets, $w->children;
3104 $w->{root} = $self;
3105 $w->{visible} = 1;
3106 }
3107
2984 for my $child (@children) { 3108 for my $child (@children) {
2985 $child->{toplevel} = 1; 3109 $child->{toplevel} = 1;
2986 3110
2987 # integerise window positions 3111 # integerise window positions
2988 $child->{x} = int $child->{x}; 3112 $child->{x} = int $child->{x};
2989 $child->{y} = int $child->{y}; 3113 $child->{y} = int $child->{y};
2990 } 3114 }
2991 3115
2992 $self->SUPER::add (@children); 3116 $self->SUPER::add (@children);
3117}
3118
3119sub remove {
3120 my ($self, @children) = @_;
3121
3122 $self->SUPER::remove (@children);
3123
3124 while (@children) {
3125 my $w = pop @children;
3126 push @children, $w->children;
3127 delete $w->{visible};
3128 }
2993} 3129}
2994 3130
2995sub on_refresh { 3131sub on_refresh {
2996 my ($self, $id, $cb) = @_; 3132 my ($self, $id, $cb) = @_;
2997 3133

Diff Legend

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