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.375 by root, Mon Jul 16 20:12:19 2007 UTC vs.
Revision 1.378 by root, Mon Jul 16 20:22:39 2007 UTC

986} 986}
987 987
988sub set_offset { 988sub set_offset {
989 my ($self, $x, $y) = @_; 989 my ($self, $x, $y) = @_;
990 990
991 $self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x; 991 my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
992 $self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y; 992 my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
993 993
994 if ($x != $self->{view_x} or $y != $self->{view_y}) {
995 $self->{view_x} = $x;
996 $self->{view_y} = $y;
997
998 $self->emit (changed => $x, $y);
994 $self->update; 999 $self->update;
1000 }
995} 1001}
996 1002
997# hmm, this does not work for topleft of $self... but we should not ask for that 1003# hmm, this does not work for topleft of $self... but we should not ask for that
998sub coord2local { 1004sub coord2local {
999 my ($self, $x, $y) = @_; 1005 my ($self, $x, $y) = @_;
1074 row_expand => [1, 0], 1080 row_expand => [1, 0],
1075 %arg, 1081 %arg,
1076 ); 1082 );
1077 1083
1078 $self->{vp} = new CFPlus::UI::ViewPort 1084 $self->{vp} = new CFPlus::UI::ViewPort
1079 expand => 1, 1085 expand => 1,
1080 scroll_x => $self->{scroll_x}, 1086 scroll_x => $self->{scroll_x},
1081 scroll_y => $self->{scroll_y}, 1087 scroll_y => $self->{scroll_y},
1088 on_changed => sub {
1089 my ($vp, $x, $y) = @_;
1090
1091 $vp->{parent}{hslider}->set_value ($x);
1092 $vp->{parent}{vslider}->set_value ($y);
1093
1094 0
1095 },
1082 ; 1096 ;
1083 1097
1084 $self->SUPER::add (0, 0, $self->{vp}); 1098 $self->SUPER::add (0, 0, $self->{vp});
1085 1099
1086 $self->add ($child) if $child; 1100 $self->add ($child) if $child;
1140sub invoke_button_down { 1154sub invoke_button_down {
1141 my ($self, $ev, $x, $y) = @_; 1155 my ($self, $ev, $x, $y) = @_;
1142 1156
1143 if ($ev->{button} == 2) { 1157 if ($ev->{button} == 2) {
1144 $self->grab_focus; 1158 $self->grab_focus;
1159
1160 my $ox = $self->{vp}{view_x} + $ev->{x};
1161 my $oy = $self->{vp}{view_y} + $ev->{y};
1145 1162
1146 $self->{motion} = sub { 1163 $self->{motion} = sub {
1147 my ($ev, $x, $y) = @_; 1164 my ($ev, $x, $y) = @_;
1148 1165
1149 $self->{vp}->set_offset ( 1166 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1150 $self->{vp}{view_x} - $ev->{xrel}, 1167 $self->update;
1151 $self->{vp}{view_y} - $ev->{yrel},
1152 );
1153 }; 1168 };
1154 1169
1155 return 1; 1170 return 1;
1156 } 1171 }
1157 1172

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines