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.276 by root, Sun Jun 4 00:16:01 2006 UTC vs.
Revision 1.283 by root, Mon Jun 5 02:28:30 2006 UTC

… …
381} 381}
382 382
383sub set_max_size { 383sub set_max_size {
384 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
385 385
386 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
387 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
388} 390}
389 391
390sub set_tooltip { 392sub set_tooltip {
391 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
392 394
… …
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w) 550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h); 551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
550 552
551 glPushMatrix; 553 glPushMatrix;
552 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
553 $self->_draw;
554 glPopMatrix;
555 555
556 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
557 my ($x, $y) = @$self{qw(x y)};
558
559 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
560 glEnable GL_BLEND; 558 glEnable GL_BLEND;
561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
562 glBegin GL_QUADS; 560 glBegin GL_QUADS;
563 glVertex $x , $y; 561 glVertex 0 , 0;
564 glVertex $x + $self->{w}, $y; 562 glVertex $self->{w}, 0;
565 glVertex $x + $self->{w}, $y + $self->{h}; 563 glVertex $self->{w}, $self->{h};
566 glVertex $x , $y + $self->{h}; 564 glVertex 0 , $self->{h};
567 glEnd; 565 glEnd;
568 glDisable GL_BLEND; 566 glDisable GL_BLEND;
569 } 567 }
570 568
571 if ($ENV{CFPLUS_DEBUG} & 1) { 569 if ($ENV{CFPLUS_DEBUG} & 1) {
572 glPushMatrix; 570 glPushMatrix;
573 glColor 1, 1, 0, 1; 571 glColor 1, 1, 0, 1;
574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 572 glTranslate 0.375, 0.375;
575 glBegin GL_LINE_LOOP; 573 glBegin GL_LINE_LOOP;
576 glVertex 0 , 0; 574 glVertex 0 , 0;
577 glVertex $self->{w} - 1, 0; 575 glVertex $self->{w} - 1, 0;
578 glVertex $self->{w} - 1, $self->{h} - 1; 576 glVertex $self->{w} - 1, $self->{h} - 1;
579 glVertex 0 , $self->{h} - 1; 577 glVertex 0 , $self->{h} - 1;
580 glEnd; 578 glEnd;
581 glPopMatrix; 579 glPopMatrix;
582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 580 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
583 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
584} 585}
585 586
586sub _draw { 587sub _draw {
587 my ($self) = @_; 588 my ($self) = @_;
588 589
… …
626 627
627 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
628 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
629 630
630 glEnable GL_BLEND; 631 glEnable GL_BLEND;
631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632 glColor @$color; 633 glColor_premultiply @$color;
633 634
634 glBegin GL_QUADS; 635 glBegin GL_QUADS;
635 glVertex 0 , 0; 636 glVertex 0 , 0;
636 glVertex 0 , $h; 637 glVertex 0 , $h;
637 glVertex $w, $h; 638 glVertex $w, $h;
… …
856 my $tex = $self->{texture} 857 my $tex = $self->{texture}
857 or return; 858 or return;
858 859
859 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
861 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
862 863
863 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
864 865
865 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
866} 867}
… …
1035 1036
1036 if ($self->{bg}) { 1037 if ($self->{bg}) {
1037 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
1038 1039
1039 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
1040 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1041 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
1042 1043
1043 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
1044 glVertex 0 , 0; 1045 glVertex 0 , 0;
1045 glVertex 0 , $h; 1046 glVertex 0 , $h;
1046 glVertex $w, $h; 1047 glVertex $w, $h;
… …
1160 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1161 1162
1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1164 1165
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165 $self->realloc; 1167 $self->realloc;
1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1167 }; 1168 };
1168 1169
1169 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1170 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1171 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1174 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1175 1176
1176 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1177 1178
1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1179 }; 1182 };
1180 } else { 1183 } else {
1181 return 0; 1184 return 0;
1182 } 1185 }
1183 1186
… …
1535 1538
1536 delete $self->{texture}; 1539 delete $self->{texture};
1537 $self->SUPER::update; 1540 $self->SUPER::update;
1538} 1541}
1539 1542
1543sub realloc {
1544 my ($self) = @_;
1545
1546 delete $self->{ox};
1547 $self->SUPER::realloc;
1548}
1549
1540sub set_text { 1550sub set_text {
1541 my ($self, $text) = @_; 1551 my ($self, $text) = @_;
1542 1552
1543 return if $self->{text} eq "T$text"; 1553 return if $self->{text} eq "T$text";
1544 $self->{text} = "T$text"; 1554 $self->{text} = "T$text";
1545 1555
1546 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1556 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1547 $self->{layout}->set_text ($text); 1557 $self->{layout}->set_text ($text);
1558 delete $self->{req_h};
1548 1559
1549 $self->realloc; 1560 $self->realloc;
1550 $self->update; 1561 $self->update;
1551} 1562}
1552 1563
… …
1558 1569
1559 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1570 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1560 1571
1561 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1572 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1562 $self->{layout}->set_markup ($markup); 1573 $self->{layout}->set_markup ($markup);
1574 delete $self->{req_h};
1563 1575
1564 $self->realloc; 1576 $self->realloc;
1565 $self->update; 1577 $self->update;
1566} 1578}
1567 1579
1568sub size_request { 1580sub size_request {
1569 my ($self) = @_; 1581 my ($self) = @_;
1570 1582
1583 if (exists $self->{req_h}) {
1584 @$self{qw(req_w req_h)}
1585 } else {
1571 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1586 $self->{layout}->set_font ($self->{font}) if $self->{font};
1572 $self->{layout}->set_width ($self->{max_w} || -1); 1587 $self->{layout}->set_width ($self->{max_w} || -1);
1573 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1588 $self->{layout}->set_ellipsise ($self->{ellipsise});
1574 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1589 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1590 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1576 1591
1577 my ($w, $h) = $self->{layout}->size; 1592 my ($w, $h) = $self->{layout}->size;
1578 1593
1579 if (exists $self->{template}) { 1594 if (exists $self->{template}) {
1580 $self->{template}->set_font ($self->{font}) if $self->{font}; 1595 $self->{template}->set_font ($self->{font}) if $self->{font};
1581 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1596 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1582 1597
1583 my ($w2, $h2) = $self->{template}->size; 1598 my ($w2, $h2) = $self->{template}->size;
1584 1599
1585 $w = List::Util::max $w, $w2; 1600 $w = List::Util::max $w, $w2;
1586 $h = List::Util::max $h, $h2; 1601 $h = List::Util::max $h, $h2;
1587 } 1602 }
1588 1603
1589 ($w, $h) 1604 ($w, $h)
1605 }
1590} 1606}
1591 1607
1592sub size_allocate { 1608sub size_allocate {
1593 my ($self, $w, $h) = @_; 1609 my ($self, $w, $h) = @_;
1594 1610
… …
1634 }; 1650 };
1635 1651
1636 glEnable GL_TEXTURE_2D; 1652 glEnable GL_TEXTURE_2D;
1637 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1638 1654
1655 glColor_premultiply @{$self->{fg}}
1639 if ($tex->{format} == GL_ALPHA) { 1656 if $tex->{format} == GL_ALPHA;
1640 glColor @{$self->{fg}}; 1657
1641 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1642 } else {
1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1658 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1644 }
1645 1659
1646 glDisable GL_TEXTURE_2D; 1660 glDisable GL_TEXTURE_2D;
1647} 1661}
1648 1662
1649############################################################################# 1663#############################################################################
… …
1681 $self->{last_activity} = $::NOW; 1695 $self->{last_activity} = $::NOW;
1682 $self->{text} = $text; 1696 $self->{text} = $text;
1683 1697
1684 $text =~ s/./*/g if $self->{hidden}; 1698 $text =~ s/./*/g if $self->{hidden};
1685 $self->{layout}->set_text ("$text "); 1699 $self->{layout}->set_text ("$text ");
1700 delete $self->{req_h};
1686 1701
1687 $self->_emit (changed => $self->{text}); 1702 $self->_emit (changed => $self->{text});
1703
1704 $self->realloc;
1688 $self->update; 1705 $self->update;
1689} 1706}
1690 1707
1691sub set_text { 1708sub set_text {
1692 my ($self, $text) = @_; 1709 my ($self, $text) = @_;
1693 1710
1694 $self->{cursor} = length $text; 1711 $self->{cursor} = length $text;
1695 $self->_set_text ($text); 1712 $self->_set_text ($text);
1696
1697 $self->realloc;
1698} 1713}
1699 1714
1700sub get_text { 1715sub get_text {
1701 $_[0]{text} 1716 $_[0]{text}
1702} 1717}
… …
1782 my ($self) = @_; 1797 my ($self) = @_;
1783 1798
1784 local $self->{fg} = $self->{fg}; 1799 local $self->{fg} = $self->{fg};
1785 1800
1786 if ($FOCUS == $self) { 1801 if ($FOCUS == $self) {
1787 glColor @{$self->{active_bg}}; 1802 glColor_premultiply @{$self->{active_bg}};
1788 $self->{fg} = $self->{active_fg}; 1803 $self->{fg} = $self->{active_fg};
1789 } else { 1804 } else {
1790 glColor @{$self->{bg}}; 1805 glColor_premultiply @{$self->{bg}};
1791 } 1806 }
1792 1807
1793 glEnable GL_BLEND; 1808 glEnable GL_BLEND;
1794 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1809 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1795 glBegin GL_QUADS; 1810 glBegin GL_QUADS;
1796 glVertex 0 , 0; 1811 glVertex 0 , 0;
1797 glVertex 0 , $self->{h}; 1812 glVertex 0 , $self->{h};
1798 glVertex $self->{w}, $self->{h}; 1813 glVertex $self->{w}, $self->{h};
1799 glVertex $self->{w}, 0; 1814 glVertex $self->{w}, 0;
… …
1909} 1924}
1910 1925
1911sub _draw { 1926sub _draw {
1912 my ($self) = @_; 1927 my ($self) = @_;
1913 1928
1914 local $self->{fg} = $self->{fg}; 1929 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1915
1916 if ($GRAB == $self) {
1917 $self->{fg} = $self->{active_fg};
1918 }
1919 1930
1920 glEnable GL_TEXTURE_2D; 1931 glEnable GL_TEXTURE_2D;
1921 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1932 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1922 glColor 0, 0, 0, 1; 1933 glColor 0, 0, 0, 1;
1923 1934
… …
2148 2159
2149 my $h1 = $self->{h} * (1 - $ycut1); 2160 my $h1 = $self->{h} * (1 - $ycut1);
2150 my $h2 = $self->{h} * (1 - $ycut2); 2161 my $h2 = $self->{h} * (1 - $ycut2);
2151 2162
2152 glEnable GL_BLEND; 2163 glEnable GL_BLEND;
2153 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2164 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2165 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2154 glEnable GL_TEXTURE_2D; 2166 glEnable GL_TEXTURE_2D;
2155 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2167 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2156 2168
2157 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2169 glBindTexture GL_TEXTURE_2D, $t1->{name};
2158 glBegin GL_QUADS; 2170 glBegin GL_QUADS;
… …
2570 2582
2571 delete $self->{texture}; 2583 delete $self->{texture};
2572 } 2584 }
2573 2585
2574 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2586 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2575 glClearColor 0.5, 0.5, 0.5, 0; 2587 glClearColor 0, 0, 0, 0;
2576 glClear GL_COLOR_BUFFER_BIT; 2588 glClear GL_COLOR_BUFFER_BIT;
2577 2589
2578 my $top = int $self->{children}[1]{range}[0]; 2590 my $top = int $self->{children}[1]{range}[0];
2579 2591
2580 my $y0 = $top; 2592 my $y0 = $top;
… …
2615sub _draw { 2627sub _draw {
2616 my ($self) = @_; 2628 my ($self) = @_;
2617 2629
2618 glEnable GL_TEXTURE_2D; 2630 glEnable GL_TEXTURE_2D;
2619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2631 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2620 glColor 1, 1, 1, 1; 2632 glColor 0, 0, 0, 1;
2621 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2633 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2622 glDisable GL_TEXTURE_2D; 2634 glDisable GL_TEXTURE_2D;
2623 2635
2624 $self->{children}[1]->draw; 2636 $self->{children}[1]->draw;
2625 2637
2626} 2638}
… …
2853 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2865 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2854 2866
2855 if ($tex) { 2867 if ($tex) {
2856 glEnable GL_TEXTURE_2D; 2868 glEnable GL_TEXTURE_2D;
2857 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2869 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2858 glColor 1, 1, 1, 1; 2870 glColor 0, 0, 0, 1;
2859 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2871 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2860 glDisable GL_TEXTURE_2D; 2872 glDisable GL_TEXTURE_2D;
2861 } 2873 }
2862} 2874}
2863 2875
… …
3071our @ISA = CFClient::UI::VBox::; 3083our @ISA = CFClient::UI::VBox::;
3072 3084
3073sub new { 3085sub new {
3074 my $class = shift; 3086 my $class = shift;
3075 3087
3076 $class->SUPER::new ( 3088 my $self = $class->SUPER::new (
3077 fontsize => 0.8, 3089 fontsize => 0.8,
3078 @_, 3090 @_,
3079 ) 3091 );
3092
3093 Scalar::Util::weaken (my $this = $self);
3094
3095 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3096
3097 $self
3080} 3098}
3081 3099
3082sub reorder { 3100sub reorder {
3083 my ($self) = @_; 3101 my ($self) = @_;
3084 my $NOW = time; 3102 my $NOW = Time::HiRes::time;
3103
3104 # freeze display when hovering over any label
3105 return if $CFClient::UI::TOOLTIP->{owner}
3106 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3107 values %{ $self->{item} };
3085 3108
3086 while (my ($k, $v) = each %{ $self->{item} }) { 3109 while (my ($k, $v) = each %{ $self->{item} }) {
3087 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3110 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3088 } 3111 }
3089 3112
… …
3092 my @items = sort { 3115 my @items = sort {
3093 $a->{pri} <=> $b->{pri} 3116 $a->{pri} <=> $b->{pri}
3094 or $b->{id} <=> $a->{id} 3117 or $b->{id} <=> $a->{id}
3095 } values %{ $self->{item} }; 3118 } values %{ $self->{item} };
3096 3119
3120 $self->{timer}->interval (1);
3121
3097 my $count = 10 + 1; 3122 my $count = 10 + 1;
3098 for my $item (@items) { 3123 for my $item (@items) {
3099 last unless --$count; 3124 last unless --$count;
3100 3125
3101 push @widgets, $item->{label} ||= do { 3126 my $label = $item->{label} ||= do {
3102 # TODO: doesn't handle markup well (read as: at all) 3127 # TODO: doesn't handle markup well (read as: at all)
3103 my $short = $item->{count} > 1 3128 my $short = $item->{count} > 1
3104 ? "<b>$item->{count} ×</b> $item->{text}" 3129 ? "<b>$item->{count} ×</b> $item->{text}"
3105 : $item->{text}; 3130 : $item->{text};
3106 3131
… …
3114 tooltip => $item->{tooltip}, 3139 tooltip => $item->{tooltip},
3115 tooltip_font => $::FONT_PROP, 3140 tooltip_font => $::FONT_PROP,
3116 tooltip_width => 0.67, 3141 tooltip_width => 0.67,
3117 fontsize => $item->{fontsize} || $self->{fontsize}, 3142 fontsize => $item->{fontsize} || $self->{fontsize},
3118 max_w => $::WIDTH * 0.44, 3143 max_w => $::WIDTH * 0.44,
3119 fg => $item->{fg}, 3144 fg => [@{ $item->{fg} }],
3120 can_events => 1, 3145 can_events => 1,
3121 can_hover => 1 3146 can_hover => 1
3122 }; 3147 };
3148
3149 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3150 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3151 $label->update;
3152 $label->set_max_size (undef, $label->{req_h} * $diff)
3153 if $diff < 1;
3154 $self->{timer}->interval (1/30);
3155 } else {
3156 $label->{fg}[3] = $item->{fg}[3] || 1;
3157 }
3158
3159 push @widgets, $label;
3123 } 3160 }
3124 3161
3125 $self->clear; 3162 $self->clear;
3126 $self->SUPER::add (reverse @widgets); 3163 $self->SUPER::add (reverse @widgets);
3127} 3164}
… …
3132 $text =~ s/^\s+//; 3169 $text =~ s/^\s+//;
3133 $text =~ s/\s+$//; 3170 $text =~ s/\s+$//;
3134 3171
3135 return unless $text; 3172 return unless $text;
3136 3173
3137 my $timeout = time + ((delete $arg{timeout}) || 60); 3174 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3138 3175
3139 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3176 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3140 3177
3141 if (my $item = $self->{item}{$group}) { 3178 if (my $item = $self->{item}{$group}) {
3142 if ($item->{text} eq $text) { 3179 if ($item->{text} eq $text) {
… …
3172 3209
3173 $self->reorder; 3210 $self->reorder;
3174 $self->SUPER::reconfigure; 3211 $self->SUPER::reconfigure;
3175} 3212}
3176 3213
3214sub DESTROY {
3215 my ($self) = @_;
3216
3217 $self->{timer}->cancel;
3218
3219 $self->SUPER::DESTROY;
3220}
3221
3177############################################################################# 3222#############################################################################
3178 3223
3179package CFClient::UI::Inventory; 3224package CFClient::UI::Inventory;
3180 3225
3181our @ISA = CFClient::UI::ScrolledWindow::; 3226our @ISA = CFClient::UI::ScrolledWindow::;
… …
3473 3518
3474package CFClient::UI::Root; 3519package CFClient::UI::Root;
3475 3520
3476our @ISA = CFClient::UI::Container::; 3521our @ISA = CFClient::UI::Container::;
3477 3522
3523use List::Util qw(min max);
3524
3478use CFClient::OpenGL; 3525use CFClient::OpenGL;
3479 3526
3480sub new { 3527sub new {
3481 my $class = shift; 3528 my $class = shift;
3482 3529
… …
3616 3663
3617 delete $queue{$widget+0}; 3664 delete $queue{$widget+0};
3618 3665
3619 my ($w, $h) = $widget->size_request; 3666 my ($w, $h) = $widget->size_request;
3620 3667
3621 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3668 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3622 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3669 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3670
3671 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3672 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3623 3673
3624 $w = $widget->{force_w} if exists $widget->{force_w}; 3674 $w = $widget->{force_w} if exists $widget->{force_w};
3625 $h = $widget->{force_h} if exists $widget->{force_h}; 3675 $h = $widget->{force_h} if exists $widget->{force_h};
3626 3676
3627 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3677 if ($widget->{req_w} != $w || $widget->{req_h} != $h

Diff Legend

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