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.390 by root, Sat Jul 21 13:29:46 2007 UTC vs.
Revision 1.412 by root, Sun Jul 22 20:08:17 2007 UTC

… …
593 593
594# using global variables seems a bit hacky, but passing through all drawing 594# using global variables seems a bit hacky, but passing through all drawing
595# functions seems pointless. 595# functions seems pointless.
596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
597 597
598sub draw { 598#sub draw {
599 my ($self) = @_; 599#CFPlus.xs
600
601 return unless $self->{h} && $self->{w};
602
603 # update screen rectangle
604 local $draw_x = $draw_x + $self->{x};
605 local $draw_y = $draw_y + $self->{y};
606
607 # skip widgets that are entirely outside the drawing area
608 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
609 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
610
611 glPushMatrix;
612 glTranslate $self->{x}, $self->{y}, 0;
613
614 if ($self == $HOVER && $self->{can_hover}) {
615 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
616 glEnable GL_BLEND;
617 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
618 glBegin GL_QUADS;
619 glVertex 0 , 0;
620 glVertex $self->{w}, 0;
621 glVertex $self->{w}, $self->{h};
622 glVertex 0 , $self->{h};
623 glEnd;
624 glDisable GL_BLEND;
625 }
626
627 if ($ENV{CFPLUS_DEBUG} & 1) {
628 glPushMatrix;
629 glColor 1, 1, 0, 1;
630 glTranslate 0.375, 0.375;
631 glBegin GL_LINE_LOOP;
632 glVertex 0 , 0;
633 glVertex $self->{w} - 1, 0;
634 glVertex $self->{w} - 1, $self->{h} - 1;
635 glVertex 0 , $self->{h} - 1;
636 glEnd;
637 glPopMatrix;
638 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
639 }
640
641 $self->_draw;
642 glPopMatrix;
643}
644 600
645sub _draw { 601sub _draw {
646 my ($self) = @_; 602 my ($self) = @_;
647 603
648 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
649} 605}
650 606
651my $cntx;#d#
652sub DESTROY { 607sub DESTROY {
653 my ($self) = @_; 608 my ($self) = @_;
654 609
655 return if CFPlus::in_destruct; 610 return if CFPlus::in_destruct;
656 611
… …
769 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
770 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
771 ]; 726 ];
772 727
773 $self->realloc; 728 $self->realloc;
729
730 map $_+0, @widgets
774} 731}
775 732
776sub children { 733sub children {
777 @{ $_[0]{children} } 734 @{ $_[0]{children} }
778} 735}
… …
789} 746}
790 747
791sub clear { 748sub clear {
792 my ($self) = @_; 749 my ($self) = @_;
793 750
794 my $children = delete $self->{children}; 751 my $children = $self->{children};
795 $self->{children} = []; 752 $self->{children} = [];
796 753
797 for (@$children) { 754 for (@$children) {
798 delete $_->{parent}; 755 delete $_->{parent};
799 $_->hide; 756 $_->hide;
… …
1093 $vp->{parent}{hslider}->set_value ($x); 1050 $vp->{parent}{hslider}->set_value ($x);
1094 $vp->{parent}{vslider}->set_value ($y); 1051 $vp->{parent}{vslider}->set_value ($y);
1095 1052
1096 0 1053 0
1097 }, 1054 },
1055 on_size_allocate => sub {
1056 my ($vp, $w, $h) = @_;
1057 $vp->{parent}->update_slider;
1058 0
1059 },
1098 ; 1060 ;
1099 1061
1100 $self->SUPER::add ($self->{vp}); 1062 $self->SUPER::add ($self->{vp});
1101 1063
1102 $self->add ($child) if $child; 1064 $self->add ($child) if $child;
1103 1065
1104 $self 1066 $self
1105} 1067}
1106
1107#TODO# update range on size_allocate depending on child?
1108 1068
1109sub add { 1069sub add {
1110 my ($self, $widget) = @_; 1070 my ($self, $widget) = @_;
1111 1071
1112 $self->{vp}->add ($self->{child} = $widget); 1072 $self->{vp}->add ($self->{child} = $widget);
… …
1115sub update_slider { 1075sub update_slider {
1116 my ($self) = @_; 1076 my ($self) = @_;
1117 1077
1118 my $child = ($self->{vp} or return)->child; 1078 my $child = ($self->{vp} or return)->child;
1119 1079
1080 if ($self->{scroll_x}) {
1120 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1081 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1121 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1082 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1122 1083
1123 my $visible = $w1 > $w2; 1084 my $visible = $w1 > $w2;
1124 if ($visible != $self->{hslider}{visible}) { 1085 if ($visible != $self->{hslider_visible}) {
1086 $self->{hslider_visible} = $visible;
1125 $visible ? $self->SUPER::add ($self->{hslider}) 1087 $visible ? $self->SUPER::add ($self->{hslider})
1126 : $self->SUPER::remove ($self->{hslider}); 1088 : $self->SUPER::remove ($self->{hslider});
1089 }
1127 } 1090 }
1128 1091
1092 if ($self->{scroll_y}) {
1129 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1093 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1130 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1094 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1131 1095
1132 my $visible = $h1 > $h2; 1096 my $visible = $h1 > $h2;
1133 if ($visible != $self->{vslider}{visible}) { 1097 if ($visible != $self->{vslider_visible}) {
1098 $self->{vslider_visible} = $visible;
1134 $visible ? $self->SUPER::add ($self->{vslider}) 1099 $visible ? $self->SUPER::add ($self->{vslider})
1135 : $self->SUPER::remove ($self->{vslider}); 1100 : $self->SUPER::remove ($self->{vslider});
1101 }
1102 }
1103}
1104
1105sub start_dragging {
1106 my ($self, $ev) = @_;
1107
1108 $self->grab_focus;
1109
1110 my $ox = $self->{vp}{view_x};
1111 my $oy = $self->{vp}{view_y};
1112
1113 $self->{motion} = sub {
1114 my ($ev, $x, $y) = @_;
1115
1116 $ox -= $ev->{xrel};
1117 $oy -= $ev->{yrel};
1118
1119 $self->{vp}->set_offset ($ox, $oy);
1136 } 1120 };
1137}
1138
1139sub update {
1140 my ($self) = @_;
1141
1142 $self->update_slider;
1143 $self->SUPER::update;
1144} 1121}
1145 1122
1146sub invoke_mouse_wheel { 1123sub invoke_mouse_wheel {
1147 my ($self, $ev) = @_; 1124 my ($self, $ev) = @_;
1148 1125
1149 $self->{vslider}->emit (mouse_wheel => $ev) 1126 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1150 if $ev->{dy};
1151
1152 $self->{hslider}->emit (mouse_wheel => $ev) 1127 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1153 if $ev->{dx};
1154 1128
1155 1 1129 1
1156} 1130}
1157 1131
1158sub invoke_button_down { 1132sub invoke_button_down {
1159 my ($self, $ev, $x, $y) = @_; 1133 my ($self, $ev, $x, $y) = @_;
1160 1134
1161 if ($ev->{button} == 2) { 1135 if ($ev->{button} == 2) {
1162 $self->grab_focus; 1136 $self->start_dragging ($ev);
1163
1164 my $ox = $self->{vp}{view_x} + $ev->{x};
1165 my $oy = $self->{vp}{view_y} + $ev->{y};
1166
1167 $self->{motion} = sub {
1168 my ($ev, $x, $y) = @_;
1169
1170 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1171 $self->update;
1172 };
1173
1174 return 1; 1137 return 1;
1175 } 1138 }
1176 1139
1177 0 1140 0
1178} 1141}
… …
1639 1602
1640 my (@w, @h); 1603 my (@w, @h);
1641 1604
1642 my @children = $self->children; 1605 my @children = $self->children;
1643 1606
1607 # first pass, columns
1644 for my $widget (sort { $b->{rowspan} * $b->{colspan} <=> $a->{rowspan} * $a->{colspan} } @children) { 1608 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1645 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1609 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1646 1610
1647 my $sw = sum @w[$c .. $c + $cs - 1]; 1611 my $sw = sum @w[$c .. $c + $cs - 1];
1612
1613 if ($w > $sw) {
1614 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1615 }
1616 }
1617
1618 # second pass, rows
1619 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1621
1648 my $sh = sum @h[$r .. $r + $rs - 1]; 1622 my $sh = sum @h[$r .. $r + $rs - 1];
1649 1623
1650 if ($w > $sw) {
1651 $_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1];
1652 }
1653
1654 if ($h > $sh) { 1624 if ($h > $sh) {
1655 $_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1]; 1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1656 } 1626 }
1657 } 1627 }
1658 1628
1659 (\@w, \@h) 1629 (\@w, \@h)
1660} 1630}
… …
1716 1686
1717use List::Util qw(min max); 1687use List::Util qw(min max);
1718 1688
1719our @ISA = CFPlus::UI::Container::; 1689our @ISA = CFPlus::UI::Container::;
1720 1690
1721sub add {
1722 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1723
1724 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1725 $self->SUPER::add ($child);
1726}
1727
1728sub _scale($$$) { 1691sub _scale($$$) {
1729 my ($mode, $val, $max) = @_; 1692 my ($rel, $val, $max) = @_;
1730 1693
1731 $mode eq "abs" ? $val 1694 $rel ? $val * $max : $val
1732 : $mode eq "rel" ? $val * $max
1733 : 0
1734} 1695}
1735 1696
1736sub size_request { 1697sub size_request {
1737 my ($self) = @_; 1698 my ($self) = @_;
1738 1699
1739 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1700 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1740 1701
1741 # determine overall size by querying abs widgets 1702 # determine overall size by querying abs widgets
1742 for my $child ($self->visible_children) { 1703 for my $child ($self->visible_children) {
1743 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1704 unless ($child->{c_rel}) {
1705 my $x = $child->{c_x};
1706 my $y = $child->{c_y};
1744 1707
1745 if ($pos eq "abs") {
1746 $w = _scale $size, $w, $child->{req_w};
1747 $h = _scale $size, $h, $child->{req_h};
1748
1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1708 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1709 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1751 } 1710 }
1752 } 1711 }
1753 1712
1754 my $W = $x2 - $x1; 1713 my $W = $x2 - $x1;
1755 my $H = $y2 - $y1; 1714 my $H = $y2 - $y1;
1756 1715
1757 # now layout remaining widgets 1716 # now layout remaining widgets
1758 for my $child ($self->visible_children) { 1717 for my $child ($self->visible_children) {
1759 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1718 if ($child->{c_rel}) {
1719 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1720 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1760 1721
1761 if ($pos ne "abs") {
1762 $x = _scale $pos, $x, $W;
1763 $y = _scale $pos, $x, $H;
1764 $w = _scale $size, $w, $child->{req_w};
1765 $h = _scale $size, $h, $child->{req_h};
1766
1767 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1722 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1768 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1723 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1769 } 1724 }
1770 } 1725 }
1771 1726
1772 my $W = $x2 - $x1; 1727 my $W = $x2 - $x1;
1773 my $H = $y2 - $y1; 1728 my $H = $y2 - $y1;
… …
1777 1732
1778sub invoke_size_allocate { 1733sub invoke_size_allocate {
1779 my ($self, $W, $H) = @_; 1734 my ($self, $W, $H) = @_;
1780 1735
1781 for my $child ($self->visible_children) { 1736 for my $child ($self->visible_children) {
1782 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1737 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1738 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1783 1739
1784 $x = _scale $pos, $x, $W; 1740 $x += $child->{c_halign} * $child->{req_w};
1785 $y = _scale $pos, $x, $H; 1741 $y += $child->{c_valign} * $child->{req_h};
1786 $w = _scale $size, $w, $child->{req_w};
1787 $h = _scale $size, $h, $child->{req_h};
1788 1742
1789 $child->configure ($x, $y, $w, $h); 1743 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1790 } 1744 }
1791 1745
1792 1 1746 1
1793} 1747}
1794 1748
… …
2057 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2011 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2058 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2012 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2059 : ($self->{h} - $size->[1]) * 0.5); 2013 : ($self->{h} - $size->[1]) * 0.5);
2060 }; 2014 };
2061 2015
2062 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2016# unless ($self->{list}) {
2063 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2017# $self->{list} = CFPlus::OpenGL::glGenList;
2018# CFPlus::OpenGL::glNewList $self->{list};
2019# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2020# CFPlus::OpenGL::glEndList;
2021# }
2022#
2023# CFPlus::OpenGL::glCallList $self->{list};
2064 2024
2065 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2025 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2066} 2026}
2027
2028#sub destroy {
2029# my ($self) = @_;
2030#
2031# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2032#
2033# $self->SUPER::destroy;
2034#}
2067 2035
2068############################################################################# 2036#############################################################################
2069 2037
2070package CFPlus::UI::EntryBase; 2038package CFPlus::UI::EntryBase;
2071 2039
… …
2856 2824
2857 $self->SUPER::invoke_button_down ($ev, $x, $y); 2825 $self->SUPER::invoke_button_down ($ev, $x, $y);
2858 2826
2859 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2827 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2860 2828
2861 $self->invoke_mouse_motion ($ev, $x, $y) 2829 $self->invoke_mouse_motion ($ev, $x, $y);
2830
2831 1
2862} 2832}
2863 2833
2864sub invoke_mouse_motion { 2834sub invoke_mouse_motion {
2865 my ($self, $ev, $x, $y) = @_; 2835 my ($self, $ev, $x, $y) = @_;
2866 2836
… …
2886 2856
2887 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 2857 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2888 2858
2889 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 2859 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2890 2860
2891 ! ! $delta 2861 1
2892} 2862}
2893 2863
2894sub update { 2864sub update {
2895 my ($self) = @_; 2865 my ($self) = @_;
2896 2866
… …
3469 3439
3470 if ($self->{anim} && $self->{animspeed}) { 3440 if ($self->{anim} && $self->{animspeed}) {
3471 CFPlus::weaken (my $widget = $self); 3441 CFPlus::weaken (my $widget = $self);
3472 3442
3473 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3443 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3474 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3444 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3475 $self->{timer} = Event->timer ( 3445 $self->{timer} = Event->timer (
3476 parked => 1, 3446 parked => 1,
3477 cb => sub { 3447 cb => sub {
3478 return unless $::CONN && $widget; 3448 return unless $::CONN && $widget;
3479 3449
… …
3516 3486
3517 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3487 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3518 if ($anim && @$anim) { 3488 if ($anim && @$anim) {
3519 delete $self->{wait_face}; 3489 delete $self->{wait_face};
3520 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3490 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3491 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3521 } 3492 }
3522 } 3493 }
3523} 3494}
3524 3495
3525sub size_request { 3496sub size_request {
3526 my ($self) = @_; 3497 my ($self) = @_;
3527 3498
3528 if ($::CONN) { 3499 if ($::CONN) {
3529 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3500 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3530 if (my $tex = $::CONN->{texture}[$faceid]) { 3501 if (my $tex = $::CONN->{texture}[$faceid]) {
3502 $self->{tex} = $tex;
3531 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3503 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3532 } else { 3504 } else {
3533 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3505 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3534 $self->realloc; 3506 $self->realloc;
3535 }); 3507 });
… …
3557} 3529}
3558 3530
3559sub _draw { 3531sub _draw {
3560 my ($self) = @_; 3532 my ($self) = @_;
3561 3533
3562 return unless $::CONN;
3563
3564 $self->SUPER::_draw; 3534 $self->SUPER::_draw;
3565 3535
3566 my $faceid = $::CONN->{faceid}[$self->{face}] 3536 if (my $tex = $self->{tex}) {
3567 or return;
3568
3569 my $tex = $::CONN->{texture}[$faceid];
3570
3571 if ($tex) {
3572 glEnable GL_TEXTURE_2D; 3537 glEnable GL_TEXTURE_2D;
3573 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3538 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3574 glColor 0, 0, 0, 1; 3539 glColor 0, 0, 0, 1;
3575 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3540 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3576 glDisable GL_TEXTURE_2D; 3541 glDisable GL_TEXTURE_2D;
… …
3786sub add { 3751sub add {
3787 my ($self, $title, $widget, $tooltip) = @_; 3752 my ($self, $title, $widget, $tooltip) = @_;
3788 3753
3789 CFPlus::weaken $self; 3754 CFPlus::weaken $self;
3790 3755
3791 $self->{buttonbar}->add (new CFPlus::UI::Button 3756 unless (ref $title) {
3757 $title = new CFPlus::UI::Button
3792 markup => $title, 3758 markup => $title,
3793 tooltip => $tooltip, 3759 tooltip => $tooltip,
3760 ;
3761 }
3762
3794 on_activate => sub { $self->set_current_page ($widget) }, 3763 $title->connect (activate => sub { $self->set_current_page ($widget) });
3795 ); 3764 $self->{buttonbar}->add ($title);
3796 3765
3797 $self->{multiplexer}->add ($widget); 3766 $self->{multiplexer}->add ($widget);
3798} 3767}
3799 3768
3800sub get_current_page { 3769sub get_current_page {
… …
4132 while ($self->{refresh_hook}) { 4101 while ($self->{refresh_hook}) {
4133 $_->() 4102 $_->()
4134 for values %{delete $self->{refresh_hook}}; 4103 for values %{delete $self->{refresh_hook}};
4135 } 4104 }
4136 4105
4137 if ($self->{realloc}) { 4106 while ($self->{realloc}) {
4138 my %queue; 4107 my %queue;
4139 my @queue; 4108 my @queue;
4140 my $widget; 4109 my $widget;
4141 4110
4142 outer: 4111 outer:
… …
4189 } 4158 }
4190 } 4159 }
4191 4160
4192 delete $self->{realloc}{$widget+0}; 4161 delete $self->{realloc}{$widget+0};
4193 } 4162 }
4194 }
4195 4163
4196 while (my $size_alloc = delete $self->{size_alloc}) { 4164 while (my $size_alloc = delete $self->{size_alloc}) {
4197 my @queue = sort { $b->{visible} <=> $a->{visible} } 4165 my @queue = sort { $a->{visible} <=> $b->{visible} }
4198 values %$size_alloc; 4166 values %$size_alloc;
4199 4167
4200 while () { 4168 while () {
4201 my $widget = pop @queue || last; 4169 my $widget = pop @queue || last;
4202 4170
4203 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4171 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4204 4172
4205 $w = 0 if $w < 0;
4206 $h = 0 if $h < 0;
4207
4208 $w = max $widget->{min_w}, $w; 4173 $w = max $widget->{min_w}, $w;
4209 $h = max $widget->{min_h}, $h; 4174 $h = max $widget->{min_h}, $h;
4210 4175
4211# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4176# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4212# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4177# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4213 4178
4214 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4179 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4215 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4180 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4216 4181
4217 $w = int $w + 0.5; 4182 $w = int $w + 0.5;
4218 $h = int $h + 0.5; 4183 $h = int $h + 0.5;
4219 4184
4220 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4221 $widget->{old_w} = $widget->{w}; 4186 $widget->{old_w} = $widget->{w};
4222 $widget->{old_h} = $widget->{h}; 4187 $widget->{old_h} = $widget->{h};
4223 4188
4224 $widget->{w} = $w; 4189 $widget->{w} = $w;
4225 $widget->{h} = $h; 4190 $widget->{h} = $h;
4226 4191
4227 $widget->emit (size_allocate => $w, $h); 4192 $widget->emit (size_allocate => $w, $h);
4193 }
4228 } 4194 }
4229 } 4195 }
4230 } 4196 }
4231 4197
4232 while ($self->{post_alloc_hook}) { 4198 while ($self->{post_alloc_hook}) {

Diff Legend

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