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.400 by root, Sat Jul 21 16:15:03 2007 UTC vs.
Revision 1.413 by root, Mon Jul 23 15:30:45 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";
… …
769 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
770 ]; 726 ];
771 727
772 $self->realloc; 728 $self->realloc;
773 729
730 $self->emit (c_add => \@widgets);
731
774 map $_+0, @widgets 732 map $_+0, @widgets
775} 733}
776 734
777sub children { 735sub children {
778 @{ $_[0]{children} } 736 @{ $_[0]{children} }
779} 737}
780 738
781sub remove { 739sub remove {
782 my ($self, $child) = @_; 740 my ($self, @widgets) = @_;
783 741
742 $self->emit (c_remove => \@widgets);
743
744 for my $child (@widgets) {
784 delete $child->{parent}; 745 delete $child->{parent};
785 $child->hide; 746 $child->hide;
786
787 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 747 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
748 }
788 749
789 $self->realloc; 750 $self->realloc;
790} 751}
791 752
792sub clear { 753sub clear {
… …
820} 781}
821 782
822sub _draw { 783sub _draw {
823 my ($self) = @_; 784 my ($self) = @_;
824 785
825 $_->draw for @{$self->{children}}; 786 $_->draw for $self->visible_children;
826} 787}
827 788
828############################################################################# 789#############################################################################
829 790
830package CFPlus::UI::Bin; 791package CFPlus::UI::Bin;
… …
840} 801}
841 802
842sub add { 803sub add {
843 my ($self, $child) = @_; 804 my ($self, $child) = @_;
844 805
845 $self->SUPER::remove ($_) for @{ $self->{children} }; 806 $self->clear;
846 $self->SUPER::add ($child); 807 $self->SUPER::add ($child);
847} 808}
848 809
849sub remove { 810sub remove {
850 my ($self, $widget) = @_; 811 my ($self, $widget) = @_;
… …
1094 $vp->{parent}{hslider}->set_value ($x); 1055 $vp->{parent}{hslider}->set_value ($x);
1095 $vp->{parent}{vslider}->set_value ($y); 1056 $vp->{parent}{vslider}->set_value ($y);
1096 1057
1097 0 1058 0
1098 }, 1059 },
1060 on_size_allocate => sub {
1061 my ($vp, $w, $h) = @_;
1062 $vp->{parent}->update_slider;
1063 0
1064 },
1099 ; 1065 ;
1100 1066
1101 $self->SUPER::add ($self->{vp}); 1067 $self->SUPER::add ($self->{vp});
1102 1068
1103 $self->add ($child) if $child; 1069 $self->add ($child) if $child;
… …
1114sub update_slider { 1080sub update_slider {
1115 my ($self) = @_; 1081 my ($self) = @_;
1116 1082
1117 my $child = ($self->{vp} or return)->child; 1083 my $child = ($self->{vp} or return)->child;
1118 1084
1085 if ($self->{scroll_x}) {
1119 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1086 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1120 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1087 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1121 1088
1122 my $visible = $w1 > $w2; 1089 my $visible = $w1 > $w2;
1123 if ($visible != $self->{hslider_visible}) { 1090 if ($visible != $self->{hslider_visible}) {
1124 $self->{hslider_visible} = $visible; 1091 $self->{hslider_visible} = $visible;
1125 $visible ? $self->SUPER::add ($self->{hslider}) 1092 $visible ? $self->SUPER::add ($self->{hslider})
1126 : $self->SUPER::remove ($self->{hslider}); 1093 : $self->SUPER::remove ($self->{hslider});
1094 }
1127 } 1095 }
1128 1096
1097 if ($self->{scroll_y}) {
1129 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1098 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1130 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1099 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1131 1100
1132 my $visible = $h1 > $h2; 1101 my $visible = $h1 > $h2;
1133 if ($visible != $self->{vslider_visible}) { 1102 if ($visible != $self->{vslider_visible}) {
1134 $self->{vslider_visible} = $visible; 1103 $self->{vslider_visible} = $visible;
1135 $visible ? $self->SUPER::add ($self->{vslider}) 1104 $visible ? $self->SUPER::add ($self->{vslider})
1136 : $self->SUPER::remove ($self->{vslider}); 1105 : $self->SUPER::remove ($self->{vslider});
1106 }
1137 } 1107 }
1138} 1108}
1139 1109
1140sub start_dragging { 1110sub start_dragging {
1141 my ($self, $ev) = @_; 1111 my ($self, $ev) = @_;
… …
1721 1691
1722use List::Util qw(min max); 1692use List::Util qw(min max);
1723 1693
1724our @ISA = CFPlus::UI::Container::; 1694our @ISA = CFPlus::UI::Container::;
1725 1695
1726sub add {
1727 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1728
1729 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1730 $self->SUPER::add ($child);
1731}
1732
1733sub _scale($$$) { 1696sub _scale($$$) {
1734 my ($mode, $val, $max) = @_; 1697 my ($rel, $val, $max) = @_;
1735 1698
1736 $mode eq "abs" ? $val 1699 $rel ? $val * $max : $val
1737 : $mode eq "rel" ? $val * $max
1738 : 0
1739} 1700}
1740 1701
1741sub size_request { 1702sub size_request {
1742 my ($self) = @_; 1703 my ($self) = @_;
1743 1704
1744 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1705 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1745 1706
1746 # determine overall size by querying abs widgets 1707 # determine overall size by querying abs widgets
1747 for my $child ($self->visible_children) { 1708 for my $child ($self->visible_children) {
1748 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1709 unless ($child->{c_rel}) {
1710 my $x = $child->{c_x};
1711 my $y = $child->{c_y};
1749 1712
1750 if ($pos eq "abs") {
1751 $w = _scale $size, $w, $child->{req_w};
1752 $h = _scale $size, $h, $child->{req_h};
1753
1754 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1713 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1755 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1714 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1756 } 1715 }
1757 } 1716 }
1758 1717
1759 my $W = $x2 - $x1; 1718 my $W = $x2 - $x1;
1760 my $H = $y2 - $y1; 1719 my $H = $y2 - $y1;
1761 1720
1762 # now layout remaining widgets 1721 # now layout remaining widgets
1763 for my $child ($self->visible_children) { 1722 for my $child ($self->visible_children) {
1764 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1723 if ($child->{c_rel}) {
1724 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1725 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1765 1726
1766 if ($pos ne "abs") {
1767 $x = _scale $pos, $x, $W;
1768 $y = _scale $pos, $x, $H;
1769 $w = _scale $size, $w, $child->{req_w};
1770 $h = _scale $size, $h, $child->{req_h};
1771
1772 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1727 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1773 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1728 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1774 } 1729 }
1775 } 1730 }
1776 1731
1777 my $W = $x2 - $x1; 1732 my $W = $x2 - $x1;
1778 my $H = $y2 - $y1; 1733 my $H = $y2 - $y1;
… …
1782 1737
1783sub invoke_size_allocate { 1738sub invoke_size_allocate {
1784 my ($self, $W, $H) = @_; 1739 my ($self, $W, $H) = @_;
1785 1740
1786 for my $child ($self->visible_children) { 1741 for my $child ($self->visible_children) {
1787 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1742 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1743 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1788 1744
1789 $x = _scale $pos, $x, $W; 1745 $x += $child->{c_halign} * $child->{req_w};
1790 $y = _scale $pos, $x, $H; 1746 $y += $child->{c_valign} * $child->{req_h};
1791 $w = _scale $size, $w, $child->{req_w};
1792 $h = _scale $size, $h, $child->{req_h};
1793 1747
1794 $child->configure ($x, $y, $w, $h); 1748 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1795 } 1749 }
1796 1750
1797 1 1751 1
1798} 1752}
1799 1753
… …
1803 1757
1804our @ISA = CFPlus::UI::Container::; 1758our @ISA = CFPlus::UI::Container::;
1805 1759
1806sub size_request { 1760sub size_request {
1807 my ($self) = @_; 1761 my ($self) = @_;
1762
1763 my @children = $self->visible_children;
1808 1764
1809 $self->{vertical} 1765 $self->{vertical}
1810 ? ( 1766 ? (
1811 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1767 (List::Util::max map $_->{req_w}, @children),
1812 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1768 (List::Util::sum map $_->{req_h}, @children),
1813 ) 1769 )
1814 : ( 1770 : (
1815 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1771 (List::Util::sum map $_->{req_w}, @children),
1816 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1772 (List::Util::max map $_->{req_h}, @children),
1817 ) 1773 )
1818} 1774}
1819 1775
1820sub invoke_size_allocate { 1776sub invoke_size_allocate {
1821 my ($self, $w, $h) = @_; 1777 my ($self, $w, $h) = @_;
… …
2062 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2018 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2063 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2019 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2064 : ($self->{h} - $size->[1]) * 0.5); 2020 : ($self->{h} - $size->[1]) * 0.5);
2065 }; 2021 };
2066 2022
2067 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2023# unless ($self->{list}) {
2068 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2024# $self->{list} = CFPlus::OpenGL::glGenList;
2025# CFPlus::OpenGL::glNewList $self->{list};
2026# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2027# CFPlus::OpenGL::glEndList;
2028# }
2029#
2030# CFPlus::OpenGL::glCallList $self->{list};
2069 2031
2070 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2032 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2071} 2033}
2034
2035#sub destroy {
2036# my ($self) = @_;
2037#
2038# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2039#
2040# $self->SUPER::destroy;
2041#}
2072 2042
2073############################################################################# 2043#############################################################################
2074 2044
2075package CFPlus::UI::EntryBase; 2045package CFPlus::UI::EntryBase;
2076 2046
… …
2861 2831
2862 $self->SUPER::invoke_button_down ($ev, $x, $y); 2832 $self->SUPER::invoke_button_down ($ev, $x, $y);
2863 2833
2864 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2834 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2865 2835
2866 $self->invoke_mouse_motion ($ev, $x, $y) 2836 $self->invoke_mouse_motion ($ev, $x, $y);
2837
2838 1
2867} 2839}
2868 2840
2869sub invoke_mouse_motion { 2841sub invoke_mouse_motion {
2870 my ($self, $ev, $x, $y) = @_; 2842 my ($self, $ev, $x, $y) = @_;
2871 2843
… …
2891 2863
2892 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 2864 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2893 2865
2894 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 2866 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2895 2867
2896 ! ! $delta 2868 1
2897} 2869}
2898 2870
2899sub update { 2871sub update {
2900 my ($self) = @_; 2872 my ($self) = @_;
2901 2873
… …
3032} 3004}
3033 3005
3034sub size_request { 3006sub size_request {
3035 my ($self) = @_; 3007 my ($self) = @_;
3036 3008
3037 my ($empty, $slider) = @{ $self->{children} }; 3009 my ($empty, $slider) = $self->visible_children;
3038 3010
3039 local $self->{children} = [$empty, $slider]; 3011 local $self->{children} = [$empty, $slider];
3040 $self->SUPER::size_request 3012 $self->SUPER::size_request
3041} 3013}
3042 3014
… …
3474 3446
3475 if ($self->{anim} && $self->{animspeed}) { 3447 if ($self->{anim} && $self->{animspeed}) {
3476 CFPlus::weaken (my $widget = $self); 3448 CFPlus::weaken (my $widget = $self);
3477 3449
3478 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3450 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3479 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3451 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3480 $self->{timer} = Event->timer ( 3452 $self->{timer} = Event->timer (
3481 parked => 1, 3453 parked => 1,
3482 cb => sub { 3454 cb => sub {
3483 return unless $::CONN && $widget; 3455 return unless $::CONN && $widget;
3484 3456
… …
3521 3493
3522 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3494 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3523 if ($anim && @$anim) { 3495 if ($anim && @$anim) {
3524 delete $self->{wait_face}; 3496 delete $self->{wait_face};
3525 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3497 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3498 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3526 } 3499 }
3527 } 3500 }
3528} 3501}
3529 3502
3530sub size_request { 3503sub size_request {
3531 my ($self) = @_; 3504 my ($self) = @_;
3532 3505
3533 if ($::CONN) { 3506 if ($::CONN) {
3534 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3507 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3535 if (my $tex = $::CONN->{texture}[$faceid]) { 3508 if (my $tex = $::CONN->{texture}[$faceid]) {
3509 $self->{tex} = $tex;
3536 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3510 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3537 } else { 3511 } else {
3538 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3512 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3539 $self->realloc; 3513 $self->realloc;
3540 }); 3514 });
… …
3562} 3536}
3563 3537
3564sub _draw { 3538sub _draw {
3565 my ($self) = @_; 3539 my ($self) = @_;
3566 3540
3567 return unless $::CONN;
3568
3569 $self->SUPER::_draw; 3541 $self->SUPER::_draw;
3570 3542
3571 my $faceid = $::CONN->{faceid}[$self->{face}] 3543 if (my $tex = $self->{tex}) {
3572 or return;
3573
3574 my $tex = $::CONN->{texture}[$faceid];
3575
3576 if ($tex) {
3577 glEnable GL_TEXTURE_2D; 3544 glEnable GL_TEXTURE_2D;
3578 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3545 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3579 glColor 0, 0, 0, 1; 3546 glColor 0, 0, 0, 1;
3580 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3547 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3581 glDisable GL_TEXTURE_2D; 3548 glDisable GL_TEXTURE_2D;
… …
3783 ); 3750 );
3784 3751
3785 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3752 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3786 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3753 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3787 3754
3755 {
3756 Scalar::Util::weaken (my $wself = $self);
3757
3758 $self->{multiplexer}->connect (c_add => sub {
3759 my ($mplex, $widgets) = @_;
3760
3761 for my $child (@$widgets) {
3762 Scalar::Util::weaken $child;
3763 $child->{c_tab_} ||= do {
3764 my $tab =
3765 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3766 ? $child->{c_tab}
3767 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3768
3769 $tab->connect (activate => sub {
3770 $wself->set_current_page ($child);
3771 });
3772
3773 $tab
3774 };
3775
3776 $self->{buttonbar}->add ($child->{c_tab_});
3777 }
3778 });
3779
3780 $self->{multiplexer}->connect (c_remove => sub {
3781 my ($mplex, $widgets) = @_;
3782
3783 for my $child (@$widgets) {
3784 $wself->{buttonbar}->remove ($child->{c_tab_});
3785 }
3786 });
3787 }
3788
3788 $self 3789 $self
3789} 3790}
3790 3791
3791sub add { 3792sub add {
3793 my ($self, @widgets) = @_;
3794
3795 $self->{multiplexer}->add (@widgets)
3796}
3797
3798sub remove {
3799 my ($self, @widgets) = @_;
3800
3801 $self->{multiplexer}->remove (@widgets)
3802}
3803
3804sub add_tab {
3792 my ($self, $title, $widget, $tooltip) = @_; 3805 my ($self, $title, $widget, $tooltip) = @_;
3793 3806
3794 CFPlus::weaken $self; 3807 $title = [$title, $tooltip] unless ref $title;
3808 $widget->{c_tab} = $title;
3795 3809
3796 $self->{buttonbar}->add (new CFPlus::UI::Button
3797 markup => $title,
3798 tooltip => $tooltip,
3799 on_activate => sub { $self->set_current_page ($widget) },
3800 );
3801
3802 $self->{multiplexer}->add ($widget); 3810 $self->add ($widget);
3803} 3811}
3804 3812
3805sub get_current_page { 3813sub get_current_page {
3806 my ($self) = @_; 3814 my ($self) = @_;
3807 3815
… …
4137 while ($self->{refresh_hook}) { 4145 while ($self->{refresh_hook}) {
4138 $_->() 4146 $_->()
4139 for values %{delete $self->{refresh_hook}}; 4147 for values %{delete $self->{refresh_hook}};
4140 } 4148 }
4141 4149
4142 if ($self->{realloc}) { 4150 while ($self->{realloc}) {
4143 my %queue; 4151 my %queue;
4144 my @queue; 4152 my @queue;
4145 my $widget; 4153 my $widget;
4146 4154
4147 outer: 4155 outer:
… …
4194 } 4202 }
4195 } 4203 }
4196 4204
4197 delete $self->{realloc}{$widget+0}; 4205 delete $self->{realloc}{$widget+0};
4198 } 4206 }
4199 }
4200 4207
4201 while (my $size_alloc = delete $self->{size_alloc}) { 4208 while (my $size_alloc = delete $self->{size_alloc}) {
4202 my @queue = sort { $b->{visible} <=> $a->{visible} } 4209 my @queue = sort { $a->{visible} <=> $b->{visible} }
4203 values %$size_alloc; 4210 values %$size_alloc;
4204 4211
4205 while () { 4212 while () {
4206 my $widget = pop @queue || last; 4213 my $widget = pop @queue || last;
4207 4214
4208 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4215 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4209 4216
4210 $w = 0 if $w < 0;
4211 $h = 0 if $h < 0;
4212
4213 $w = max $widget->{min_w}, $w; 4217 $w = max $widget->{min_w}, $w;
4214 $h = max $widget->{min_h}, $h; 4218 $h = max $widget->{min_h}, $h;
4215 4219
4216# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4220# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4217# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4221# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4218 4222
4219 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4223 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4220 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4224 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4221 4225
4222 $w = int $w + 0.5; 4226 $w = int $w + 0.5;
4223 $h = int $h + 0.5; 4227 $h = int $h + 0.5;
4224 4228
4225 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4229 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4226 $widget->{old_w} = $widget->{w}; 4230 $widget->{old_w} = $widget->{w};
4227 $widget->{old_h} = $widget->{h}; 4231 $widget->{old_h} = $widget->{h};
4228 4232
4229 $widget->{w} = $w; 4233 $widget->{w} = $w;
4230 $widget->{h} = $h; 4234 $widget->{h} = $h;
4231 4235
4232 $widget->emit (size_allocate => $w, $h); 4236 $widget->emit (size_allocate => $w, $h);
4237 }
4233 } 4238 }
4234 } 4239 }
4235 } 4240 }
4236 4241
4237 while ($self->{post_alloc_hook}) { 4242 while ($self->{post_alloc_hook}) {

Diff Legend

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