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.242 by elmex, Sat May 27 20:00:40 2006 UTC vs.
Revision 1.244 by root, Sat May 27 21:06:09 2006 UTC

… …
206 can_events => 1, 206 can_events => 1,
207 @_ 207 @_
208 }, $class; 208 }, $class;
209 209
210 for (keys %$self) { 210 for (keys %$self) {
211 if (/^connect_(.*)$/) { 211 if (/^on_(.*)$/) {
212 $self->connect ($1 => delete $self->{$_}); 212 $self->connect ($1 => delete $self->{$_});
213 } 213 }
214 } 214 }
215 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
… …
253} 253}
254 254
255sub set_invisible { 255sub set_invisible {
256 my ($self) = @_; 256 my ($self) = @_;
257 257
258 return unless $self->{visible};
259
258 # broken show/hide model 260 # broken show/hide model
259 261
260 delete $self->{root}; 262 delete $self->{root};
261 delete $self->{visible}; 263 delete $self->{visible};
262 264
… …
265 267
266 CFClient::UI::check_tooltip 268 CFClient::UI::check_tooltip
267 if $CFClient::UI::TOOLTIP->{owner} == $self; 269 if $CFClient::UI::TOOLTIP->{owner} == $self;
268 270
269 $self->focus_out; 271 $self->focus_out;
272
273 $self->emit (visibility_change => 0);
270} 274}
271 275
272sub hide { 276sub hide {
273 my ($self) = @_; 277 my ($self) = @_;
274 278
… …
486sub set_parent { 490sub set_parent {
487 my ($self, $parent) = @_; 491 my ($self, $parent) = @_;
488 492
489 Scalar::Util::weaken ($self->{parent} = $parent); 493 Scalar::Util::weaken ($self->{parent} = $parent);
490 494
495 if ($parent->{visible} || 1) {
491 $self->{root} = $parent->{root}; 496 $self->{root} = $parent->{root};
492 $self->{visible} = $parent->{visible} + 1; 497 $self->{visible} = $parent->{visible} + 1;
498
499 $self->emit (visibility_change => 1)
500 unless $self->{parent}{visible};
501 }
493 502
494 # TODO: req_w _does_change after ->reconfigure 503 # TODO: req_w _does_change after ->reconfigure
495 $self->check_size 504 $self->check_size
496 unless exists $self->{req_w}; 505 unless exists $self->{req_w};
497 506
… …
527sub emit { 536sub emit {
528 my ($self, $signal, @args) = @_; 537 my ($self, $signal, @args) = @_;
529 538
530 $self->_emit ($signal, @args) 539 $self->_emit ($signal, @args)
531 || $self->$signal (@args); 540 || $self->$signal (@args);
541}
542
543sub visibility_change {
544 #my ($self, $visible) = @_;
532} 545}
533 546
534sub DESTROY { 547sub DESTROY {
535 my ($self) = @_; 548 my ($self) = @_;
536 549
… …
884 my $class = shift; 897 my $class = shift;
885 898
886 my $self; 899 my $self;
887 900
888 my $slider = new CFClient::UI::Slider 901 my $slider = new CFClient::UI::Slider
889 vertical => 1, 902 vertical => 1,
890 range => [0, 0, 1, 0.01], # HACK fix 903 range => [0, 0, 1, 0.01], # HACK fix
891 connect_changed => sub { 904 on_changed => sub {
892 $self->{vp}->set_offset (0, $_[1]); 905 $self->{vp}->set_offset (0, $_[1]);
893 }, 906 },
894 ; 907 ;
895 908
896 $self = $class->SUPER::new ( 909 $self = $class->SUPER::new (
… …
1051 my ($ev, $x, $y) = @_; 1064 my ($ev, $x, $y) = @_;
1052 1065
1053 my $dx = $ev->{x} - $ox; 1066 my $dx = $ev->{x} - $ox;
1054 my $dy = $ev->{y} - $oy; 1067 my $dy = $ev->{y} - $oy;
1055 1068
1069 $self->{user_x} = $wx + $dx * $mx;
1070 $self->{user_y} = $wy + $dy * $my;
1056 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1071 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
1057 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1072 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
1058 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1073 $self->move ($self->{user_x}, $self->{user_y});
1059 $self->check_size; 1074 $self->check_size;
1060 }; 1075 };
1061 1076
1062 } elsif ($lr ^ $td) { 1077 } elsif ($lr ^ $td) {
1063 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1078 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1066 $self->{motion} = sub { 1081 $self->{motion} = sub {
1067 my ($ev, $x, $y) = @_; 1082 my ($ev, $x, $y) = @_;
1068 1083
1069 ($x, $y) = ($ev->{x}, $ev->{y}); 1084 ($x, $y) = ($ev->{x}, $ev->{y});
1070 1085
1071 $self->move ($bx + $x - $ox, $by + $y - $oy); 1086 $self->{user_x} = $bx + $x - $ox;
1087 $self->{user_y} = $by + $y - $oy;
1088 $self->move ($self->{user_x}, $self->{user_y});
1072 $self->update; 1089 $self->update;
1073 }; 1090 };
1074 } 1091 }
1075} 1092}
1076 1093
… …
2570 2587
2571sub new { 2588sub new {
2572 my $class = shift; 2589 my $class = shift;
2573 2590
2574 my $self = $class->SUPER::new ( 2591 my $self = $class->SUPER::new (
2575 state => 0, 2592 state => 0,
2576 connect_activate => \&toggle_flopper, 2593 on_activate => \&toggle_flopper,
2577 @_ 2594 @_
2578 ); 2595 );
2579 2596
2580 if ($self->{state}) { 2597 if ($self->{state}) {
2581 $self->{state} = 0; 2598 $self->{state} = 0;
… …
3028 if exists $child->{req_x}; 3045 if exists $child->{req_x};
3029 3046
3030 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3047 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3031 if exists $child->{req_y}; 3048 if exists $child->{req_y};
3032 3049
3050 $X = $self->{user_x} if exists $self->{user_x};
3051 $Y = $self->{user_y} if exists $self->{user_y};
3052
3033 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5; 3053 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3034 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5; 3054 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3035 3055
3036 $child->configure ($X, $Y, $W, $H); 3056 $child->configure ($X, $Y, $W, $H);
3037 } 3057 }
… …
3107 $_->() 3127 $_->()
3108 for values %{delete $self->{refresh_hook}}; 3128 for values %{delete $self->{refresh_hook}};
3109 } 3129 }
3110 3130
3111 if ($self->{check_size}) { 3131 if ($self->{check_size}) {
3112 my @queue = ([], []); 3132 my @queue;
3113 3133
3114 for (;;) { 3134 for (;;) {
3115 if ($self->{check_size}) { 3135 if ($self->{check_size}) {
3116 # heuristic: check containers last 3136 #TODO use array-of-depth approach
3117 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3137
3138 @queue = sort { $a->{visible} <=> $b->{visible} }
3118 for values %{delete $self->{check_size}} 3139 @queue, values %{delete $self->{check_size}};
3119 } 3140 }
3120 3141
3121 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3142 my $widget = pop @queue || last;
3143
3144 defined $widget->{visible} or last; # do not resize invisible widgets
3122 3145
3123 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3146 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3124 ? @$widget{qw(user_w user_h)} 3147 ? @$widget{qw(user_w user_h)}
3125 : $widget->size_request; 3148 : $widget->size_request;
3126 3149

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines