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.393 by root, Sat Jul 21 13:41:46 2007 UTC vs.
Revision 1.399 by root, Sat Jul 21 16:07:53 2007 UTC

769 sort { $a->{z} <=> $b->{z} } 769 sort { $a->{z} <=> $b->{z} }
770 @{$self->{children}}, @widgets 770 @{$self->{children}}, @widgets
771 ]; 771 ];
772 772
773 $self->realloc; 773 $self->realloc;
774
775 map $_+0, @widgets
774} 776}
775 777
776sub children { 778sub children {
777 @{ $_[0]{children} } 779 @{ $_[0]{children} }
778} 780}
789} 791}
790 792
791sub clear { 793sub clear {
792 my ($self) = @_; 794 my ($self) = @_;
793 795
794 my $children = delete $self->{children}; 796 my $children = $self->{children};
795 $self->{children} = []; 797 $self->{children} = [];
796 798
797 for (@$children) { 799 for (@$children) {
798 delete $_->{parent}; 800 delete $_->{parent};
799 $_->hide; 801 $_->hide;
1102 $self->add ($child) if $child; 1104 $self->add ($child) if $child;
1103 1105
1104 $self 1106 $self
1105} 1107}
1106 1108
1107#TODO# update range on size_allocate depending on child?
1108
1109sub add { 1109sub add {
1110 my ($self, $widget) = @_; 1110 my ($self, $widget) = @_;
1111 1111
1112 $self->{vp}->add ($self->{child} = $widget); 1112 $self->{vp}->add ($self->{child} = $widget);
1113} 1113}
1119 1119
1120 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1120 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1121 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1121 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1122 1122
1123 my $visible = $w1 > $w2; 1123 my $visible = $w1 > $w2;
1124 if ($visible != $self->{hslider}{visible}) { 1124 if ($visible != $self->{hslider_visible}) {
1125 $self->{hslider_visible} = $visible;
1125 $visible ? $self->SUPER::add ($self->{hslider}) 1126 $visible ? $self->SUPER::add ($self->{hslider})
1126 : $self->SUPER::remove ($self->{hslider}); 1127 : $self->SUPER::remove ($self->{hslider});
1127 } 1128 }
1128 1129
1129 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1130 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1130 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1131 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1131 1132
1132 my $visible = $h1 > $h2; 1133 my $visible = $h1 > $h2;
1133 if ($visible != $self->{vslider}{visible}) { 1134 if ($visible != $self->{vslider_visible}) {
1135 $self->{vslider_visible} = $visible;
1134 $visible ? $self->SUPER::add ($self->{vslider}) 1136 $visible ? $self->SUPER::add ($self->{vslider})
1135 : $self->SUPER::remove ($self->{vslider}); 1137 : $self->SUPER::remove ($self->{vslider});
1136 } 1138 }
1137} 1139}
1138 1140
1139sub update { 1141sub start_dragging {
1140 my ($self) = @_; 1142 my ($self, $ev) = @_;
1141 1143
1142 $self->update_slider; 1144 $self->grab_focus;
1143 $self->SUPER::update; 1145
1146 my $ox = $self->{vp}{view_x};
1147 my $oy = $self->{vp}{view_y};
1148
1149 $self->{motion} = sub {
1150 my ($ev, $x, $y) = @_;
1151
1152 $ox -= $ev->{xrel};
1153 $oy -= $ev->{yrel};
1154
1155 $self->{vp}->set_offset ($ox, $oy);
1156 };
1144} 1157}
1145 1158
1146sub invoke_mouse_wheel { 1159sub invoke_mouse_wheel {
1147 my ($self, $ev) = @_; 1160 my ($self, $ev) = @_;
1148 1161
1149 $self->{vslider}->emit (mouse_wheel => $ev) 1162 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1150 if $ev->{dy};
1151
1152 $self->{hslider}->emit (mouse_wheel => $ev) 1163 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1153 if $ev->{dx};
1154 1164
1155 1 1165 1
1156} 1166}
1157 1167
1158sub invoke_button_down { 1168sub invoke_button_down {
1159 my ($self, $ev, $x, $y) = @_; 1169 my ($self, $ev, $x, $y) = @_;
1160 1170
1161 if ($ev->{button} == 2) { 1171 if ($ev->{button} == 2) {
1162 $self->grab_focus; 1172 $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; 1173 return 1;
1175 } 1174 }
1176 1175
1177 0 1176 0
1178} 1177}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines