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.405 by root, Sat Jul 21 23:07:57 2007 UTC vs.
Revision 1.410 by root, Sun Jul 22 16:37:19 2007 UTC

… …
2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2029 : ($self->{h} - $size->[1]) * 0.5); 2029 : ($self->{h} - $size->[1]) * 0.5);
2030 }; 2030 };
2031 2031
2032 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2032# unless ($self->{list}) {
2033 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2033# $self->{list} = CFPlus::OpenGL::glGenList;
2034# CFPlus::OpenGL::glNewList $self->{list};
2035# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2036# CFPlus::OpenGL::glEndList;
2037# }
2038#
2039# CFPlus::OpenGL::glCallList $self->{list};
2034 2040
2035 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2041 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2036} 2042}
2043
2044#sub destroy {
2045# my ($self) = @_;
2046#
2047# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2048#
2049# $self->SUPER::destroy;
2050#}
2037 2051
2038############################################################################# 2052#############################################################################
2039 2053
2040package CFPlus::UI::EntryBase; 2054package CFPlus::UI::EntryBase;
2041 2055
… …
2826 2840
2827 $self->SUPER::invoke_button_down ($ev, $x, $y); 2841 $self->SUPER::invoke_button_down ($ev, $x, $y);
2828 2842
2829 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2843 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2830 2844
2831 $self->invoke_mouse_motion ($ev, $x, $y) 2845 $self->invoke_mouse_motion ($ev, $x, $y);
2846
2847 1
2832} 2848}
2833 2849
2834sub invoke_mouse_motion { 2850sub invoke_mouse_motion {
2835 my ($self, $ev, $x, $y) = @_; 2851 my ($self, $ev, $x, $y) = @_;
2836 2852
… …
2856 2872
2857 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 2873 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2858 2874
2859 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 2875 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2860 2876
2861 ! ! $delta 2877 1
2862} 2878}
2863 2879
2864sub update { 2880sub update {
2865 my ($self) = @_; 2881 my ($self) = @_;
2866 2882
… …
3751sub add { 3767sub add {
3752 my ($self, $title, $widget, $tooltip) = @_; 3768 my ($self, $title, $widget, $tooltip) = @_;
3753 3769
3754 CFPlus::weaken $self; 3770 CFPlus::weaken $self;
3755 3771
3756 $self->{buttonbar}->add (new CFPlus::UI::Button 3772 unless (ref $title) {
3773 $title = new CFPlus::UI::Button
3757 markup => $title, 3774 markup => $title,
3758 tooltip => $tooltip, 3775 tooltip => $tooltip,
3776 ;
3777 }
3778
3759 on_activate => sub { $self->set_current_page ($widget) }, 3779 $title->connect (activate => sub { $self->set_current_page ($widget) });
3760 ); 3780 $self->{buttonbar}->add ($title);
3761 3781
3762 $self->{multiplexer}->add ($widget); 3782 $self->{multiplexer}->add ($widget);
3763} 3783}
3764 3784
3765sub get_current_page { 3785sub get_current_page {

Diff Legend

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