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.396 by root, Sat Jul 21 14:00:02 2007 UTC vs.
Revision 1.414 by root, Mon Jul 23 17:54:14 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 $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 {
… …
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 {
… …
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;
… …
1108 my ($self, $widget) = @_; 1093 my ($self, $widget) = @_;
1109 1094
1110 $self->{vp}->add ($self->{child} = $widget); 1095 $self->{vp}->add ($self->{child} = $widget);
1111} 1096}
1112 1097
1098sub set_offset { shift->{vp}->set_offset (@_) }
1099sub set_center { shift->{vp}->set_center (@_) }
1100sub make_visible { shift->{vp}->make_visible (@_) }
1101
1113sub update_slider { 1102sub update_slider {
1114 my ($self) = @_; 1103 my ($self) = @_;
1115 1104
1116 my $child = ($self->{vp} or return)->child; 1105 my $child = ($self->{vp} or return)->child;
1117 1106
1107 if ($self->{scroll_x}) {
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1108 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1119 $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]);
1120 1110
1121 my $visible = $w1 > $w2; 1111 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider_visible}) { 1112 if ($visible != $self->{hslider_visible}) {
1123 $self->{hslider_visible} = $visible; 1113 $self->{hslider_visible} = $visible;
1124 $visible ? $self->SUPER::add ($self->{hslider}) 1114 $visible ? $self->SUPER::add ($self->{hslider})
1125 : $self->SUPER::remove ($self->{hslider}); 1115 : $self->SUPER::remove ($self->{hslider});
1116 }
1126 } 1117 }
1127 1118
1119 if ($self->{scroll_y}) {
1128 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1120 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1129 $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]);
1130 1122
1131 my $visible = $h1 > $h2; 1123 my $visible = $h1 > $h2;
1132 if ($visible != $self->{vslider_visible}) { 1124 if ($visible != $self->{vslider_visible}) {
1133 $self->{vslider_visible} = $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 }
1136 } 1129 }
1137} 1130}
1138
1139 1131
1140sub start_dragging { 1132sub start_dragging {
1141 my ($self, $ev) = @_; 1133 my ($self, $ev) = @_;
1142 1134
1143 $self->grab_focus; 1135 $self->grab_focus;
… …
1156} 1148}
1157 1149
1158sub invoke_mouse_wheel { 1150sub invoke_mouse_wheel {
1159 my ($self, $ev) = @_; 1151 my ($self, $ev) = @_;
1160 1152
1161 $self->{vslider}->emit (mouse_wheel => $ev) 1153 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1162 if $ev->{dy};
1163
1164 $self->{hslider}->emit (mouse_wheel => $ev) 1154 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1165 if $ev->{dx};
1166 1155
1167 1 1156 1
1168} 1157}
1169 1158
1170sub invoke_button_down { 1159sub invoke_button_down {
1171 my ($self, $ev, $x, $y) = @_; 1160 my ($self, $ev, $x, $y) = @_;
1172 1161
1173 if ($ev->{button} == 2) { 1162 if ($ev->{button} == 2) {
1174 $self->start_dragging ($ev); 1163 $self->start_dragging ($ev);
1175
1176 return 1; 1164 return 1;
1177 } 1165 }
1178 1166
1179 0 1167 0
1180} 1168}
… …
1725 1713
1726use List::Util qw(min max); 1714use List::Util qw(min max);
1727 1715
1728our @ISA = CFPlus::UI::Container::; 1716our @ISA = CFPlus::UI::Container::;
1729 1717
1730sub add {
1731 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1732
1733 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1734 $self->SUPER::add ($child);
1735}
1736
1737sub _scale($$$) { 1718sub _scale($$$) {
1738 my ($mode, $val, $max) = @_; 1719 my ($rel, $val, $max) = @_;
1739 1720
1740 $mode eq "abs" ? $val 1721 $rel ? $val * $max : $val
1741 : $mode eq "rel" ? $val * $max
1742 : 0
1743} 1722}
1744 1723
1745sub size_request { 1724sub size_request {
1746 my ($self) = @_; 1725 my ($self) = @_;
1747 1726
1748 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1727 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1749 1728
1750 # determine overall size by querying abs widgets 1729 # determine overall size by querying abs widgets
1751 for my $child ($self->visible_children) { 1730 for my $child ($self->visible_children) {
1752 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};
1753 1734
1754 if ($pos eq "abs") {
1755 $w = _scale $size, $w, $child->{req_w};
1756 $h = _scale $size, $h, $child->{req_h};
1757
1758 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1735 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1759 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1736 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1760 } 1737 }
1761 } 1738 }
1762 1739
1763 my $W = $x2 - $x1; 1740 my $W = $x2 - $x1;
1764 my $H = $y2 - $y1; 1741 my $H = $y2 - $y1;
1765 1742
1766 # now layout remaining widgets 1743 # now layout remaining widgets
1767 for my $child ($self->visible_children) { 1744 for my $child ($self->visible_children) {
1768 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;
1769 1748
1770 if ($pos ne "abs") {
1771 $x = _scale $pos, $x, $W;
1772 $y = _scale $pos, $x, $H;
1773 $w = _scale $size, $w, $child->{req_w};
1774 $h = _scale $size, $h, $child->{req_h};
1775
1776 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1777 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1778 } 1751 }
1779 } 1752 }
1780 1753
1781 my $W = $x2 - $x1; 1754 my $W = $x2 - $x1;
1782 my $H = $y2 - $y1; 1755 my $H = $y2 - $y1;
… …
1786 1759
1787sub invoke_size_allocate { 1760sub invoke_size_allocate {
1788 my ($self, $W, $H) = @_; 1761 my ($self, $W, $H) = @_;
1789 1762
1790 for my $child ($self->visible_children) { 1763 for my $child ($self->visible_children) {
1791 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;
1792 1766
1793 $x = _scale $pos, $x, $W; 1767 $x += $child->{c_halign} * $child->{req_w};
1794 $y = _scale $pos, $x, $H; 1768 $y += $child->{c_valign} * $child->{req_h};
1795 $w = _scale $size, $w, $child->{req_w};
1796 $h = _scale $size, $h, $child->{req_h};
1797 1769
1798 $child->configure ($x, $y, $w, $h); 1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1799 } 1771 }
1800 1772
1801 1 1773 1
1802} 1774}
1803 1775
… …
1807 1779
1808our @ISA = CFPlus::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1809 1781
1810sub size_request { 1782sub size_request {
1811 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1812 1786
1813 $self->{vertical} 1787 $self->{vertical}
1814 ? ( 1788 ? (
1815 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1816 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1817 ) 1791 )
1818 : ( 1792 : (
1819 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1820 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1821 ) 1795 )
1822} 1796}
1823 1797
1824sub invoke_size_allocate { 1798sub invoke_size_allocate {
1825 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
… …
2066 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2040 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2067 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2041 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2068 : ($self->{h} - $size->[1]) * 0.5); 2042 : ($self->{h} - $size->[1]) * 0.5);
2069 }; 2043 };
2070 2044
2071 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2045# unless ($self->{list}) {
2072 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2046# $self->{list} = CFPlus::OpenGL::glGenList;
2047# CFPlus::OpenGL::glNewList $self->{list};
2048# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2049# CFPlus::OpenGL::glEndList;
2050# }
2051#
2052# CFPlus::OpenGL::glCallList $self->{list};
2073 2053
2074 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2054 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2075} 2055}
2056
2057#sub destroy {
2058# my ($self) = @_;
2059#
2060# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2061#
2062# $self->SUPER::destroy;
2063#}
2076 2064
2077############################################################################# 2065#############################################################################
2078 2066
2079package CFPlus::UI::EntryBase; 2067package CFPlus::UI::EntryBase;
2080 2068
… …
2865 2853
2866 $self->SUPER::invoke_button_down ($ev, $x, $y); 2854 $self->SUPER::invoke_button_down ($ev, $x, $y);
2867 2855
2868 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2856 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2869 2857
2870 $self->invoke_mouse_motion ($ev, $x, $y) 2858 $self->invoke_mouse_motion ($ev, $x, $y);
2859
2860 1
2871} 2861}
2872 2862
2873sub invoke_mouse_motion { 2863sub invoke_mouse_motion {
2874 my ($self, $ev, $x, $y) = @_; 2864 my ($self, $ev, $x, $y) = @_;
2875 2865
… …
2895 2885
2896 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 2886 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2897 2887
2898 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 2888 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2899 2889
2900 ! ! $delta 2890 1
2901} 2891}
2902 2892
2903sub update { 2893sub update {
2904 my ($self) = @_; 2894 my ($self) = @_;
2905 2895
… …
3036} 3026}
3037 3027
3038sub size_request { 3028sub size_request {
3039 my ($self) = @_; 3029 my ($self) = @_;
3040 3030
3041 my ($empty, $slider) = @{ $self->{children} }; 3031 my ($empty, $slider) = $self->visible_children;
3042 3032
3043 local $self->{children} = [$empty, $slider]; 3033 local $self->{children} = [$empty, $slider];
3044 $self->SUPER::size_request 3034 $self->SUPER::size_request
3045} 3035}
3046 3036
… …
3478 3468
3479 if ($self->{anim} && $self->{animspeed}) { 3469 if ($self->{anim} && $self->{animspeed}) {
3480 CFPlus::weaken (my $widget = $self); 3470 CFPlus::weaken (my $widget = $self);
3481 3471
3482 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3472 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3483 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3473 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3484 $self->{timer} = Event->timer ( 3474 $self->{timer} = Event->timer (
3485 parked => 1, 3475 parked => 1,
3486 cb => sub { 3476 cb => sub {
3487 return unless $::CONN && $widget; 3477 return unless $::CONN && $widget;
3488 3478
… …
3525 3515
3526 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3516 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3527 if ($anim && @$anim) { 3517 if ($anim && @$anim) {
3528 delete $self->{wait_face}; 3518 delete $self->{wait_face};
3529 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3519 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3520 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3530 } 3521 }
3531 } 3522 }
3532} 3523}
3533 3524
3534sub size_request { 3525sub size_request {
3535 my ($self) = @_; 3526 my ($self) = @_;
3536 3527
3537 if ($::CONN) { 3528 if ($::CONN) {
3538 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3529 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3539 if (my $tex = $::CONN->{texture}[$faceid]) { 3530 if (my $tex = $::CONN->{texture}[$faceid]) {
3531 $self->{tex} = $tex;
3540 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3532 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3541 } else { 3533 } else {
3542 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3534 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3543 $self->realloc; 3535 $self->realloc;
3544 }); 3536 });
… …
3566} 3558}
3567 3559
3568sub _draw { 3560sub _draw {
3569 my ($self) = @_; 3561 my ($self) = @_;
3570 3562
3571 return unless $::CONN;
3572
3573 $self->SUPER::_draw; 3563 $self->SUPER::_draw;
3574 3564
3575 my $faceid = $::CONN->{faceid}[$self->{face}] 3565 if (my $tex = $self->{tex}) {
3576 or return;
3577
3578 my $tex = $::CONN->{texture}[$faceid];
3579
3580 if ($tex) {
3581 glEnable GL_TEXTURE_2D; 3566 glEnable GL_TEXTURE_2D;
3582 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3567 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3583 glColor 0, 0, 0, 1; 3568 glColor 0, 0, 0, 1;
3584 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3569 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3585 glDisable GL_TEXTURE_2D; 3570 glDisable GL_TEXTURE_2D;
… …
3787 ); 3772 );
3788 3773
3789 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3774 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3790 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3775 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3791 3776
3777 {
3778 Scalar::Util::weaken (my $wself = $self);
3779
3780 $self->{multiplexer}->connect (c_add => sub {
3781 my ($mplex, $widgets) = @_;
3782
3783 for my $child (@$widgets) {
3784 Scalar::Util::weaken $child;
3785 $child->{c_tab_} ||= do {
3786 my $tab =
3787 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3788 ? $child->{c_tab}
3789 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3790
3791 $tab->connect (activate => sub {
3792 $wself->set_current_page ($child);
3793 });
3794
3795 $tab
3796 };
3797
3798 $self->{buttonbar}->add ($child->{c_tab_});
3799 }
3800 });
3801
3802 $self->{multiplexer}->connect (c_remove => sub {
3803 my ($mplex, $widgets) = @_;
3804
3805 for my $child (@$widgets) {
3806 $wself->{buttonbar}->remove ($child->{c_tab_});
3807 }
3808 });
3809 }
3810
3792 $self 3811 $self
3793} 3812}
3794 3813
3795sub add { 3814sub add {
3815 my ($self, @widgets) = @_;
3816
3817 $self->{multiplexer}->add (@widgets)
3818}
3819
3820sub remove {
3821 my ($self, @widgets) = @_;
3822
3823 $self->{multiplexer}->remove (@widgets)
3824}
3825
3826sub add_tab {
3796 my ($self, $title, $widget, $tooltip) = @_; 3827 my ($self, $title, $widget, $tooltip) = @_;
3797 3828
3798 CFPlus::weaken $self; 3829 $title = [$title, $tooltip] unless ref $title;
3830 $widget->{c_tab} = $title;
3799 3831
3800 $self->{buttonbar}->add (new CFPlus::UI::Button
3801 markup => $title,
3802 tooltip => $tooltip,
3803 on_activate => sub { $self->set_current_page ($widget) },
3804 );
3805
3806 $self->{multiplexer}->add ($widget); 3832 $self->add ($widget);
3807} 3833}
3808 3834
3809sub get_current_page { 3835sub get_current_page {
3810 my ($self) = @_; 3836 my ($self) = @_;
3811 3837
… …
4141 while ($self->{refresh_hook}) { 4167 while ($self->{refresh_hook}) {
4142 $_->() 4168 $_->()
4143 for values %{delete $self->{refresh_hook}}; 4169 for values %{delete $self->{refresh_hook}};
4144 } 4170 }
4145 4171
4146 if ($self->{realloc}) { 4172 while ($self->{realloc}) {
4147 my %queue; 4173 my %queue;
4148 my @queue; 4174 my @queue;
4149 my $widget; 4175 my $widget;
4150 4176
4151 outer: 4177 outer:
… …
4198 } 4224 }
4199 } 4225 }
4200 4226
4201 delete $self->{realloc}{$widget+0}; 4227 delete $self->{realloc}{$widget+0};
4202 } 4228 }
4203 }
4204 4229
4205 while (my $size_alloc = delete $self->{size_alloc}) { 4230 while (my $size_alloc = delete $self->{size_alloc}) {
4206 my @queue = sort { $b->{visible} <=> $a->{visible} } 4231 my @queue = sort { $a->{visible} <=> $b->{visible} }
4207 values %$size_alloc; 4232 values %$size_alloc;
4208 4233
4209 while () { 4234 while () {
4210 my $widget = pop @queue || last; 4235 my $widget = pop @queue || last;
4211 4236
4212 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4237 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4213 4238
4214 $w = 0 if $w < 0;
4215 $h = 0 if $h < 0;
4216
4217 $w = max $widget->{min_w}, $w; 4239 $w = max $widget->{min_w}, $w;
4218 $h = max $widget->{min_h}, $h; 4240 $h = max $widget->{min_h}, $h;
4219 4241
4220# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4242# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4221# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4243# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4222 4244
4223 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4245 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4224 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4246 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4225 4247
4226 $w = int $w + 0.5; 4248 $w = int $w + 0.5;
4227 $h = int $h + 0.5; 4249 $h = int $h + 0.5;
4228 4250
4229 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4251 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4230 $widget->{old_w} = $widget->{w}; 4252 $widget->{old_w} = $widget->{w};
4231 $widget->{old_h} = $widget->{h}; 4253 $widget->{old_h} = $widget->{h};
4232 4254
4233 $widget->{w} = $w; 4255 $widget->{w} = $w;
4234 $widget->{h} = $h; 4256 $widget->{h} = $h;
4235 4257
4236 $widget->emit (size_allocate => $w, $h); 4258 $widget->emit (size_allocate => $w, $h);
4259 }
4237 } 4260 }
4238 } 4261 }
4239 } 4262 }
4240 4263
4241 while ($self->{post_alloc_hook}) { 4264 while ($self->{post_alloc_hook}) {

Diff Legend

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