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.217 by root, Fri May 19 23:18:42 2006 UTC vs.
Revision 1.227 by root, Wed May 24 03:29:20 2006 UTC

… …
134 for (@$vals) { 134 for (@$vals) {
135 my $i = int $_ + $rem; 135 my $i = int $_ + $rem;
136 $rem += $_ - $i; 136 $rem += $_ - $i;
137 $_ = $i; 137 $_ = $i;
138 } 138 }
139}
140
141sub full_refresh {
142 # make a copy, otherwise for complains about freed values.
143 my @widgets = values %WIDGET;
144
145 $_->update
146 for @widgets;
139} 147}
140 148
141# call when resolution changes etc. 149# call when resolution changes etc.
142sub rescale_widgets { 150sub rescale_widgets {
143 my ($sx, $sy) = @_; 151 my ($sx, $sy) = @_;
… …
198 %$self = (); 206 %$self = ();
199} 207}
200 208
201sub show { 209sub show {
202 my ($self) = @_; 210 my ($self) = @_;
203
204 return if $self->{parent}; 211 return if $self->{parent};
205 212
206 $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 );
207} 227}
208 228
209sub hide { 229sub hide {
210 my ($self) = @_; 230 my ($self) = @_;
211 231
… …
419 Scalar::Util::weaken ($self->{parent} = $parent); 439 Scalar::Util::weaken ($self->{parent} = $parent);
420 440
421 # TODO: req_w _does_change after ->reconfigure 441 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size 442 $self->check_size
423 unless exists $self->{req_w}; 443 unless exists $self->{req_w};
444
445 $self->show;
424} 446}
425 447
426sub check_size { 448sub check_size {
427 my ($self, $forced) = @_; 449 my ($self, $forced) = @_;
428 450
… …
721 743
722sub size_request { 744sub size_request {
723 my ($self) = @_; 745 my ($self) = @_;
724 746
725 @$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)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 748
728 @$self{qw(child_w child_h)} 749 @$self{qw(child_w child_h)}
729} 750}
730 751
731sub size_allocate { 752sub size_allocate {
732 my ($self, $w, $h) = @_; 753 my ($self, $w, $h) = @_;
733 754
755 my ($cw, $ch) = @$self{qw(child_w child_h)};
756# $w = $self->{w};
757 $self->child->configure (0, 0, $cw, $ch);
734 $self->update; 758 $self->update;
735} 759}
736 760
737sub set_offset { 761sub set_offset {
738 my ($self, $x, $y) = @_; 762 my ($self, $x, $y) = @_;
… …
1466 active_fg => [0, 0, 0], 1490 active_fg => [0, 0, 0],
1467 can_hover => 1, 1491 can_hover => 1,
1468 can_focus => 1, 1492 can_focus => 1,
1469 valign => 0, 1493 valign => 0,
1470 can_events => 1, 1494 can_events => 1,
1495 #text => ...
1471 @_ 1496 @_
1472 ) 1497 )
1473} 1498}
1474 1499
1475sub _set_text { 1500sub _set_text {
… …
2045 my $self = $class->SUPER::new ( 2070 my $self = $class->SUPER::new (
2046 fg => [1, 1, 1], 2071 fg => [1, 1, 1],
2047 active_fg => [0, 0, 0], 2072 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2], 2073 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5], 2074 active_bg => [1, 1, 1, 0.5],
2050 range => [0, 0, 100, 10], 2075 range => [0, 0, 100, 10, 0],
2051 req_w => $::WIDTH / 80, 2076 req_w => $::WIDTH / 80,
2052 req_h => $::WIDTH / 80, 2077 req_h => $::WIDTH / 80,
2053 vertical => 0, 2078 vertical => 0,
2054 can_hover => 1, 2079 can_hover => 1,
2055 inner_pad => 0.02, 2080 inner_pad => 0.02,
… …
2060 $self->update; 2085 $self->update;
2061 2086
2062 $self 2087 $self
2063} 2088}
2064 2089
2090sub set_range {
2091 my ($self, $range) = @_;
2092
2093 $self->{range} = $range;
2094
2095 $self->update;
2096}
2097
2065sub set_value { 2098sub set_value {
2066 my ($self, $value) = @_; 2099 my ($self, $value) = @_;
2067 2100
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2101 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069 2102
2070 $hi = $lo + 1 if $hi <= $lo; 2103 $hi = $lo + 1 if $hi <= $lo;
2071 2104
2105 $page = $hi - $lo if $page > $hi - $lo;
2106
2072 $value = $lo if $value < $lo; 2107 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi; 2108 $value = $hi - $page if $value > $hi - $page;
2074 2109
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2110 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit; 2111 if $unit;
2077
2078 $page = $hi - $lo if $page > $hi - $lo;
2079 2112
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081 2114
2082 if ($value != $old_value) { 2115 if ($value != $old_value) {
2083 $self->emit (changed => $value); 2116 $self->emit (changed => $value);
… …
2096 2129
2097sub button_down { 2130sub button_down {
2098 my ($self, $ev, $x, $y) = @_; 2131 my ($self, $ev, $x, $y) = @_;
2099 2132
2100 $self->SUPER::button_down ($ev, $x, $y); 2133 $self->SUPER::button_down ($ev, $x, $y);
2134
2135 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2136
2101 $self->mouse_motion ($ev, $x, $y); 2137 $self->mouse_motion ($ev, $x, $y);
2102} 2138}
2103 2139
2104sub mouse_motion { 2140sub mouse_motion {
2105 my ($self, $ev, $x, $y) = @_; 2141 my ($self, $ev, $x, $y) = @_;
… …
2107 if ($GRAB == $self) { 2143 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2144 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109 2145
2110 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2146 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111 2147
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2148 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2113 2149
2114 $self->set_value ($x * ($hi - $lo) + $lo); 2150 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2115 } 2151 }
2116} 2152}
2117 2153
2118sub update { 2154sub update {
2119 my ($self) = @_; 2155 my ($self) = @_;
2120 2156
2121 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2157 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2122 $self->set_value ($self->{range}[0]); 2158 $self->set_value ($self->{range}[0]);
2123 2159
2124 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2160 my ($value, $lo, $hi, $page) = @{$self->{range}};
2161 my $range = ($hi - $page - $lo) || 1e-100;
2125 2162
2126 my $inner_w = 1 - 2 * $self->{inner_pad}; 2163 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2127 2164
2128 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2165 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2166 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2129 2167
2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2168 $value = ($value - $lo) / $range;
2131 $value = $self->{scale} * ($value - $lo); 2169 $value = $value * $self->{scale} + $self->{offset};
2132 2170
2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
2134
2135 $value = 0 if $value < 0;
2136 $page = 1 - $value if $value + $page > 1;
2137
2138 $self->{knob_x} = $value; 2171 $self->{knob_x} = $value - $knob_w * 0.5;
2139 $self->{knob_w} = $page; 2172 $self->{knob_w} = $knob_w;
2140 }); 2173 });
2141 2174
2142 $self->SUPER::update; 2175 $self->SUPER::update;
2143} 2176}
2144 2177
… …
2168 # draw handle 2201 # draw handle
2169 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2202 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2170 2203
2171 glDisable GL_TEXTURE_2D; 2204 glDisable GL_TEXTURE_2D;
2172} 2205}
2206
2207#############################################################################
2208
2209package CFClient::UI::ValSlider;
2210
2211our @ISA = CFClient::UI::HBox::;
2212
2213sub new {
2214 my ($class, %arg) = @_;
2215
2216 my $range = delete $arg{range};
2217
2218 my $self = $class->SUPER::new (
2219 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2220 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2221 to_value => sub { shift },
2222 from_value => sub { shift },
2223 %arg,
2224 );
2225
2226 $self->{slider}->connect (changed => sub {
2227 my ($self, $value) = @_;
2228 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2229 $self->{parent}->emit (changed => $value);
2230 });
2231
2232# $self->{entry}->connect (changed => sub {
2233# my ($self, $value) = @_;
2234# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2235# $self->{parent}->emit (changed => $value);
2236# });
2237
2238 $self->add ($self->{slider}, $self->{entry});
2239
2240 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2241
2242 $self
2243}
2244
2245sub set_range { shift->{slider}->set_range (@_) }
2246sub set_value { shift->{slider}->set_value (@_) }
2173 2247
2174############################################################################# 2248#############################################################################
2175 2249
2176package CFClient::UI::TextView; 2250package CFClient::UI::TextView;
2177 2251
… …
2207 2281
2208 $self->{fontsize} = $fontsize; 2282 $self->{fontsize} = $fontsize;
2209 $self->reflow; 2283 $self->reflow;
2210} 2284}
2211 2285
2286sub size_allocate {
2287 my ($self, $w, $h) = @_;
2288
2289 $self->SUPER::size_allocate ($w, $h);
2290
2291 $self->{layout}->set_font ($self->{font}) if $self->{font};
2292 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2293 $self->{layout}->set_width ($self->{children}[0]{w});
2294
2295 $self->reflow;
2296}
2297
2212sub text_height { 2298sub text_height {
2213 my ($self, $text) = @_; 2299 my ($self, $text, $indent) = @_;
2214 2300
2215 my $layout = $self->{layout}; 2301 my $layout = $self->{layout};
2216 2302
2217 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2218 $layout->set_width ($self->{children}[0]{w}); 2304 $layout->set_width ($self->{children}[0]{w} - $indent);
2219 $layout->set_markup ($text); 2305 $layout->set_markup ($text);
2220 2306
2221 ($layout->size)[1] 2307 ($layout->size)[1]
2222} 2308}
2223 2309
… …
2226 2312
2227 $self->{need_reflow}++; 2313 $self->{need_reflow}++;
2228 $self->update; 2314 $self->update;
2229} 2315}
2230 2316
2231sub size_allocate { 2317sub set_offset {
2318 my ($self, $offset) = @_;
2319
2320 # todo: base offset on lines or so, not on pixels
2321 $self->{children}[1]->set_value ($offset);
2322}
2323
2324sub clear {
2232 my ($self, $w, $h) = @_; 2325 my ($self) = @_;
2233 2326
2234 $self->SUPER::size_allocate ($w, $h); 2327 $self->{par} = [];
2235 2328 $self->{height} = 0;
2236 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2329 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2237 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2238 $self->{layout}->set_width ($self->{children}[0]{w});
2239
2240 $self->reflow;
2241} 2330}
2242 2331
2243sub add_paragraph { 2332sub add_paragraph {
2244 my ($self, $color, $text) = @_; 2333 my ($self, $color, $text, $indent) = @_;
2245 2334
2246 #TODO: intelligently "reformat" paragraph 2335 for my $line (split /\n/, $text) {
2247
2248 my $height = $self->text_height ($text); 2336 my $height = $self->text_height ($line);
2249
2250 $self->{height} += $height; 2337 $self->{height} += $height;
2251
2252 push @{$self->{par}}, [$height, $color, $text]; 2338 push @{$self->{par}}, [$height, $color, $indent, $line];
2339 }
2253 2340
2254 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2341 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2255 $self->{children}[1]->update;
2256} 2342}
2257 2343
2258sub update { 2344sub update {
2259 my ($self) = @_; 2345 my ($self) = @_;
2260 2346
… …
2266 2352
2267 $ROOT->on_post_alloc ($self, sub { 2353 $ROOT->on_post_alloc ($self, sub {
2268 if (delete $self->{need_reflow}) { 2354 if (delete $self->{need_reflow}) {
2269 my $height = 0; 2355 my $height = 0;
2270 2356
2271 $height += $_->[0] = $self->text_height ($_->[2]) 2357 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2272 for @{$self->{par}}; 2358 for @{$self->{par}};
2273 2359
2274 $self->{height} = $height; 2360 $self->{height} = $height;
2275 2361
2276 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2362 $self->{children}[1]->set_range ([$height, 0, $height, $self->{h}, 1]);
2277 2363
2278 delete $self->{texture}; 2364 delete $self->{texture};
2279 } 2365 }
2280 2366
2281 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2367 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2282 glClearColor 0.5, 0.5, 0.5, 0; 2368 glClearColor 0.5, 0.5, 0.5, 0;
2283 glClear GL_COLOR_BUFFER_BIT; 2369 glClear GL_COLOR_BUFFER_BIT;
2284 2370
2285 glEnable GL_TEXTURE_2D;
2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2287
2288 my $top = int $self->{children}[1]{range}[0]; 2371 my $top = int $self->{children}[1]{range}[0];
2289 2372
2290 my $y0 = $top; 2373 my $y0 = $top;
2291 my $y1 = $top + $self->{h}; 2374 my $y1 = $top + $self->{h};
2292 2375
… …
2294 2377
2295 my $layout = $self->{layout}; 2378 my $layout = $self->{layout};
2296 2379
2297 $layout->set_font ($self->{font}) if $self->{font}; 2380 $layout->set_font ($self->{font}) if $self->{font};
2298 2381
2382 glEnable GL_BLEND;
2383 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2384
2299 for my $par (@{$self->{par}}) { 2385 for my $par (@{$self->{par}}) {
2300 my $h = $par->[0]; 2386 my $h = $par->[0];
2301 2387
2302 if ($y0 < $y + $h && $y < $y1) { 2388 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] }); 2389 $layout->set_foreground (@{ $par->[1] });
2390 $layout->set_width ($self->{w} - $par->[2]);
2304 $layout->set_markup ($par->[2]); 2391 $layout->set_markup ($par->[3]);
2305 2392
2306 my ($W, $H) = $layout->size; 2393 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2307 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2394
2395 glRasterPos $par->[2], $y - $y0;
2396 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2308 } 2397 }
2309 2398
2310 $y += $h; 2399 $y += $h;
2311 } 2400 }
2312 2401
2313 glDisable GL_TEXTURE_2D; 2402 glDisable GL_BLEND;
2314 }; 2403 };
2315 }); 2404 });
2316} 2405}
2317 2406
2318sub _draw { 2407sub _draw {
… …
2515 2604
2516sub size_request { 2605sub size_request {
2517 (32, 8) 2606 (32, 8)
2518} 2607}
2519 2608
2609sub update {
2610 my ($self) = @_;
2611
2612 return unless $self->{visible};
2613
2614 $self->SUPER::update;
2615}
2616
2520sub _draw { 2617sub _draw {
2521 my ($self) = @_; 2618 my ($self) = @_;
2522 2619
2523 return unless $::CONN;#d# manage and cache textures differently 2620 return unless $::CONN;
2524 2621
2525 my $face; 2622 my $face;
2526 2623
2527 if ($self->{frame}) { 2624 if ($self->{frame}) {
2528 my $anim = $::CONN->{anim}[$self->{anim}]; 2625 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2594 2691
2595 my $self = $class->SUPER::new ( 2692 my $self = $class->SUPER::new (
2596 can_hover => 1, 2693 can_hover => 1,
2597 can_events => 1, 2694 can_events => 1,
2598 tooltip => ((CFClient::UI::Label::escape $desc) 2695 tooltip => ((CFClient::UI::Label::escape $desc)
2599 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"), 2696 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2600 connect_button_down => sub { 2697 connect_button_down => sub {
2601 my ($self, $ev, $x, $y) = @_; 2698 my ($self, $ev, $x, $y) = @_;
2602 2699
2603 # todo: maybe put examine on 1? but should just be a tooltip :( 2700 # todo: maybe put examine on 1? but should just be a tooltip :(
2604 if ($ev->{button} == 1) { 2701 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2605 my $targ = $::CONN->{player}{tag}; 2702 my $targ = $::CONN->{player}{tag};
2606 2703
2607 if ($item->{container} == $::CONN->{player}{tag}) { 2704 if ($item->{container} == $::CONN->{player}{tag}) {
2608 $targ = $main::OPENCONT; 2705 $targ = $main::OPENCONT;
2609 } 2706 }
2610 2707
2611 $::CONN->send ("move $targ $item->{tag} 0"); 2708 $::CONN->send ("move $targ $item->{tag} 0");
2709 } elsif ($ev->{button} == 1) {
2710 $::CONN->send ("examine $item->{tag}");
2612 } elsif ($ev->{button} == 2) { 2711 } elsif ($ev->{button} == 2) {
2613 $::CONN->send ("apply $item->{tag}"); 2712 $::CONN->send ("apply $item->{tag}");
2614 } elsif ($ev->{button} == 3) { 2713 } elsif ($ev->{button} == 3) {
2615 my @menu_items = ( 2714 my @menu_items = (
2616 ["examine", sub { $::CONN->send ("examine $item->{tag}") }], 2715 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2617 ["mark", sub { $::CONN->send ("mark $item->{tag}") }], 2716 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2618 ["apply", sub { $::CONN->send ("apply $item->{tag}") }], 2717 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2718 (
2719 $item->{flags} & Crossfire::Protocol::F_LOCKED
2720 ? (
2721 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2722 )
2723 : (
2724 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2619 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }], 2725 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2620 [ 2726 )
2621 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2622 sub { $::CONN->send ("lock $item->{tag}") },
2623 ], 2727 ),
2624 ); 2728 );
2625 2729
2626 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 2730 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2627 } 2731 }
2628 2732
… …
2664 2768
2665sub new { 2769sub new {
2666 my $class = shift; 2770 my $class = shift;
2667 2771
2668 my $self = $class->SUPER::new ( 2772 my $self = $class->SUPER::new (
2669 scrolled => (new CFClient::UI::VBox), 2773 scrolled => (new CFClient::UI::Table),
2670 @_, 2774 @_,
2671 ); 2775 );
2672 2776
2673 $self 2777 $self
2674} 2778}
… …
2685 } @$items; 2789 } @$items;
2686 2790
2687 $self->{real_items} = \@items; 2791 $self->{real_items} = \@items;
2688 2792
2689 for my $item (@items) { 2793 for my $item (@items) {
2794 $item->{item} = $item;
2690 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item; 2795 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2691 $item->update_item (); 2796 $item->update_item ();
2692 } 2797 }
2693 2798
2799 my $i = 0;
2800 for (@items) {
2694 $self->{scrolled}->add (@items); 2801 $self->{scrolled}->add (0, $i, $_);
2802 my $nrof = $_->{item}->{nrof} || 1;
2803 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2804 }
2695 2805
2696# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2806# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2697} 2807}
2698 2808
2699sub size_request { 2809sub size_request {
… …
2971 $child->{x} = int $child->{x}; 3081 $child->{x} = int $child->{x};
2972 $child->{y} = int $child->{y}; 3082 $child->{y} = int $child->{y};
2973 } 3083 }
2974 3084
2975 $self->SUPER::add (@children); 3085 $self->SUPER::add (@children);
3086
3087 while (@children) {
3088 my $w = pop @children;
3089 push @children, $w->children;
3090 $w->{visible} = 1;
3091 }
3092}
3093
3094sub remove {
3095 my ($self, @children) = @_;
3096
3097 $self->SUPER::remove (@children);
3098
3099 while (@children) {
3100 my $w = pop @children;
3101 push @children, $w->children;
3102 delete $w->{visible};
3103 }
2976} 3104}
2977 3105
2978sub on_refresh { 3106sub on_refresh {
2979 my ($self, $id, $cb) = @_; 3107 my ($self, $id, $cb) = @_;
2980 3108
… …
3049 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3177 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3050 glClear GL_COLOR_BUFFER_BIT; 3178 glClear GL_COLOR_BUFFER_BIT;
3051 3179
3052 glMatrixMode GL_PROJECTION; 3180 glMatrixMode GL_PROJECTION;
3053 glLoadIdentity; 3181 glLoadIdentity;
3054 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3182 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3055 glMatrixMode GL_MODELVIEW; 3183 glMatrixMode GL_MODELVIEW;
3056 glLoadIdentity; 3184 glLoadIdentity;
3057 3185
3058 $self->_draw; 3186 $self->_draw;
3059} 3187}

Diff Legend

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