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.278 by root, Sun Jun 4 23:05:06 2006 UTC vs.
Revision 1.288 by root, Mon Jun 5 21:14:40 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
47 if (!$GRAB) {
48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49 if (length $widget->{tooltip}) {
50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
53 $TOOLTIP->{owner} = $widget;
54
55 my $tip = $widget->{tooltip};
56
57 $tip = $tip->($widget) if CODE:: eq ref $tip;
58
59 $TOOLTIP->set_tooltip_from ($widget);
60 $TOOLTIP->show;
61 }
62
63 return;
64 }
65 }
66 }
67
68 $TOOLTIP->hide;
69 delete $TOOLTIP->{owner};
70}
71
72# class methods for events 73# class methods for events
73sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
74 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
75 if $FOCUS; 76 if $FOCUS;
76} 77}
… …
88 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
89 90
90 $GRAB = $widget; 91 $GRAB = $widget;
91 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
92 93
93 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
94 } 95 }
95 96
96 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
97 98
98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
113 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
114 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
115 $grab->update if $grab; 116 $grab->update if $grab;
116 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
117 118
118 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
119 } 120 }
120} 121}
121 122
122sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
123 my ($ev) = @_; 124 my ($ev) = @_;
… …
129 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
130 131
131 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
132 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
133 134
134 check_tooltip; 135 $TOOLTIP_WATCHER->start;
135 } 136 }
136 137
137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138 if $HOVER; 139 if $HOVER;
139} 140}
… …
277 delete $self->{visible}; 278 delete $self->{visible};
278 279
279 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
280 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
281 282
282 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
283 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
284 285
285 $self->focus_out; 286 $self->focus_out;
286 287
287 $self->emit (visibility_change => 0); 288 $self->emit (visibility_change => 0);
… …
381} 382}
382 383
383sub set_max_size { 384sub set_max_size {
384 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
385 386
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
388} 391}
389 392
390sub set_tooltip { 393sub set_tooltip {
391 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
392 395
… …
397 400
398 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
399 402
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
403 } 406 }
404} 407}
405 408
406# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
407sub coord2local { 410sub coord2local {
… …
522 if $self->{parent}; 525 if $self->{parent};
523} 526}
524 527
525sub reconfigure { 528sub reconfigure {
526 my ($self) = @_; 529 my ($self) = @_;
530
531 # some widgets cache req_w and req_h
532 delete $self->{req_w};
533 delete $self->{req_h};
527 534
528 $self->realloc; 535 $self->realloc;
529 $self->update; 536 $self->update;
530} 537}
531 538
… …
855 my $tex = $self->{texture} 862 my $tex = $self->{texture}
856 or return; 863 or return;
857 864
858 glEnable GL_TEXTURE_2D; 865 glEnable GL_TEXTURE_2D;
859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 866 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860 glEnable GL_BLEND;
861 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
862 glColor 0, 0, 0, 1; 867 glColor 0, 0, 0, 1;
863 868
864 $tex->draw_quad (0, 0, $w, $h); 869 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
865 870
866 glDisable GL_BLEND;
867 glDisable GL_TEXTURE_2D; 871 glDisable GL_TEXTURE_2D;
868} 872}
869 873
870############################################################################# 874#############################################################################
871 875
… …
1539 1543
1540 delete $self->{texture}; 1544 delete $self->{texture};
1541 $self->SUPER::update; 1545 $self->SUPER::update;
1542} 1546}
1543 1547
1548sub realloc {
1549 my ($self) = @_;
1550
1551 delete $self->{ox};
1552 $self->SUPER::realloc;
1553}
1554
1544sub set_text { 1555sub set_text {
1545 my ($self, $text) = @_; 1556 my ($self, $text) = @_;
1546 1557
1547 return if $self->{text} eq "T$text"; 1558 return if $self->{text} eq "T$text";
1548 $self->{text} = "T$text"; 1559 $self->{text} = "T$text";
1549 1560
1550 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1561 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1551 $self->{layout}->set_text ($text); 1562 $self->{layout}->set_text ($text);
1552 1563
1564 delete $self->{req_h};
1553 $self->realloc; 1565 $self->realloc;
1554 $self->update; 1566 $self->update;
1555} 1567}
1556 1568
1557sub set_markup { 1569sub set_markup {
… …
1563 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1575 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1564 1576
1565 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1577 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1566 $self->{layout}->set_markup ($markup); 1578 $self->{layout}->set_markup ($markup);
1567 1579
1580 delete $self->{req_h};
1568 $self->realloc; 1581 $self->realloc;
1569 $self->update; 1582 $self->update;
1570} 1583}
1571 1584
1572sub size_request { 1585sub size_request {
1573 my ($self) = @_; 1586 my ($self) = @_;
1574 1587
1588 if (exists $self->{req_h}) {
1589 @$self{qw(req_w req_h)}
1590 } else {
1575 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1591 $self->{layout}->set_font ($self->{font}) if $self->{font};
1576 $self->{layout}->set_width ($self->{max_w} || -1); 1592 $self->{layout}->set_width ($self->{max_w} || -1);
1577 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1593 $self->{layout}->set_ellipsise ($self->{ellipsise});
1578 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1594 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1579 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1580 1596
1581 my ($w, $h) = $self->{layout}->size; 1597 my ($w, $h) = $self->{layout}->size;
1582 1598
1583 if (exists $self->{template}) { 1599 if (exists $self->{template}) {
1584 $self->{template}->set_font ($self->{font}) if $self->{font}; 1600 $self->{template}->set_font ($self->{font}) if $self->{font};
1585 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1601 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1586 1602
1587 my ($w2, $h2) = $self->{template}->size; 1603 my ($w2, $h2) = $self->{template}->size;
1588 1604
1589 $w = List::Util::max $w, $w2; 1605 $w = List::Util::max $w, $w2;
1590 $h = List::Util::max $h, $h2; 1606 $h = List::Util::max $h, $h2;
1591 } 1607 }
1592 1608
1593 ($w, $h) 1609 ($w, $h)
1610 }
1594} 1611}
1595 1612
1596sub size_allocate { 1613sub size_allocate {
1597 my ($self, $w, $h) = @_; 1614 my ($self, $w, $h) = @_;
1598 1615
… …
1636 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1653 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1637 : ($self->{h} - $tex->{h}) * 0.5); 1654 : ($self->{h} - $tex->{h}) * 0.5);
1638 }; 1655 };
1639 1656
1640 glEnable GL_TEXTURE_2D; 1657 glEnable GL_TEXTURE_2D;
1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1642 1658
1643 if ($tex->{format} == GL_ALPHA) { 1659 if ($tex->{format} == GL_ALPHA) {
1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1644 glColor @{$self->{fg}}; 1661 glColor @{$self->{fg}};
1645 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1662 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1646 } else { 1663 } else {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1647 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1665 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1648 } 1666 }
1649 1667
1650 glDisable GL_TEXTURE_2D; 1668 glDisable GL_TEXTURE_2D;
1651} 1669}
… …
1685 $self->{last_activity} = $::NOW; 1703 $self->{last_activity} = $::NOW;
1686 $self->{text} = $text; 1704 $self->{text} = $text;
1687 1705
1688 $text =~ s/./*/g if $self->{hidden}; 1706 $text =~ s/./*/g if $self->{hidden};
1689 $self->{layout}->set_text ("$text "); 1707 $self->{layout}->set_text ("$text ");
1708 delete $self->{req_h};
1690 1709
1691 $self->_emit (changed => $self->{text}); 1710 $self->_emit (changed => $self->{text});
1711
1712 $self->realloc;
1692 $self->update; 1713 $self->update;
1693} 1714}
1694 1715
1695sub set_text { 1716sub set_text {
1696 my ($self, $text) = @_; 1717 my ($self, $text) = @_;
1697 1718
1698 $self->{cursor} = length $text; 1719 $self->{cursor} = length $text;
1699 $self->_set_text ($text); 1720 $self->_set_text ($text);
1700
1701 $self->realloc;
1702} 1721}
1703 1722
1704sub get_text { 1723sub get_text {
1705 $_[0]{text} 1724 $_[0]{text}
1706} 1725}
… …
1913} 1932}
1914 1933
1915sub _draw { 1934sub _draw {
1916 my ($self) = @_; 1935 my ($self) = @_;
1917 1936
1918 local $self->{fg} = $self->{fg}; 1937 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1919
1920 if ($GRAB == $self) {
1921 $self->{fg} = $self->{active_fg};
1922 }
1923 1938
1924 glEnable GL_TEXTURE_2D; 1939 glEnable GL_TEXTURE_2D;
1925 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1940 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1926 glColor 0, 0, 0, 1; 1941 glColor 0, 0, 0, 1;
1927 1942
… …
2575 2590
2576 delete $self->{texture}; 2591 delete $self->{texture};
2577 } 2592 }
2578 2593
2579 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2594 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2580 glClearColor 0.5, 0.5, 0.5, 0; 2595 glClearColor 0, 0, 0, 0;
2581 glClear GL_COLOR_BUFFER_BIT; 2596 glClear GL_COLOR_BUFFER_BIT;
2582 2597
2583 my $top = int $self->{children}[1]{range}[0]; 2598 my $top = int $self->{children}[1]{range}[0];
2584 2599
2585 my $y0 = $top; 2600 my $y0 = $top;
… …
2620sub _draw { 2635sub _draw {
2621 my ($self) = @_; 2636 my ($self) = @_;
2622 2637
2623 glEnable GL_TEXTURE_2D; 2638 glEnable GL_TEXTURE_2D;
2624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2625 glColor 1, 1, 1, 1; 2640 glColor 0, 0, 0, 1;
2626 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2641 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2627 glDisable GL_TEXTURE_2D; 2642 glDisable GL_TEXTURE_2D;
2628 2643
2629 $self->{children}[1]->draw; 2644 $self->{children}[1]->draw;
2630 2645
2631} 2646}
… …
2858 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2873 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2859 2874
2860 if ($tex) { 2875 if ($tex) {
2861 glEnable GL_TEXTURE_2D; 2876 glEnable GL_TEXTURE_2D;
2862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2877 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2863 glColor 1, 1, 1, 1; 2878 glColor 0, 0, 0, 1;
2864 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2879 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2865 glDisable GL_TEXTURE_2D; 2880 glDisable GL_TEXTURE_2D;
2866 } 2881 }
2867} 2882}
2868 2883
… …
3076our @ISA = CFClient::UI::VBox::; 3091our @ISA = CFClient::UI::VBox::;
3077 3092
3078sub new { 3093sub new {
3079 my $class = shift; 3094 my $class = shift;
3080 3095
3081 $class->SUPER::new ( 3096 my $self = $class->SUPER::new (
3082 fontsize => 0.8, 3097 fontsize => 0.8,
3083 @_, 3098 @_,
3084 ) 3099 );
3100
3101 Scalar::Util::weaken (my $this = $self);
3102
3103 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3104
3105 $self
3085} 3106}
3086 3107
3087sub reorder { 3108sub reorder {
3088 my ($self) = @_; 3109 my ($self) = @_;
3089 my $NOW = time; 3110 my $NOW = Time::HiRes::time;
3111
3112 # freeze display when hovering over any label
3113 return if $CFClient::UI::TOOLTIP->{owner}
3114 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3115 values %{ $self->{item} };
3090 3116
3091 while (my ($k, $v) = each %{ $self->{item} }) { 3117 while (my ($k, $v) = each %{ $self->{item} }) {
3092 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3118 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3093 } 3119 }
3094 3120
… …
3097 my @items = sort { 3123 my @items = sort {
3098 $a->{pri} <=> $b->{pri} 3124 $a->{pri} <=> $b->{pri}
3099 or $b->{id} <=> $a->{id} 3125 or $b->{id} <=> $a->{id}
3100 } values %{ $self->{item} }; 3126 } values %{ $self->{item} };
3101 3127
3128 $self->{timer}->interval (1);
3129
3102 my $count = 10 + 1; 3130 my $count = 10 + 1;
3103 for my $item (@items) { 3131 for my $item (@items) {
3104 last unless --$count; 3132 last unless --$count;
3105 3133
3106 push @widgets, $item->{label} ||= do { 3134 my $label = $item->{label} ||= do {
3107 # TODO: doesn't handle markup well (read as: at all) 3135 # TODO: doesn't handle markup well (read as: at all)
3108 my $short = $item->{count} > 1 3136 my $short = $item->{count} > 1
3109 ? "<b>$item->{count} ×</b> $item->{text}" 3137 ? "<b>$item->{count} ×</b> $item->{text}"
3110 : $item->{text}; 3138 : $item->{text};
3111 3139
… …
3119 tooltip => $item->{tooltip}, 3147 tooltip => $item->{tooltip},
3120 tooltip_font => $::FONT_PROP, 3148 tooltip_font => $::FONT_PROP,
3121 tooltip_width => 0.67, 3149 tooltip_width => 0.67,
3122 fontsize => $item->{fontsize} || $self->{fontsize}, 3150 fontsize => $item->{fontsize} || $self->{fontsize},
3123 max_w => $::WIDTH * 0.44, 3151 max_w => $::WIDTH * 0.44,
3124 fg => $item->{fg}, 3152 fg => [@{ $item->{fg} }],
3125 can_events => 1, 3153 can_events => 1,
3126 can_hover => 1 3154 can_hover => 1
3127 }; 3155 };
3156
3157 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3158 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3159 $label->update;
3160 $label->set_max_size (undef, $label->{req_h} * $diff)
3161 if $diff < 1;
3162 $self->{timer}->interval (1/30);
3163 } else {
3164 $label->{fg}[3] = $item->{fg}[3] || 1;
3165 }
3166
3167 push @widgets, $label;
3128 } 3168 }
3129 3169
3130 $self->clear; 3170 $self->clear;
3131 $self->SUPER::add (reverse @widgets); 3171 $self->SUPER::add (reverse @widgets);
3132} 3172}
… …
3137 $text =~ s/^\s+//; 3177 $text =~ s/^\s+//;
3138 $text =~ s/\s+$//; 3178 $text =~ s/\s+$//;
3139 3179
3140 return unless $text; 3180 return unless $text;
3141 3181
3142 my $timeout = time + ((delete $arg{timeout}) || 60); 3182 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3143 3183
3144 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3184 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3145 3185
3146 if (my $item = $self->{item}{$group}) { 3186 if (my $item = $self->{item}{$group}) {
3147 if ($item->{text} eq $text) { 3187 if ($item->{text} eq $text) {
… …
3177 3217
3178 $self->reorder; 3218 $self->reorder;
3179 $self->SUPER::reconfigure; 3219 $self->SUPER::reconfigure;
3180} 3220}
3181 3221
3222sub DESTROY {
3223 my ($self) = @_;
3224
3225 $self->{timer}->cancel;
3226
3227 $self->SUPER::DESTROY;
3228}
3229
3182############################################################################# 3230#############################################################################
3183 3231
3184package CFClient::UI::Inventory; 3232package CFClient::UI::Inventory;
3185 3233
3186our @ISA = CFClient::UI::ScrolledWindow::; 3234our @ISA = CFClient::UI::ScrolledWindow::;
… …
3478 3526
3479package CFClient::UI::Root; 3527package CFClient::UI::Root;
3480 3528
3481our @ISA = CFClient::UI::Container::; 3529our @ISA = CFClient::UI::Container::;
3482 3530
3531use List::Util qw(min max);
3532
3483use CFClient::OpenGL; 3533use CFClient::OpenGL;
3484 3534
3485sub new { 3535sub new {
3486 my $class = shift; 3536 my $class = shift;
3487 3537
… …
3621 3671
3622 delete $queue{$widget+0}; 3672 delete $queue{$widget+0};
3623 3673
3624 my ($w, $h) = $widget->size_request; 3674 my ($w, $h) = $widget->size_request;
3625 3675
3626 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3676 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3627 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3677 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3678
3679 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3680 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3628 3681
3629 $w = $widget->{force_w} if exists $widget->{force_w}; 3682 $w = $widget->{force_w} if exists $widget->{force_w};
3630 $h = $widget->{force_h} if exists $widget->{force_h}; 3683 $h = $widget->{force_h} if exists $widget->{force_h};
3631 3684
3632 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3685 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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