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.395 by root, Sat Jul 21 13:56:00 2007 UTC vs.
Revision 1.400 by root, Sat Jul 21 16:15:03 2007 UTC

646 my ($self) = @_; 646 my ($self) = @_;
647 647
648 warn "no draw defined for $self\n"; 648 warn "no draw defined for $self\n";
649} 649}
650 650
651my $cntx;#d#
652sub DESTROY { 651sub DESTROY {
653 my ($self) = @_; 652 my ($self) = @_;
654 653
655 return if CFPlus::in_destruct; 654 return if CFPlus::in_destruct;
656 655
769 sort { $a->{z} <=> $b->{z} } 768 sort { $a->{z} <=> $b->{z} }
770 @{$self->{children}}, @widgets 769 @{$self->{children}}, @widgets
771 ]; 770 ];
772 771
773 $self->realloc; 772 $self->realloc;
773
774 map $_+0, @widgets
774} 775}
775 776
776sub children { 777sub children {
777 @{ $_[0]{children} } 778 @{ $_[0]{children} }
778} 779}
1134 $visible ? $self->SUPER::add ($self->{vslider}) 1135 $visible ? $self->SUPER::add ($self->{vslider})
1135 : $self->SUPER::remove ($self->{vslider}); 1136 : $self->SUPER::remove ($self->{vslider});
1136 } 1137 }
1137} 1138}
1138 1139
1140sub start_dragging {
1141 my ($self, $ev) = @_;
1142
1143 $self->grab_focus;
1144
1145 my $ox = $self->{vp}{view_x};
1146 my $oy = $self->{vp}{view_y};
1147
1148 $self->{motion} = sub {
1149 my ($ev, $x, $y) = @_;
1150
1151 $ox -= $ev->{xrel};
1152 $oy -= $ev->{yrel};
1153
1154 $self->{vp}->set_offset ($ox, $oy);
1155 };
1156}
1157
1139sub invoke_mouse_wheel { 1158sub invoke_mouse_wheel {
1140 my ($self, $ev) = @_; 1159 my ($self, $ev) = @_;
1141 1160
1142 $self->{vslider}->emit (mouse_wheel => $ev) 1161 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1143 if $ev->{dy};
1144
1145 $self->{hslider}->emit (mouse_wheel => $ev) 1162 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1146 if $ev->{dx};
1147 1163
1148 1 1164 1
1149} 1165}
1150 1166
1151sub invoke_button_down { 1167sub invoke_button_down {
1152 my ($self, $ev, $x, $y) = @_; 1168 my ($self, $ev, $x, $y) = @_;
1153 1169
1154 if ($ev->{button} == 2) { 1170 if ($ev->{button} == 2) {
1155 $self->grab_focus; 1171 $self->start_dragging ($ev);
1156
1157 my $ox = $self->{vp}{view_x} + $ev->{x};
1158 my $oy = $self->{vp}{view_y} + $ev->{y};
1159
1160 $self->{motion} = sub {
1161 my ($ev, $x, $y) = @_;
1162
1163 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1164 $self->update;
1165 };
1166
1167 return 1; 1172 return 1;
1168 } 1173 }
1169 1174
1170 0 1175 0
1171} 1176}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines