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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines