| … | |
… | |
| 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); |
| … | |
… | |
| 884 | my $class = shift; |
884 | my $class = shift; |
| 885 | |
885 | |
| 886 | my $self; |
886 | my $self; |
| 887 | |
887 | |
| 888 | my $slider = new CFClient::UI::Slider |
888 | my $slider = new CFClient::UI::Slider |
| 889 | vertical => 1, |
889 | vertical => 1, |
| 890 | range => [0, 0, 1, 0.01], # HACK fix |
890 | range => [0, 0, 1, 0.01], # HACK fix |
| 891 | connect_changed => sub { |
891 | on_changed => sub { |
| 892 | $self->{vp}->set_offset (0, $_[1]); |
892 | $self->{vp}->set_offset (0, $_[1]); |
| 893 | }, |
893 | }, |
| 894 | ; |
894 | ; |
| 895 | |
895 | |
| 896 | $self = $class->SUPER::new ( |
896 | $self = $class->SUPER::new ( |
| … | |
… | |
| 1051 | my ($ev, $x, $y) = @_; |
1051 | my ($ev, $x, $y) = @_; |
| 1052 | |
1052 | |
| 1053 | my $dx = $ev->{x} - $ox; |
1053 | my $dx = $ev->{x} - $ox; |
| 1054 | my $dy = $ev->{y} - $oy; |
1054 | my $dy = $ev->{y} - $oy; |
| 1055 | |
1055 | |
|
|
1056 | $self->{user_x} = $wx + $dx * $mx; |
|
|
1057 | $self->{user_y} = $wy + $dy * $my; |
| 1056 | $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); |
1058 | $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); |
| 1057 | $self->{user_h} = $bh + $dy * ($my ? -1 : 1); |
1059 | $self->{user_h} = $bh + $dy * ($my ? -1 : 1); |
| 1058 | $self->move ($wx + $dx * $mx, $wy + $dy * $my); |
1060 | $self->move ($self->{user_x}, $self->{user_y}); |
| 1059 | $self->check_size; |
1061 | $self->check_size; |
| 1060 | }; |
1062 | }; |
| 1061 | |
1063 | |
| 1062 | } elsif ($lr ^ $td) { |
1064 | } elsif ($lr ^ $td) { |
| 1063 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
1065 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
| … | |
… | |
| 1066 | $self->{motion} = sub { |
1068 | $self->{motion} = sub { |
| 1067 | my ($ev, $x, $y) = @_; |
1069 | my ($ev, $x, $y) = @_; |
| 1068 | |
1070 | |
| 1069 | ($x, $y) = ($ev->{x}, $ev->{y}); |
1071 | ($x, $y) = ($ev->{x}, $ev->{y}); |
| 1070 | |
1072 | |
| 1071 | $self->move ($bx + $x - $ox, $by + $y - $oy); |
1073 | $self->{user_x} = $bx + $x - $ox; |
|
|
1074 | $self->{user_y} = $by + $y - $oy; |
|
|
1075 | $self->move ($self->{user_x}, $self->{user_y}); |
| 1072 | $self->update; |
1076 | $self->update; |
| 1073 | }; |
1077 | }; |
| 1074 | } |
1078 | } |
| 1075 | } |
1079 | } |
| 1076 | |
1080 | |
| … | |
… | |
| 2570 | |
2574 | |
| 2571 | sub new { |
2575 | sub new { |
| 2572 | my $class = shift; |
2576 | my $class = shift; |
| 2573 | |
2577 | |
| 2574 | my $self = $class->SUPER::new ( |
2578 | my $self = $class->SUPER::new ( |
| 2575 | state => 0, |
2579 | state => 0, |
| 2576 | connect_activate => \&toggle_flopper, |
2580 | on_activate => \&toggle_flopper, |
| 2577 | @_ |
2581 | @_ |
| 2578 | ); |
2582 | ); |
| 2579 | |
2583 | |
| 2580 | if ($self->{state}) { |
2584 | if ($self->{state}) { |
| 2581 | $self->{state} = 0; |
2585 | $self->{state} = 0; |
| … | |
… | |
| 3107 | $_->() |
3111 | $_->() |
| 3108 | for values %{delete $self->{refresh_hook}}; |
3112 | for values %{delete $self->{refresh_hook}}; |
| 3109 | } |
3113 | } |
| 3110 | |
3114 | |
| 3111 | if ($self->{check_size}) { |
3115 | if ($self->{check_size}) { |
| 3112 | my @queue = ([], []); |
3116 | my @queue; |
| 3113 | |
3117 | |
| 3114 | for (;;) { |
3118 | for (;;) { |
| 3115 | if ($self->{check_size}) { |
3119 | if ($self->{check_size}) { |
| 3116 | # heuristic: check containers last |
3120 | #TODO use array-of-depth approach |
| 3117 | push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ |
3121 | |
|
|
3122 | @queue = sort { $a->{visible} <=> $b->{visible} } |
| 3118 | for values %{delete $self->{check_size}} |
3123 | @queue, values %{delete $self->{check_size}}; |
| 3119 | } |
3124 | } |
| 3120 | |
3125 | |
| 3121 | my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; |
3126 | my $widget = pop @queue || last; |
|
|
3127 | |
|
|
3128 | defined $widget->{visible} or last; # do not resize invisible widgets |
| 3122 | |
3129 | |
| 3123 | my ($w, $h) = $widget->{user_w} && $widget->{user_h} |
3130 | my ($w, $h) = $widget->{user_w} && $widget->{user_h} |
| 3124 | ? @$widget{qw(user_w user_h)} |
3131 | ? @$widget{qw(user_w user_h)} |
| 3125 | : $widget->size_request; |
3132 | : $widget->size_request; |
| 3126 | |
3133 | |
