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.391 by root, Sat Jul 21 13:33:10 2007 UTC vs.
Revision 1.429 by root, Tue Aug 21 00:59:34 2007 UTC

… …
273 $self->emit ("destroy"); 273 $self->emit ("destroy");
274 %$self = (); 274 %$self = ();
275} 275}
276 276
277sub TO_JSON { 277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} } 278 { __w_ => $_[0]{s_id} }
279} 279}
280 280
281sub show { 281sub show {
282 my ($self) = @_; 282 my ($self) = @_;
283 283
… …
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 $self->emit (c_add => \@widgets);
731
732 map $_+0, @widgets
774} 733}
775 734
776sub children { 735sub children {
777 @{ $_[0]{children} } 736 @{ $_[0]{children} }
778} 737}
779 738
780sub remove { 739sub remove {
781 my ($self, $child) = @_; 740 my ($self, @widgets) = @_;
782 741
742 $self->emit (c_remove => \@widgets);
743
744 for my $child (@widgets) {
783 delete $child->{parent}; 745 delete $child->{parent};
784 $child->hide; 746 $child->hide;
785
786 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 747 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
748 }
787 749
788 $self->realloc; 750 $self->realloc;
789} 751}
790 752
791sub clear { 753sub clear {
792 my ($self) = @_; 754 my ($self) = @_;
793 755
794 my $children = delete $self->{children}; 756 my $children = $self->{children};
795 $self->{children} = []; 757 $self->{children} = [];
796 758
797 for (@$children) { 759 for (@$children) {
798 delete $_->{parent}; 760 delete $_->{parent};
799 $_->hide; 761 $_->hide;
… …
819} 781}
820 782
821sub _draw { 783sub _draw {
822 my ($self) = @_; 784 my ($self) = @_;
823 785
824 $_->draw for @{$self->{children}}; 786 $_->draw for $self->visible_children;
825} 787}
826 788
827############################################################################# 789#############################################################################
828 790
829package CFPlus::UI::Bin; 791package CFPlus::UI::Bin;
… …
839} 801}
840 802
841sub add { 803sub add {
842 my ($self, $child) = @_; 804 my ($self, $child) = @_;
843 805
844 $self->SUPER::remove ($_) for @{ $self->{children} }; 806 $self->clear;
845 $self->SUPER::add ($child); 807 $self->SUPER::add ($child);
846} 808}
847 809
848sub remove { 810sub remove {
849 my ($self, $widget) = @_; 811 my ($self, $widget) = @_;
… …
991 $self->{view_x} = $x; 953 $self->{view_x} = $x;
992 $self->{view_y} = $y; 954 $self->{view_y} = $y;
993 955
994 $self->emit (changed => $x, $y); 956 $self->emit (changed => $x, $y);
995 $self->update; 957 $self->update;
958 }
959}
960
961sub set_center {
962 my ($self, $x, $y) = @_;
963
964 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
965}
966
967sub make_visible {
968 my ($self, $x, $y, $border) = @_;
969
970 if ( $x < $self->{view_x} + $self->{w} * $border
971 || $x > $self->{view_x} + $self->{w} * (1 - $border)
972 || $y < $self->{view_y} + $self->{h} * $border
973 || $y > $self->{view_y} + $self->{h} * (1 - $border)
974 ) {
975 $self->set_center ($x, $y);
996 } 976 }
997} 977}
998 978
999# hmm, this does not work for topleft of $self... but we should not ask for that 979# hmm, this does not work for topleft of $self... but we should not ask for that
1000sub coord2local { 980sub coord2local {
… …
1047 my $child = delete $arg{child}; 1027 my $child = delete $arg{child};
1048 1028
1049 my $self; 1029 my $self;
1050 1030
1051 my $hslider = new CFPlus::UI::Slider 1031 my $hslider = new CFPlus::UI::Slider
1052 col => 0, 1032 c_col => 0,
1053 row => 1, 1033 c_row => 1,
1054 vertical => 0, 1034 vertical => 0,
1055 range => [0, 0, 1, 0.01], # HACK fix 1035 range => [0, 0, 1, 0.01], # HACK fix
1056 on_changed => sub { 1036 on_changed => sub {
1057 $self->{hpos} = $_[1]; 1037 $self->{hpos} = $_[1];
1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1059 }, 1039 },
1060 ; 1040 ;
1061 1041
1062 my $vslider = new CFPlus::UI::Slider 1042 my $vslider = new CFPlus::UI::Slider
1063 col => 1, 1043 c_col => 1,
1064 row => 0, 1044 c_row => 0,
1065 vertical => 1, 1045 vertical => 1,
1066 range => [0, 0, 1, 0.01], # HACK fix 1046 range => [0, 0, 1, 0.01], # HACK fix
1067 on_changed => sub { 1047 on_changed => sub {
1068 $self->{vpos} = $_[1]; 1048 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1080 row_expand => [1, 0], 1060 row_expand => [1, 0],
1081 %arg, 1061 %arg,
1082 ); 1062 );
1083 1063
1084 $self->{vp} = new CFPlus::UI::ViewPort 1064 $self->{vp} = new CFPlus::UI::ViewPort
1085 col => 0, 1065 c_col => 0,
1086 row => 0, 1066 c_row => 0,
1087 expand => 1, 1067 expand => 1,
1088 scroll_x => $self->{scroll_x}, 1068 scroll_x => $self->{scroll_x},
1089 scroll_y => $self->{scroll_y}, 1069 scroll_y => $self->{scroll_y},
1090 on_changed => sub { 1070 on_changed => sub {
1091 my ($vp, $x, $y) = @_; 1071 my ($vp, $x, $y) = @_;
… …
1093 $vp->{parent}{hslider}->set_value ($x); 1073 $vp->{parent}{hslider}->set_value ($x);
1094 $vp->{parent}{vslider}->set_value ($y); 1074 $vp->{parent}{vslider}->set_value ($y);
1095 1075
1096 0 1076 0
1097 }, 1077 },
1078 on_size_allocate => sub {
1079 my ($vp, $w, $h) = @_;
1080 $vp->{parent}->update_slider;
1081 0
1082 },
1098 ; 1083 ;
1099 1084
1100 $self->SUPER::add ($self->{vp}); 1085 $self->SUPER::add ($self->{vp});
1101 1086
1102 $self->add ($child) if $child; 1087 $self->add ($child) if $child;
1103 1088
1104 $self 1089 $self
1105} 1090}
1106
1107#TODO# update range on size_allocate depending on child?
1108 1091
1109sub add { 1092sub add {
1110 my ($self, $widget) = @_; 1093 my ($self, $widget) = @_;
1111 1094
1112 $self->{vp}->add ($self->{child} = $widget); 1095 $self->{vp}->add ($self->{child} = $widget);
1113} 1096}
1114 1097
1098sub set_offset { shift->{vp}->set_offset (@_) }
1099sub set_center { shift->{vp}->set_center (@_) }
1100sub make_visible { shift->{vp}->make_visible (@_) }
1101
1115sub update_slider { 1102sub update_slider {
1116 my ($self) = @_; 1103 my ($self) = @_;
1117 1104
1118 my $child = ($self->{vp} or return)->child; 1105 my $child = ($self->{vp} or return)->child;
1119 1106
1107 if ($self->{scroll_x}) {
1120 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1108 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1121 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1109 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1122 1110
1123 my $visible = $w1 > $w2; 1111 my $visible = $w1 > $w2;
1124 if ($visible != $self->{hslider}{visible}) { 1112 if ($visible != $self->{hslider_visible}) {
1113 $self->{hslider_visible} = $visible;
1125 $visible ? $self->SUPER::add ($self->{hslider}) 1114 $visible ? $self->SUPER::add ($self->{hslider})
1126 : $self->SUPER::remove ($self->{hslider}); 1115 : $self->SUPER::remove ($self->{hslider});
1116 }
1127 } 1117 }
1128 1118
1119 if ($self->{scroll_y}) {
1129 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1120 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1130 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1121 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1131 1122
1132 my $visible = $h1 > $h2; 1123 my $visible = $h1 > $h2;
1133 if ($visible != $self->{vslider}{visible}) { 1124 if ($visible != $self->{vslider_visible}) {
1125 $self->{vslider_visible} = $visible;
1134 $visible ? $self->SUPER::add ($self->{vslider}) 1126 $visible ? $self->SUPER::add ($self->{vslider})
1135 : $self->SUPER::remove ($self->{vslider}); 1127 : $self->SUPER::remove ($self->{vslider});
1128 }
1129 }
1130}
1131
1132sub start_dragging {
1133 my ($self, $ev) = @_;
1134
1135 $self->grab_focus;
1136
1137 my $ox = $self->{vp}{view_x};
1138 my $oy = $self->{vp}{view_y};
1139
1140 $self->{motion} = sub {
1141 my ($ev, $x, $y) = @_;
1142
1143 $ox -= $ev->{xrel};
1144 $oy -= $ev->{yrel};
1145
1146 $self->{vp}->set_offset ($ox, $oy);
1136 } 1147 };
1137}
1138
1139sub update {
1140 my ($self) = @_;
1141
1142 $self->update_slider;
1143 $self->SUPER::update;
1144} 1148}
1145 1149
1146sub invoke_mouse_wheel { 1150sub invoke_mouse_wheel {
1147 my ($self, $ev) = @_; 1151 my ($self, $ev) = @_;
1148 1152
1149 $self->{vslider}->emit (mouse_wheel => $ev) 1153 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1150 if $ev->{dy};
1151
1152 $self->{hslider}->emit (mouse_wheel => $ev) 1154 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1153 if $ev->{dx};
1154 1155
1155 1 1156 1
1156} 1157}
1157 1158
1158sub invoke_button_down { 1159sub invoke_button_down {
1159 my ($self, $ev, $x, $y) = @_; 1160 my ($self, $ev, $x, $y) = @_;
1160 1161
1161 if ($ev->{button} == 2) { 1162 if ($ev->{button} == 2) {
1162 $self->grab_focus; 1163 $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; 1164 return 1;
1175 } 1165 }
1176 1166
1177 0 1167 0
1178} 1168}
… …
1608 1598
1609sub add { 1599sub add {
1610 my ($self, @widgets) = @_; 1600 my ($self, @widgets) = @_;
1611 1601
1612 for my $child (@widgets) { 1602 for my $child (@widgets) {
1613 $child->{rowspan} ||= 1; 1603 $child->{c_rowspan} ||= 1;
1614 $child->{colspan} ||= 1; 1604 $child->{c_colspan} ||= 1;
1615 } 1605 }
1616 1606
1617 $self->SUPER::add (@widgets); 1607 $self->SUPER::add (@widgets);
1618} 1608}
1619 1609
… …
1623 my @widgets; 1613 my @widgets;
1624 1614
1625 while (@_) { 1615 while (@_) {
1626 my ($col, $row, $child) = splice @_, 0, 3, (); 1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1627 1617
1628 $child->{row} = $row; 1618 $child->{c_row} = $row;
1629 $child->{col} = $col; 1619 $child->{c_col} = $col;
1630 1620
1631 push @widgets, $child; 1621 push @widgets, $child;
1632 } 1622 }
1633 1623
1634 $self->add (@widgets); 1624 $self->add (@widgets);
… …
1640 my (@w, @h); 1630 my (@w, @h);
1641 1631
1642 my @children = $self->children; 1632 my @children = $self->children;
1643 1633
1644 # first pass, columns 1634 # first pass, columns
1645 for my $widget (sort { $b->{colspan} <=> $a->{colspan} } @children) { 1635 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1646 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1636 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1647 1637
1648 my $sw = sum @w[$c .. $c + $cs - 1]; 1638 my $sw = sum @w[$c .. $c + $cs - 1];
1649 1639
1650 if ($w > $sw) { 1640 if ($w > $sw) {
1651 $_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1]; 1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1652 } 1642 }
1653 } 1643 }
1654 1644
1655 # second pass, rows 1645 # second pass, rows
1656 for my $widget (sort { $b->{rowspan} <=> $a->{rowspan} } @children) { 1646 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1657 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1647 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1658 1648
1659 my $sh = sum @h[$r .. $r + $rs - 1]; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1660 1650
1661 if ($h > $sh) { 1651 if ($h > $sh) {
1662 $_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1]; 1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1663 } 1653 }
1664 } 1654 }
1665 1655
1666 (\@w, \@h) 1656 (\@w, \@h)
1667} 1657}
… …
1704 1694
1705 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1706 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1707 1697
1708 for my $widget ($self->children) { 1698 for my $widget ($self->children) {
1709 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1710 1700
1711 $widget->configure ( 1701 $widget->configure (
1712 $x[$c], $y[$r], 1702 $x[$c], $y[$r],
1713 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1714 ); 1704 );
… …
1723 1713
1724use List::Util qw(min max); 1714use List::Util qw(min max);
1725 1715
1726our @ISA = CFPlus::UI::Container::; 1716our @ISA = CFPlus::UI::Container::;
1727 1717
1728sub add {
1729 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1730
1731 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1732 $self->SUPER::add ($child);
1733}
1734
1735sub _scale($$$) { 1718sub _scale($$$) {
1736 my ($mode, $val, $max) = @_; 1719 my ($rel, $val, $max) = @_;
1737 1720
1738 $mode eq "abs" ? $val 1721 $rel ? $val * $max : $val
1739 : $mode eq "rel" ? $val * $max
1740 : 0
1741} 1722}
1742 1723
1743sub size_request { 1724sub size_request {
1744 my ($self) = @_; 1725 my ($self) = @_;
1745 1726
1746 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1727 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1747 1728
1748 # determine overall size by querying abs widgets 1729 # determine overall size by querying abs widgets
1749 for my $child ($self->visible_children) { 1730 for my $child ($self->visible_children) {
1750 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1731 unless ($child->{c_rel}) {
1732 my $x = $child->{c_x};
1733 my $y = $child->{c_y};
1751 1734
1752 if ($pos eq "abs") {
1753 $w = _scale $size, $w, $child->{req_w};
1754 $h = _scale $size, $h, $child->{req_h};
1755
1756 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1735 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1757 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1736 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1758 } 1737 }
1759 } 1738 }
1760 1739
1761 my $W = $x2 - $x1; 1740 my $W = $x2 - $x1;
1762 my $H = $y2 - $y1; 1741 my $H = $y2 - $y1;
1763 1742
1764 # now layout remaining widgets 1743 # now layout remaining widgets
1765 for my $child ($self->visible_children) { 1744 for my $child ($self->visible_children) {
1766 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1745 if ($child->{c_rel}) {
1746 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1747 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1767 1748
1768 if ($pos ne "abs") {
1769 $x = _scale $pos, $x, $W;
1770 $y = _scale $pos, $x, $H;
1771 $w = _scale $size, $w, $child->{req_w};
1772 $h = _scale $size, $h, $child->{req_h};
1773
1774 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1775 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1776 } 1751 }
1777 } 1752 }
1778 1753
1779 my $W = $x2 - $x1; 1754 my $W = $x2 - $x1;
1780 my $H = $y2 - $y1; 1755 my $H = $y2 - $y1;
… …
1784 1759
1785sub invoke_size_allocate { 1760sub invoke_size_allocate {
1786 my ($self, $W, $H) = @_; 1761 my ($self, $W, $H) = @_;
1787 1762
1788 for my $child ($self->visible_children) { 1763 for my $child ($self->visible_children) {
1789 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1764 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1765 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1790 1766
1791 $x = _scale $pos, $x, $W; 1767 $x += $child->{c_halign} * $child->{req_w};
1792 $y = _scale $pos, $x, $H; 1768 $y += $child->{c_valign} * $child->{req_h};
1793 $w = _scale $size, $w, $child->{req_w};
1794 $h = _scale $size, $h, $child->{req_h};
1795 1769
1796 $child->configure ($x, $y, $w, $h); 1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1797 } 1771 }
1798 1772
1799 1 1773 1
1800} 1774}
1801 1775
… …
1805 1779
1806our @ISA = CFPlus::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1807 1781
1808sub size_request { 1782sub size_request {
1809 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1810 1786
1811 $self->{vertical} 1787 $self->{vertical}
1812 ? ( 1788 ? (
1813 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1814 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1815 ) 1791 )
1816 : ( 1792 : (
1817 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1818 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1819 ) 1795 )
1820} 1796}
1821 1797
1822sub invoke_size_allocate { 1798sub invoke_size_allocate {
1823 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
… …
1947 1923
1948 delete $self->{ox}; 1924 delete $self->{ox};
1949 $self->SUPER::realloc; 1925 $self->SUPER::realloc;
1950} 1926}
1951 1927
1928sub clear {
1929 my ($self) = @_;
1930
1931 $self->set_text ("");
1932}
1933
1952sub set_text { 1934sub set_text {
1953 my ($self, $text) = @_; 1935 my ($self, $text) = @_;
1954 1936
1955 return if $self->{text} eq "T$text"; 1937 return if $self->{text} eq "T$text";
1956 $self->{text} = "T$text"; 1938 $self->{text} = "T$text";
… …
2062 : ($self->{w} - $size->[0]) * 0.5); 2044 : ($self->{w} - $size->[0]) * 0.5);
2063 2045
2064 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2046 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2065 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2047 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2066 : ($self->{h} - $size->[1]) * 0.5); 2048 : ($self->{h} - $size->[1]) * 0.5);
2049
2050 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2067 }; 2051 };
2068 2052
2069 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2053# unless ($self->{list}) {
2070 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2054# $self->{list} = CFPlus::OpenGL::glGenList;
2071 2055# CFPlus::OpenGL::glNewList $self->{list};
2072 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2056# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2057# CFPlus::OpenGL::glEndList;
2058# }
2059#
2060# CFPlus::OpenGL::glCallList $self->{list};
2061
2062 $self->{layout}->draw;
2073} 2063}
2064
2065#sub destroy {
2066# my ($self) = @_;
2067#
2068# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2069#
2070# $self->SUPER::destroy;
2071#}
2074 2072
2075############################################################################# 2073#############################################################################
2076 2074
2077package CFPlus::UI::EntryBase; 2075package CFPlus::UI::EntryBase;
2078 2076
… …
2084 my $class = shift; 2082 my $class = shift;
2085 2083
2086 $class->SUPER::new ( 2084 $class->SUPER::new (
2087 fg => [1, 1, 1], 2085 fg => [1, 1, 1],
2088 bg => [0, 0, 0, 0.2], 2086 bg => [0, 0, 0, 0.2],
2087 outline => [0.6, 0.3, 0.1],
2089 active_bg => [1, 1, 1, 0.5], 2088 active_bg => [0, 0, 1, .2],
2090 active_fg => [0, 0, 0], 2089 active_fg => [1, 1, 1],
2090 active_outline => [1, 1, 0],
2091 can_hover => 1, 2091 can_hover => 1,
2092 can_focus => 1, 2092 can_focus => 1,
2093 valign => 0, 2093 valign => 0,
2094 can_events => 1, 2094 can_events => 1,
2095 ellipsise => 0, 2095 ellipsise => 0,
… …
2252 2252
2253 unless (exists $self->{cur_h}) { 2253 unless (exists $self->{cur_h}) {
2254 my $text = substr $self->{text}, 0, $self->{cursor}; 2254 my $text = substr $self->{text}, 0, $self->{cursor};
2255 utf8::encode $text; 2255 utf8::encode $text;
2256 2256
2257 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2257 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2258 } 2258 }
2259 2259
2260 glColor_premultiply @{$self->{active_fg}};
2260 glBegin GL_LINES; 2261 glBegin GL_LINES;
2261 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2262 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
2262 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2263 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2264 glEnd;
2265
2266 glLineWidth 3;
2267 glColor @{$self->{active_outline}};
2268 glBegin GL_LINE_LOOP;
2269 glVertex 0, 0;
2270 glVertex $self->{w} - 1, 0;
2271 glVertex $self->{w} - 1, $self->{h} - 1;
2272 glVertex 0, $self->{h} - 1;
2273 glEnd;
2274 glLineWidth 1;
2275
2276 } else {
2277 glColor @{$self->{outline}};
2278 glTranslate .375, .375;
2279 glBegin GL_LINE_STRIP;
2280 glVertex 0, $self->{h} * .5;
2281 glVertex 0, $self->{h} - 3;
2282 glVertex $self->{w} - 1, $self->{h} - 3;
2283 glVertex $self->{w} - 1, $self->{h} * .5;
2263 glEnd; 2284 glEnd;
2264 } 2285 }
2265} 2286}
2266 2287
2267############################################################################# 2288#############################################################################
… …
2354 1 2375 1
2355} 2376}
2356 2377
2357############################################################################# 2378#############################################################################
2358 2379
2380package CFPlus::UI::ButtonBin;
2381
2382our @ISA = CFPlus::UI::Bin::;
2383
2384use CFPlus::OpenGL;
2385
2386my @tex =
2387 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2388 qw(b1_button_inactive.png b1_button_active.png);
2389
2390sub new {
2391 my $class = shift;
2392
2393 $class->SUPER::new (
2394 can_hover => 1,
2395 align => 0,
2396 valign => 0,
2397 can_events => 1,
2398 @_
2399 )
2400}
2401
2402sub invoke_button_up {
2403 my ($self, $ev, $x, $y) = @_;
2404
2405 $self->emit ("activate")
2406 if $x >= 0 && $x < $self->{w}
2407 && $y >= 0 && $y < $self->{h};
2408
2409 1
2410}
2411
2412sub _draw {
2413 my ($self) = @_;
2414
2415 glEnable GL_TEXTURE_2D;
2416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2417 glColor 0, 0, 0, 1;
2418
2419 my $tex = $tex[$GRAB == $self];
2420 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2421
2422 glDisable GL_TEXTURE_2D;
2423
2424 $self->SUPER::_draw;
2425}
2426
2427#############################################################################
2428
2359package CFPlus::UI::Button; 2429package CFPlus::UI::Button;
2360 2430
2361our @ISA = CFPlus::UI::Label::; 2431our @ISA = CFPlus::UI::Label::;
2362 2432
2363use CFPlus::OpenGL; 2433use CFPlus::OpenGL;
… …
2497sub new { 2567sub new {
2498 my $class = shift; 2568 my $class = shift;
2499 2569
2500 my $self = $class->SUPER::new ( 2570 my $self = $class->SUPER::new (
2501 can_events => 0, 2571 can_events => 0,
2572 scale => 1,
2502 @_, 2573 @_,
2503 ); 2574 );
2504 2575
2505 $self->{path} || $self->{tex} 2576 $self->{path} || $self->{tex}
2506 or Carp::croak "'path' or 'tex' attributes required"; 2577 or Carp::croak "'path' or 'tex' attributes required";
… …
2531} 2602}
2532 2603
2533sub size_request { 2604sub size_request {
2534 my ($self) = @_; 2605 my ($self) = @_;
2535 2606
2536 ($self->{tex}{w}, $self->{tex}{h}) 2607 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2537} 2608}
2538 2609
2539sub _draw { 2610sub _draw {
2540 my ($self) = @_; 2611 my ($self) = @_;
2541 2612
… …
2551 } 2622 }
2552 2623
2553 glEnable GL_TEXTURE_2D; 2624 glEnable GL_TEXTURE_2D;
2554 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2625 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2555 2626
2556 $tex->draw_quad (0, 0, $w, $h); 2627 $tex->draw_quad_alpha (0, 0, $w, $h);
2557 2628
2558 glDisable GL_TEXTURE_2D; 2629 glDisable GL_TEXTURE_2D;
2559} 2630}
2560 2631
2561############################################################################# 2632#############################################################################
… …
2580 align => 0, 2651 align => 0,
2581 valign => 0, 2652 valign => 0,
2582 can_events => 1, 2653 can_events => 1,
2583 @_ 2654 @_
2584 ); 2655 );
2656}
2657
2658sub invoke_button_down {
2659 my ($self, $ev, $x, $y) = @_;
2660
2661 1
2585} 2662}
2586 2663
2587sub invoke_button_up { 2664sub invoke_button_up {
2588 my ($self, $ev, $x, $y) = @_; 2665 my ($self, $ev, $x, $y) = @_;
2589 2666
… …
2863 2940
2864 $self->SUPER::invoke_button_down ($ev, $x, $y); 2941 $self->SUPER::invoke_button_down ($ev, $x, $y);
2865 2942
2866 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2943 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2867 2944
2868 $self->invoke_mouse_motion ($ev, $x, $y) 2945 $self->invoke_mouse_motion ($ev, $x, $y);
2946
2947 1
2869} 2948}
2870 2949
2871sub invoke_mouse_motion { 2950sub invoke_mouse_motion {
2872 my ($self, $ev, $x, $y) = @_; 2951 my ($self, $ev, $x, $y) = @_;
2873 2952
… …
2893 2972
2894 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 2973 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2895 2974
2896 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 2975 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2897 2976
2898 ! ! $delta 2977 1
2899} 2978}
2900 2979
2901sub update { 2980sub update {
2902 my ($self) = @_; 2981 my ($self) = @_;
2903 2982
… …
3034} 3113}
3035 3114
3036sub size_request { 3115sub size_request {
3037 my ($self) = @_; 3116 my ($self) = @_;
3038 3117
3039 my ($empty, $slider) = @{ $self->{children} }; 3118 my ($empty, $slider) = $self->visible_children;
3040 3119
3041 local $self->{children} = [$empty, $slider]; 3120 local $self->{children} = [$empty, $slider];
3042 $self->SUPER::size_request 3121 $self->SUPER::size_request
3043} 3122}
3044 3123
… …
3233 3312
3234 if ($y0 < $y + $h && $y < $y1) { 3313 if ($y0 < $y + $h && $y < $y1) {
3235 my $layout = $self->get_layout ($para); 3314 my $layout = $self->get_layout ($para);
3236 3315
3237 $layout->render ($para->{indent}, $y - $y0); 3316 $layout->render ($para->{indent}, $y - $y0);
3317 $layout->draw;
3238 3318
3239 if (my @w = @{ $para->{widget} }) { 3319 if (my @w = @{ $para->{widget} }) {
3240 my @s = $layout->get_shapes; 3320 my @s = $layout->get_shapes;
3241 3321
3242 for (@w) { 3322 for (@w) {
… …
3433 glTranslate 0.375, 0.375; 3513 glTranslate 0.375, 0.375;
3434 3514
3435 my ($w, $h) = @$self{qw(w h)}; 3515 my ($w, $h) = @$self{qw(w h)};
3436 3516
3437 glColor 1, 0.8, 0.4; 3517 glColor 1, 0.8, 0.4;
3438 glBegin GL_QUADS; 3518 glRect 0, 0, $w, $h;
3439 glVertex 0 , 0;
3440 glVertex 0 , $h;
3441 glVertex $w, $h;
3442 glVertex $w, 0;
3443 glEnd;
3444 3519
3445 glColor 0, 0, 0; 3520 glColor 0, 0, 0;
3446 glBegin GL_LINE_LOOP; 3521 glBegin GL_LINE_LOOP;
3447 glVertex 0 , 0; 3522 glVertex 0 , 0;
3448 glVertex 0 , $h; 3523 glVertex 0 , $h;
… …
3476 3551
3477 if ($self->{anim} && $self->{animspeed}) { 3552 if ($self->{anim} && $self->{animspeed}) {
3478 CFPlus::weaken (my $widget = $self); 3553 CFPlus::weaken (my $widget = $self);
3479 3554
3480 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3555 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3481 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3556 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3482 $self->{timer} = Event->timer ( 3557 $self->{timer} = Event->timer (
3483 parked => 1, 3558 parked => 1,
3484 cb => sub { 3559 cb => sub {
3485 return unless $::CONN && $widget; 3560 return unless $::CONN;
3486 3561
3562 my $w = $widget
3563 or return;
3564
3487 ++$widget->{frame}; 3565 ++$w->{frame};
3488 $widget->update_face; 3566 $w->update_face;
3567
3568 # somehow, $widget can go away
3489 $widget->update; 3569 $w->update;
3490
3491 $widget->update_timer; 3570 $w->update_timer;
3492 }, 3571 },
3493 ); 3572 );
3494 3573
3495 $self->update_face; 3574 $self->update_face;
3496 $self->update_timer; 3575 $self->update_timer;
… …
3517} 3596}
3518 3597
3519sub update_face { 3598sub update_face {
3520 my ($self) = @_; 3599 my ($self) = @_;
3521 3600
3522 return unless $::CONN;
3523
3524 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3525 if ($anim && @$anim) {
3526 delete $self->{wait_face};
3527 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3528 }
3529 }
3530}
3531
3532sub size_request {
3533 my ($self) = @_;
3534
3535 if ($::CONN) { 3601 if ($::CONN) {
3536 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3602 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3537 if (my $tex = $::CONN->{texture}[$faceid]) { 3603 if ($anim && @$anim) {
3538 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3604 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3539 } else { 3605 delete $self->{face_change_cb};
3540 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3606
3541 $self->realloc; 3607 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3608 unless ($tex->{name} || $tex->{loading}) {
3609 $tex->upload (sub { $self->reconfigure });
3610 }
3542 }); 3611 }
3543 } 3612 }
3544 } 3613 }
3545 } 3614 }
3615}
3616
3617sub size_request {
3618 my ($self) = @_;
3619
3620 if ($::CONN) {
3621 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3622 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3623 if ($tex->{name}) {
3624 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3625 } elsif (!$tex->{loading}) {
3626 $tex->upload (sub { $self->reconfigure });
3627 }
3628 }
3629
3630 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3631 }
3632 }
3546 3633
3547 ($self->{size_w} || 8, $self->{size_h} || 8) 3634 ($self->{size_w} || 8, $self->{size_h} || 8)
3548} 3635}
3549 3636
3550sub update { 3637sub update {
… …
3564} 3651}
3565 3652
3566sub _draw { 3653sub _draw {
3567 my ($self) = @_; 3654 my ($self) = @_;
3568 3655
3569 return unless $::CONN;
3570
3571 $self->SUPER::_draw; 3656 $self->SUPER::_draw;
3572 3657
3573 my $faceid = $::CONN->{faceid}[$self->{face}] 3658 if (my $tex = $self->{tex}) {
3574 or return;
3575
3576 my $tex = $::CONN->{texture}[$faceid];
3577
3578 if ($tex) {
3579 glEnable GL_TEXTURE_2D; 3659 glEnable GL_TEXTURE_2D;
3580 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3581 glColor 0, 0, 0, 1; 3661 glColor 0, 0, 0, 1;
3582 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3662 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3583 glDisable GL_TEXTURE_2D; 3663 glDisable GL_TEXTURE_2D;
… …
3635 children => [ 3715 children => [
3636 (new CFPlus::UI::Label markup => $left, expand => 1), 3716 (new CFPlus::UI::Label markup => $left, expand => 1),
3637 (new CFPlus::UI::Label markup => $right, align => +1), 3717 (new CFPlus::UI::Label markup => $right, align => +1),
3638 ], 3718 ],
3639 ; 3719 ;
3640 3720
3641 } else { 3721 } else {
3642 $widget = new CFPlus::UI::Label 3722 $widget = new CFPlus::UI::Label
3643 can_hover => 1, 3723 can_hover => 1,
3644 can_events => 1, 3724 can_events => 1,
3645 markup => $widget, 3725 markup => $widget,
… …
3781 buttonbar => (new CFPlus::UI::Buttonbar), 3861 buttonbar => (new CFPlus::UI::Buttonbar),
3782 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3862 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3783 # filter => # will be put between multiplexer and $self 3863 # filter => # will be put between multiplexer and $self
3784 @_, 3864 @_,
3785 ); 3865 );
3786 3866
3787 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3867 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3788 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3868 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3789 3869
3870 {
3871 Scalar::Util::weaken (my $wself = $self);
3872
3873 $self->{multiplexer}->connect (c_add => sub {
3874 my ($mplex, $widgets) = @_;
3875
3876 for my $child (@$widgets) {
3877 Scalar::Util::weaken $child;
3878 $child->{c_tab_} ||= do {
3879 my $tab =
3880 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3881 ? $child->{c_tab}
3882 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3883
3884 $tab->connect (activate => sub {
3885 $wself->set_current_page ($child);
3886 });
3887
3888 $tab
3889 };
3890
3891 $self->{buttonbar}->add ($child->{c_tab_});
3892 }
3893 });
3894
3895 $self->{multiplexer}->connect (c_remove => sub {
3896 my ($mplex, $widgets) = @_;
3897
3898 for my $child (@$widgets) {
3899 $wself->{buttonbar}->remove ($child->{c_tab_});
3900 }
3901 });
3902 }
3903
3790 $self 3904 $self
3791} 3905}
3792 3906
3793sub add { 3907sub add {
3908 my ($self, @widgets) = @_;
3909
3910 $self->{multiplexer}->add (@widgets)
3911}
3912
3913sub remove {
3914 my ($self, @widgets) = @_;
3915
3916 $self->{multiplexer}->remove (@widgets)
3917}
3918
3919sub pages {
3920 my ($self) = @_;
3921 $self->{multiplexer}->children
3922}
3923
3924sub add_tab {
3794 my ($self, $title, $widget, $tooltip) = @_; 3925 my ($self, $title, $widget, $tooltip) = @_;
3795 3926
3796 CFPlus::weaken $self; 3927 $title = [$title, $tooltip] unless ref $title;
3928 $widget->{c_tab} = $title;
3797 3929
3798 $self->{buttonbar}->add (new CFPlus::UI::Button
3799 markup => $title,
3800 tooltip => $tooltip,
3801 on_activate => sub { $self->set_current_page ($widget) },
3802 );
3803
3804 $self->{multiplexer}->add ($widget); 3930 $self->add ($widget);
3805} 3931}
3806 3932
3807sub get_current_page { 3933sub get_current_page {
3808 my ($self) = @_; 3934 my ($self) = @_;
3809 3935
… …
4092} 4218}
4093 4219
4094sub update { 4220sub update {
4095 my ($self) = @_; 4221 my ($self) = @_;
4096 4222
4097 $::WANT_REFRESH++; 4223 $::WANT_REFRESH->start;
4098} 4224}
4099 4225
4100sub add { 4226sub add {
4101 my ($self, @children) = @_; 4227 my ($self, @children) = @_;
4102 4228
… …
4139 while ($self->{refresh_hook}) { 4265 while ($self->{refresh_hook}) {
4140 $_->() 4266 $_->()
4141 for values %{delete $self->{refresh_hook}}; 4267 for values %{delete $self->{refresh_hook}};
4142 } 4268 }
4143 4269
4144 if ($self->{realloc}) { 4270 while ($self->{realloc}) {
4145 my %queue; 4271 my %queue;
4146 my @queue; 4272 my @queue;
4147 my $widget; 4273 my $widget;
4148 4274
4149 outer: 4275 outer:
… …
4196 } 4322 }
4197 } 4323 }
4198 4324
4199 delete $self->{realloc}{$widget+0}; 4325 delete $self->{realloc}{$widget+0};
4200 } 4326 }
4201 }
4202 4327
4203 while (my $size_alloc = delete $self->{size_alloc}) { 4328 while (my $size_alloc = delete $self->{size_alloc}) {
4204 my @queue = sort { $b->{visible} <=> $a->{visible} } 4329 my @queue = sort { $a->{visible} <=> $b->{visible} }
4205 values %$size_alloc; 4330 values %$size_alloc;
4206 4331
4207 while () { 4332 while () {
4208 my $widget = pop @queue || last; 4333 my $widget = pop @queue || last;
4209 4334
4210 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4335 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4211 4336
4212 $w = 0 if $w < 0;
4213 $h = 0 if $h < 0;
4214
4215 $w = max $widget->{min_w}, $w; 4337 $w = max $widget->{min_w}, $w;
4216 $h = max $widget->{min_h}, $h; 4338 $h = max $widget->{min_h}, $h;
4217 4339
4218# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4340# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4219# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4341# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4220 4342
4221 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4343 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4222 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4344 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4223 4345
4224 $w = int $w + 0.5; 4346 $w = int $w + 0.5;
4225 $h = int $h + 0.5; 4347 $h = int $h + 0.5;
4226 4348
4227 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4349 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4228 $widget->{old_w} = $widget->{w}; 4350 $widget->{old_w} = $widget->{w};
4229 $widget->{old_h} = $widget->{h}; 4351 $widget->{old_h} = $widget->{h};
4230 4352
4231 $widget->{w} = $w; 4353 $widget->{w} = $w;
4232 $widget->{h} = $h; 4354 $widget->{h} = $h;
4233 4355
4234 $widget->emit (size_allocate => $w, $h); 4356 $widget->emit (size_allocate => $w, $h);
4357 }
4235 } 4358 }
4236 } 4359 }
4237 } 4360 }
4238 4361
4239 while ($self->{post_alloc_hook}) { 4362 while ($self->{post_alloc_hook}) {

Diff Legend

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