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.394 by root, Sat Jul 21 13:54:03 2007 UTC vs.
Revision 1.398 by root, Sat Jul 21 14:32:10 2007 UTC

1102 $self->add ($child) if $child; 1102 $self->add ($child) if $child;
1103 1103
1104 $self 1104 $self
1105} 1105}
1106 1106
1107#TODO# update range on size_allocate depending on child?
1108
1109sub add { 1107sub add {
1110 my ($self, $widget) = @_; 1108 my ($self, $widget) = @_;
1111 1109
1112 $self->{vp}->add ($self->{child} = $widget); 1110 $self->{vp}->add ($self->{child} = $widget);
1113} 1111}
1136 $visible ? $self->SUPER::add ($self->{vslider}) 1134 $visible ? $self->SUPER::add ($self->{vslider})
1137 : $self->SUPER::remove ($self->{vslider}); 1135 : $self->SUPER::remove ($self->{vslider});
1138 } 1136 }
1139} 1137}
1140 1138
1141sub update { 1139sub start_dragging {
1142 my ($self) = @_; 1140 my ($self, $ev) = @_;
1143 1141
1144 $self->update_slider; 1142 $self->grab_focus;
1145 $self->SUPER::update; 1143
1144 my $ox = $self->{vp}{view_x};
1145 my $oy = $self->{vp}{view_y};
1146
1147 $self->{motion} = sub {
1148 my ($ev, $x, $y) = @_;
1149
1150 $ox -= $ev->{xrel};
1151 $oy -= $ev->{yrel};
1152
1153 $self->{vp}->set_offset ($ox, $oy);
1154 };
1146} 1155}
1147 1156
1148sub invoke_mouse_wheel { 1157sub invoke_mouse_wheel {
1149 my ($self, $ev) = @_; 1158 my ($self, $ev) = @_;
1150 1159
1151 $self->{vslider}->emit (mouse_wheel => $ev) 1160 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1152 if $ev->{dy};
1153
1154 $self->{hslider}->emit (mouse_wheel => $ev) 1161 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1155 if $ev->{dx};
1156 1162
1157 1 1163 1
1158} 1164}
1159 1165
1160sub invoke_button_down { 1166sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1167 my ($self, $ev, $x, $y) = @_;
1162 1168
1163 if ($ev->{button} == 2) { 1169 if ($ev->{button} == 2) {
1164 $self->grab_focus; 1170 $self->start_dragging ($ev);
1165
1166 my $ox = $self->{vp}{view_x} + $ev->{x};
1167 my $oy = $self->{vp}{view_y} + $ev->{y};
1168
1169 $self->{motion} = sub {
1170 my ($ev, $x, $y) = @_;
1171
1172 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1173 $self->update;
1174 };
1175
1176 return 1; 1171 return 1;
1177 } 1172 }
1178 1173
1179 0 1174 0
1180} 1175}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines