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.406 by root, Sat Jul 21 23:17:35 2007 UTC vs.
Revision 1.414 by root, Mon Jul 23 17:54:14 2007 UTC

… …
725 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
726 ]; 726 ];
727 727
728 $self->realloc; 728 $self->realloc;
729 729
730 $self->emit (c_add => \@widgets);
731
730 map $_+0, @widgets 732 map $_+0, @widgets
731} 733}
732 734
733sub children { 735sub children {
734 @{ $_[0]{children} } 736 @{ $_[0]{children} }
735} 737}
736 738
737sub remove { 739sub remove {
738 my ($self, $child) = @_; 740 my ($self, @widgets) = @_;
739 741
742 $self->emit (c_remove => \@widgets);
743
744 for my $child (@widgets) {
740 delete $child->{parent}; 745 delete $child->{parent};
741 $child->hide; 746 $child->hide;
742
743 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 747 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
748 }
744 749
745 $self->realloc; 750 $self->realloc;
746} 751}
747 752
748sub clear { 753sub clear {
… …
776} 781}
777 782
778sub _draw { 783sub _draw {
779 my ($self) = @_; 784 my ($self) = @_;
780 785
781 $_->draw for @{$self->{children}}; 786 $_->draw for $self->visible_children;
782} 787}
783 788
784############################################################################# 789#############################################################################
785 790
786package CFPlus::UI::Bin; 791package CFPlus::UI::Bin;
… …
796} 801}
797 802
798sub add { 803sub add {
799 my ($self, $child) = @_; 804 my ($self, $child) = @_;
800 805
801 $self->SUPER::remove ($_) for @{ $self->{children} }; 806 $self->clear;
802 $self->SUPER::add ($child); 807 $self->SUPER::add ($child);
803} 808}
804 809
805sub remove { 810sub remove {
806 my ($self, $widget) = @_; 811 my ($self, $widget) = @_;
… …
948 $self->{view_x} = $x; 953 $self->{view_x} = $x;
949 $self->{view_y} = $y; 954 $self->{view_y} = $y;
950 955
951 $self->emit (changed => $x, $y); 956 $self->emit (changed => $x, $y);
952 $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);
953 } 976 }
954} 977}
955 978
956# 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
957sub coord2local { 980sub coord2local {
… …
1070 my ($self, $widget) = @_; 1093 my ($self, $widget) = @_;
1071 1094
1072 $self->{vp}->add ($self->{child} = $widget); 1095 $self->{vp}->add ($self->{child} = $widget);
1073} 1096}
1074 1097
1098sub set_offset { shift->{vp}->set_offset (@_) }
1099sub set_center { shift->{vp}->set_center (@_) }
1100sub make_visible { shift->{vp}->make_visible (@_) }
1101
1075sub update_slider { 1102sub update_slider {
1076 my ($self) = @_; 1103 my ($self) = @_;
1077 1104
1078 my $child = ($self->{vp} or return)->child; 1105 my $child = ($self->{vp} or return)->child;
1079 1106
… …
1686 1713
1687use List::Util qw(min max); 1714use List::Util qw(min max);
1688 1715
1689our @ISA = CFPlus::UI::Container::; 1716our @ISA = CFPlus::UI::Container::;
1690 1717
1691sub add_fixed {
1692 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1693
1694 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1695 $self->SUPER::add ($child);
1696}
1697
1698sub _scale($$$) { 1718sub _scale($$$) {
1699 my ($mode, $val, $max) = @_; 1719 my ($rel, $val, $max) = @_;
1700 1720
1701 $mode eq "abs" ? $val 1721 $rel ? $val * $max : $val
1702 : $mode eq "rel" ? $val * $max
1703 : 0
1704} 1722}
1705 1723
1706sub size_request { 1724sub size_request {
1707 my ($self) = @_; 1725 my ($self) = @_;
1708 1726
1709 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1727 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1710 1728
1711 # determine overall size by querying abs widgets 1729 # determine overall size by querying abs widgets
1712 for my $child ($self->visible_children) { 1730 for my $child ($self->visible_children) {
1713 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};
1714 1734
1715 if ($pos eq "abs") {
1716 $w = _scale $size, $w, $child->{req_w};
1717 $h = _scale $size, $h, $child->{req_h};
1718
1719 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1735 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1720 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1736 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1721 } 1737 }
1722 } 1738 }
1723 1739
1724 my $W = $x2 - $x1; 1740 my $W = $x2 - $x1;
1725 my $H = $y2 - $y1; 1741 my $H = $y2 - $y1;
1726 1742
1727 # now layout remaining widgets 1743 # now layout remaining widgets
1728 for my $child ($self->visible_children) { 1744 for my $child ($self->visible_children) {
1729 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;
1730 1748
1731 if ($pos ne "abs") {
1732 $x = _scale $pos, $x, $W;
1733 $y = _scale $pos, $x, $H;
1734 $w = _scale $size, $w, $child->{req_w};
1735 $h = _scale $size, $h, $child->{req_h};
1736
1737 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1738 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1739 } 1751 }
1740 } 1752 }
1741 1753
1742 my $W = $x2 - $x1; 1754 my $W = $x2 - $x1;
1743 my $H = $y2 - $y1; 1755 my $H = $y2 - $y1;
… …
1747 1759
1748sub invoke_size_allocate { 1760sub invoke_size_allocate {
1749 my ($self, $W, $H) = @_; 1761 my ($self, $W, $H) = @_;
1750 1762
1751 for my $child ($self->visible_children) { 1763 for my $child ($self->visible_children) {
1752 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;
1753 1766
1754 $x = _scale $pos, $x, $W; 1767 $x += $child->{c_halign} * $child->{req_w};
1755 $y = _scale $pos, $x, $H; 1768 $y += $child->{c_valign} * $child->{req_h};
1756 $w = _scale $size, $w, $W;
1757 $h = _scale $size, $h, $H;
1758 1769
1759 $child->configure ($x, $y, $w, $h); 1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1760 } 1771 }
1761 1772
1762 1 1773 1
1763} 1774}
1764 1775
… …
1768 1779
1769our @ISA = CFPlus::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1770 1781
1771sub size_request { 1782sub size_request {
1772 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1773 1786
1774 $self->{vertical} 1787 $self->{vertical}
1775 ? ( 1788 ? (
1776 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1777 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1778 ) 1791 )
1779 : ( 1792 : (
1780 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1781 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1782 ) 1795 )
1783} 1796}
1784 1797
1785sub invoke_size_allocate { 1798sub invoke_size_allocate {
1786 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
… …
2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2040 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2041 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2029 : ($self->{h} - $size->[1]) * 0.5); 2042 : ($self->{h} - $size->[1]) * 0.5);
2030 }; 2043 };
2031 2044
2045# unless ($self->{list}) {
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};
2053
2032 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2054 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2033} 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#}
2034 2064
2035############################################################################# 2065#############################################################################
2036 2066
2037package CFPlus::UI::EntryBase; 2067package CFPlus::UI::EntryBase;
2038 2068
… …
2823 2853
2824 $self->SUPER::invoke_button_down ($ev, $x, $y); 2854 $self->SUPER::invoke_button_down ($ev, $x, $y);
2825 2855
2826 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2856 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2827 2857
2828 $self->invoke_mouse_motion ($ev, $x, $y) 2858 $self->invoke_mouse_motion ($ev, $x, $y);
2859
2860 1
2829} 2861}
2830 2862
2831sub invoke_mouse_motion { 2863sub invoke_mouse_motion {
2832 my ($self, $ev, $x, $y) = @_; 2864 my ($self, $ev, $x, $y) = @_;
2833 2865
… …
2853 2885
2854 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 2886 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2855 2887
2856 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 2888 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2857 2889
2858 ! ! $delta 2890 1
2859} 2891}
2860 2892
2861sub update { 2893sub update {
2862 my ($self) = @_; 2894 my ($self) = @_;
2863 2895
… …
2994} 3026}
2995 3027
2996sub size_request { 3028sub size_request {
2997 my ($self) = @_; 3029 my ($self) = @_;
2998 3030
2999 my ($empty, $slider) = @{ $self->{children} }; 3031 my ($empty, $slider) = $self->visible_children;
3000 3032
3001 local $self->{children} = [$empty, $slider]; 3033 local $self->{children} = [$empty, $slider];
3002 $self->SUPER::size_request 3034 $self->SUPER::size_request
3003} 3035}
3004 3036
… …
3740 ); 3772 );
3741 3773
3742 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3774 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3743 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3775 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3744 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
3745 $self 3811 $self
3746} 3812}
3747 3813
3748sub 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 {
3749 my ($self, $title, $widget, $tooltip) = @_; 3827 my ($self, $title, $widget, $tooltip) = @_;
3750 3828
3751 CFPlus::weaken $self; 3829 $title = [$title, $tooltip] unless ref $title;
3830 $widget->{c_tab} = $title;
3752 3831
3753 $self->{buttonbar}->add (new CFPlus::UI::Button
3754 markup => $title,
3755 tooltip => $tooltip,
3756 on_activate => sub { $self->set_current_page ($widget) },
3757 );
3758
3759 $self->{multiplexer}->add ($widget); 3832 $self->add ($widget);
3760} 3833}
3761 3834
3762sub get_current_page { 3835sub get_current_page {
3763 my ($self) = @_; 3836 my ($self) = @_;
3764 3837

Diff Legend

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