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.252 by root, Sun May 28 23:21:28 2006 UTC vs.
Revision 1.257 by root, Tue May 30 02:22:02 2006 UTC

… …
17our $BUTTON_STATE; 17our $BUTTON_STATE;
18 18
19our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20 20
21sub get_layout { 21sub get_layout {
22 my $layout;
23
22 for (grep { $_->{name} } values %WIDGET) { 24 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = { 25 my $win = $layout->{$_->{name}} = { };
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 }; 26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
29 } 31 }
30 32
31 return $LAYOUT; 33 $layout
32} 34}
33 35
34sub set_layout { 36sub set_layout {
35 my ($layout) = @_; 37 my ($layout) = @_;
36 $LAYOUT = $layout; 38 $LAYOUT = $layout;
… …
40 if (!$GRAB) { 42 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 43 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 44 if (length $widget->{tooltip}) {
43 45
44 if ($TOOLTIP->{owner} != $widget) { 46 if ($TOOLTIP->{owner} != $widget) {
47 $TOOLTIP->hide;
48
45 $TOOLTIP->{owner} = $widget; 49 $TOOLTIP->{owner} = $widget;
46 50
47 my $tip = $widget->{tooltip}; 51 my $tip = $widget->{tooltip};
48 52
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 53 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 54
51 $TOOLTIP->set_tooltip_from ($widget); 55 $TOOLTIP->set_tooltip_from ($widget);
52
53 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
54
55 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
56 if $x + $TOOLTIP->{w} > $::WIDTH;
57
58 $TOOLTIP->move ($x, $y);
59 $TOOLTIP->show; 56 $TOOLTIP->show;
60 } 57 }
61 58
62 return; 59 return;
63 } 60 }
… …
170sub rescale_widgets { 167sub rescale_widgets {
171 my ($sx, $sy) = @_; 168 my ($sx, $sy) = @_;
172 169
173 for my $widget (values %WIDGET) { 170 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) { 171 if ($widget->{is_toplevel}) {
172 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
173 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
174
175 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 175 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 176 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
177 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 177 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
178 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 178 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
179 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 179 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
180 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 180 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
181
182 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
183 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
184
181 } 185 }
182 } 186 }
183 187
184 reconfigure_widgets; 188 reconfigure_widgets;
185} 189}
… …
194 198
195sub new { 199sub new {
196 my $class = shift; 200 my $class = shift;
197 201
198 my $self = bless { 202 my $self = bless {
199 x => 0, 203 x => "center",
200 y => 0, 204 y => "center",
201 z => 0, 205 z => 0,
206 w => undef,
207 h => undef,
202 can_events => 1, 208 can_events => 1,
203 @_ 209 @_
204 }, $class; 210 }, $class;
211
212 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
213 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
214 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
215 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
216 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
217
218 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
219 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
220 }
221
222 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
205 223
206 for (keys %$self) { 224 for (keys %$self) {
207 if (/^on_(.*)$/) { 225 if (/^on_(.*)$/) {
208 $self->connect ($1 => delete $self->{$_}); 226 $self->connect ($1 => delete $self->{$_});
209 } 227 }
210 } 228 }
211 229
212 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
213
214 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
215 $self->{req_x} = $layout->{x} * $::WIDTH;
216 $self->{req_y} = $layout->{y} * $::HEIGHT;
217 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
218 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
219 }
220
221 $self 230 $self
222} 231}
223 232
224sub destroy { 233sub destroy {
225 my ($self) = @_; 234 my ($self) = @_;
… …
232 my ($self) = @_; 241 my ($self) = @_;
233 242
234 return if $self->{parent}; 243 return if $self->{parent};
235 244
236 $CFClient::UI::ROOT->add ($self); 245 $CFClient::UI::ROOT->add ($self);
237}
238
239sub center {
240 my ($self) = @_;
241
242 $CFClient::UI::ROOT->on_post_alloc (
243 "center_$self" => sub {
244 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
245 },
246 );
247
248 $self->update;
249} 246}
250 247
251sub set_visible { 248sub set_visible {
252 my ($self) = @_; 249 my ($self) = @_;
253 250
… …
308 305
309 $self->{parent}->remove ($self) 306 $self->{parent}->remove ($self)
310 if $self->{parent}; 307 if $self->{parent};
311} 308}
312 309
313sub move { 310sub move_abs {
314 my ($self, $x, $y, $z) = @_; 311 my ($self, $x, $y, $z) = @_;
315 312
316 $self->{x} = int $x; 313 $self->{x} = List::Util::max 0, int $x;
317 $self->{y} = int $y; 314 $self->{y} = List::Util::max 0, int $y;
318 $self->{z} = $z if defined $z; 315 $self->{z} = $z if defined $z;
319 316
320 $self->update; 317 $self->update;
321} 318}
322 319
323sub set_size { 320sub set_size {
324 my ($self, $w, $h) = @_; 321 my ($self, $w, $h) = @_;
325 322
326 $self->{def_w} = $w; 323 $self->{force_w} = $w;
327 $self->{def_h} = $h; 324 $self->{force_h} = $h;
328 325
329 $self->realloc; 326 $self->realloc;
330} 327}
331 328
332sub size_request { 329sub size_request {
… …
336 333
337sub configure { 334sub configure {
338 my ($self, $x, $y, $w, $h) = @_; 335 my ($self, $x, $y, $w, $h) = @_;
339 336
340 if ($self->{aspect}) { 337 if ($self->{aspect}) {
338 my ($ow, $oh) = ($w, $h);
339
341 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 340 $w = List::Util::min $w, int $h * $self->{aspect};
342 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 341 $h = List::Util::min $h, int $w / $self->{aspect};
343 342
344 # use alignment to adjust x, y 343 # use alignment to adjust x, y
345 344
346 $x += int +($w - $w2) * 0.5; 345 $x += int 0.5 * ($ow - $w);
347 $y += int +($h - $h2) * 0.5; 346 $y += int 0.5 * ($oh - $h);
348
349 ($w, $h) = ($w2, $h2);
350 } 347 }
351 348
352 if ($self->{x} != $x || $self->{y} != $y) { 349 if ($self->{x} ne $x || $self->{y} ne $y) {
353 $self->{x} = $x; 350 $self->{x} = $x;
354 $self->{y} = $y; 351 $self->{y} = $y;
355 $self->update; 352 $self->update;
356 } 353 }
357 354
… …
511sub update { 508sub update {
512 my ($self) = @_; 509 my ($self) = @_;
513 510
514 $self->{parent}->update 511 $self->{parent}->update
515 if $self->{parent}; 512 if $self->{parent};
513}
514
515sub reconfigure {
516 my ($self) = @_;
517
518 $self->realloc;
519 $self->update;
516} 520}
517 521
518sub draw { 522sub draw {
519 my ($self) = @_; 523 my ($self) = @_;
520 524
… …
538 glVertex $x , $y + $self->{h}; 542 glVertex $x , $y + $self->{h};
539 glEnd; 543 glEnd;
540 glDisable GL_BLEND; 544 glDisable GL_BLEND;
541 } 545 }
542 546
543 if ($ENV{PCLIENT_DEBUG}) { 547 if ($ENV{CFPLUS_DEBUG}) {
544 glPushMatrix; 548 glPushMatrix;
545 glColor 1, 1, 0, 1; 549 glColor 1, 1, 0, 1;
546 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 550 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
547 glBegin GL_LINE_LOOP; 551 glBegin GL_LINE_LOOP;
548 glVertex 0 , 0; 552 glVertex 0 , 0;
… …
624 my ($class, %arg) = @_; 628 my ($class, %arg) = @_;
625 $class->SUPER::new (can_events => 0, %arg); 629 $class->SUPER::new (can_events => 0, %arg);
626} 630}
627 631
628sub size_request { 632sub size_request {
629 (0, 0) 633 my ($self) = @_;
634
635 ($self->{w} + 0, $self->{h} + 0)
630} 636}
631 637
632sub draw { } 638sub draw { }
633 639
634############################################################################# 640#############################################################################
… …
1005 1011
1006our @ISA = CFClient::UI::Bin::; 1012our @ISA = CFClient::UI::Bin::;
1007 1013
1008use CFClient::OpenGL; 1014use CFClient::OpenGL;
1009 1015
1010my @tex = 1016my $bg =
1017 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1018 mipmap => 1, wrap => 1;
1019
1020my @border =
1011 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1021 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1012 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1022 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1013 1023
1014sub new { 1024sub new {
1015 my $class = shift; 1025 my $class = shift;
1016 1026
1017 my $self = $class->SUPER::new ( 1027 my $self = $class->SUPER::new (
1018 bg => [1, 1, 1, 1], 1028 bg => [1, 1, 1, 1],
1019 border_bg => [1, 1, 1, 1], 1029 border_bg => [1, 1, 1, 1],
1020 border => 0.6, 1030 border => 0.6,
1021 is_toplevel => 1,
1022 can_events => 1, 1031 can_events => 1,
1023 @_ 1032 @_
1024 ); 1033 );
1025 1034
1026 $self->{title} &&= new CFClient::UI::Label 1035 $self->{title} &&= new CFClient::UI::Label
… …
1082 my ($ev, $x, $y) = @_; 1091 my ($ev, $x, $y) = @_;
1083 1092
1084 my $dx = $ev->{x} - $ox; 1093 my $dx = $ev->{x} - $ox;
1085 my $dy = $ev->{y} - $oy; 1094 my $dy = $ev->{y} - $oy;
1086 1095
1087 $self->{user_x} = $wx + $dx * $mx;
1088 $self->{user_y} = $wy + $dy * $my;
1089 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1096 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1090 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1097 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1091 $self->move ($self->{user_x}, $self->{user_y}); 1098
1092 $self->realloc; 1099 $self->realloc;
1100 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1093 }; 1101 };
1094 1102
1095 } elsif ($lr ^ $td) { 1103 } elsif ($lr ^ $td) {
1096 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1104 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1097 my ($bx, $by) = ($self->{x}, $self->{y}); 1105 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1099 $self->{motion} = sub { 1107 $self->{motion} = sub {
1100 my ($ev, $x, $y) = @_; 1108 my ($ev, $x, $y) = @_;
1101 1109
1102 ($x, $y) = ($ev->{x}, $ev->{y}); 1110 ($x, $y) = ($ev->{x}, $ev->{y});
1103 1111
1104 $self->{user_x} = $bx + $x - $ox; 1112 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1105 $self->{user_y} = $by + $y - $oy;
1106
1107 $self->move ($self->{user_x}, $self->{user_y});
1108 $self->realloc;
1109 }; 1113 };
1110 } 1114 }
1111} 1115}
1112 1116
1113sub button_up { 1117sub button_up {
… …
1132 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1136 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1133 1137
1134 my $border = $self->border; 1138 my $border = $self->border;
1135 1139
1136 glColor @{ $self->{border_bg} }; 1140 glColor @{ $self->{border_bg} };
1137 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1141 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1138 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1142 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1139 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1143 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1140 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1144 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1141 1145
1142 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1146 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1143 my $bg = $tex[0]; 1147 glColor @{ $self->{bg} };
1144 1148
1145 # TODO: repeat texture not scale 1149 # TODO: repeat texture not scale
1150 # solve this better(?)
1146 my $rep_x = $cw / $bg->{w}; 1151 $bg->{s} = $cw / $bg->{w};
1147 my $rep_y = $ch / $bg->{h}; 1152 $bg->{t} = $ch / $bg->{h};
1148
1149 glColor @{ $self->{bg} };
1150
1151 $bg->{s} = $rep_x;
1152 $bg->{t} = $rep_y;
1153 $bg->{wrap_mode} = 1;
1154 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1153 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1155 } 1154 }
1156 1155
1157 glDisable GL_TEXTURE_2D; 1156 glDisable GL_TEXTURE_2D;
1158 1157
… …
2164 fg => [1, 1, 1], 2163 fg => [1, 1, 1],
2165 active_fg => [0, 0, 0], 2164 active_fg => [0, 0, 0],
2166 bg => [0, 0, 0, 0.2], 2165 bg => [0, 0, 0, 0.2],
2167 active_bg => [1, 1, 1, 0.5], 2166 active_bg => [1, 1, 1, 0.5],
2168 range => [0, 0, 100, 10, 0], 2167 range => [0, 0, 100, 10, 0],
2169 req_w => $::WIDTH / 80, 2168 min_w => $::WIDTH / 80,
2170 req_h => $::WIDTH / 80, 2169 min_h => $::WIDTH / 80,
2171 vertical => 0, 2170 vertical => 0,
2172 can_hover => 1, 2171 can_hover => 1,
2173 inner_pad => 0.02, 2172 inner_pad => 0.02,
2174 @_ 2173 @_
2175 ); 2174 );
… …
2215} 2214}
2216 2215
2217sub size_request { 2216sub size_request {
2218 my ($self) = @_; 2217 my ($self) = @_;
2219 2218
2220 my $w = $self->{req_w}; 2219 ($self->{req_w}, $self->{req_h})
2221 my $h = $self->{req_h};
2222
2223 $self->{vertical} ? ($h, $w) : ($w, $h)
2224} 2220}
2225 2221
2226sub button_down { 2222sub button_down {
2227 my ($self, $ev, $x, $y) = @_; 2223 my ($self, $ev, $x, $y) = @_;
2228 2224
… …
2639 my ($self, $w, $h, $changed) = @_; 2635 my ($self, $w, $h, $changed) = @_;
2640 2636
2641 return unless $changed; 2637 return unless $changed;
2642 2638
2643 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2639 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2640}
2641
2642sub visibility_change {
2643 my ($self, $visible) = @_;
2644
2645 return unless $visible;
2646
2647 $self->{root}->on_post_alloc ("move_$self" => sub {
2648 my $widget = $self->{owner}
2649 or return;
2650
2651 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2652
2653 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2654 if $x + $self->{w} > $::WIDTH;
2655
2656 $self->move_abs ($x, $y);
2657 });
2644} 2658}
2645 2659
2646sub _draw { 2660sub _draw {
2647 my ($self) = @_; 2661 my ($self) = @_;
2648 2662
… …
3016 my ($self) = @_; 3030 my ($self) = @_;
3017 3031
3018 ($self->{w}, $self->{h}) 3032 ($self->{w}, $self->{h})
3019} 3033}
3020 3034
3035sub _to_pixel {
3036 my ($coord, $size, $max) = @_;
3037
3038 $coord =
3039 $coord eq "center" ? ($max - $size) * 0.5
3040 : $coord eq "max" ? $max
3041 : $coord;
3042
3043 $coord = 0 if $coord < 0;
3044 $coord = $max - $size if $coord > $max - $size;
3045
3046 int $coord + 0.5
3047}
3048
3021sub size_allocate { 3049sub size_allocate {
3022 my ($self, $w, $h, $changed) = @_; 3050 my ($self, $w, $h, $changed) = @_;
3023 3051
3024 for my $child ($self->children) { 3052 for my $child ($self->children) {
3025 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3053 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3026 3054
3027 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3055 $X = $child->{force_x} if exists $child->{force_x};
3028 if exists $child->{req_x}; 3056 $Y = $child->{force_y} if exists $child->{force_y};
3029 3057
3030 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3058 $X = _to_pixel $X, $W, $self->{w};
3031 if exists $child->{req_y}; 3059 $Y = _to_pixel $Y, $H, $self->{h};
3032
3033 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3034
3035 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3036 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3037 3060
3038 $child->configure ($X, $Y, $W, $H); 3061 $child->configure ($X, $Y, $W, $H);
3039 } 3062 }
3040} 3063}
3041 3064
… …
3058} 3081}
3059 3082
3060sub add { 3083sub add {
3061 my ($self, @children) = @_; 3084 my ($self, @children) = @_;
3062 3085
3063 for my $child (@children) {
3064 $child->{is_toplevel} = 1; 3086 $_->{is_toplevel} = 1
3065 3087 for @children;
3066 # integerise window positions
3067 $child->{x} = int $child->{x};
3068 $child->{y} = int $child->{y};
3069 }
3070 3088
3071 $self->SUPER::add (@children); 3089 $self->SUPER::add (@children);
3072} 3090}
3073 3091
3074sub remove { 3092sub remove {
3075 my ($self, @children) = @_; 3093 my ($self, @children) = @_;
3076 3094
3077 $self->SUPER::remove (@children); 3095 $self->SUPER::remove (@children);
3096
3097 delete $self->{is_toplevel}
3098 for @children;
3078 3099
3079 while (@children) { 3100 while (@children) {
3080 my $w = pop @children; 3101 my $w = pop @children;
3081 push @children, $w->children; 3102 push @children, $w->children;
3082 $w->set_invisible; 3103 $w->set_invisible;
… …
3116 3137
3117 my $widget = pop @queue || last; 3138 my $widget = pop @queue || last;
3118 3139
3119 $widget->{visible} or last; # do not resize invisible widgets 3140 $widget->{visible} or last; # do not resize invisible widgets
3120 3141
3121 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3122 ? @$widget{qw(def_w def_h)}
3123 : $widget->size_request; 3142 my ($w, $h) = $widget->size_request;
3124 3143
3125 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3144 my $min_size = $widget->{is_toplevel} ? 16 : 0;
3126 3145
3146 $w = List::Util::max $widget->{min_w} || $widget->{is_toplevel} * 16, $w;
3147 $h = List::Util::max $widget->{min_h} || $widget->{is_toplevel} * 16, $h;
3148
3149 $w = $widget->{force_w} if exists $widget->{force_w};
3150 $h = $widget->{force_h} if exists $widget->{force_h};
3151
3127 $widget->{req_w} = $w; 3152 $widget->{req_w} = $w;
3128 $widget->{req_h} = $h; 3153 $widget->{req_h} = $h;
3129 3154
3130 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3155 $self->{size_alloc}{$widget} = [$widget, undef, undef];
3131 3156
3132 push @queue, $widget->{parent} 3157 push @queue, $widget->{parent}
3133 if $widget->{parent}; 3158 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent};
3134 } 3159 }
3135 } 3160 }
3136 3161
3137 while (my $size_alloc = delete $self->{size_alloc}) { 3162 while (my $size_alloc = delete $self->{size_alloc}) {
3138 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, 3163 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3139 values %$size_alloc; 3164 values %$size_alloc;
3140 3165
3141 while () { 3166 while () {
3142 my ($widget, $w, $h) = @{ pop @queue or last }; 3167 my ($widget, $w, $h) = @{ pop @queue or last };
3143 3168
3169 $w = $widget->{w} || $widget->{req_w} unless defined $w;
3170 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3171
3144 $w = 0 if $w < 0; 3172 $w = 0 if $w < 0;
3145 $h = 0 if $h < 0; 3173 $h = 0 if $h < 0;
3174
3175 $w = int $w + 0.5;
3176 $h = int $h + 0.5;
3146 3177
3147 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3178 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3148 3179
3149 $widget->{w} = $w; 3180 $widget->{w} = $w;
3150 $widget->{h} = $h; 3181 $widget->{h} = $h;

Diff Legend

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