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.241 by root, Fri May 26 20:50:35 2006 UTC vs.
Revision 1.243 by root, Sat May 27 20:46:54 2006 UTC

… …
9use CFClient; 9use CFClient;
10use CFClient::Texture; 10use CFClient::Texture;
11 11
12our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
13 13
14our $LAYOUT;
14our $ROOT; 15our $ROOT;
15our $TOOLTIP; 16our $TOOLTIP;
16our $BUTTON_STATE; 17our $BUTTON_STATE;
17 18
18our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
19 38
20sub check_tooltip { 39sub check_tooltip {
21 if (!$GRAB) { 40 if (!$GRAB) {
22 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
23 if (length $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
… …
187 can_events => 1, 206 can_events => 1,
188 @_ 207 @_
189 }, $class; 208 }, $class;
190 209
191 for (keys %$self) { 210 for (keys %$self) {
192 if (/^connect_(.*)$/) { 211 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 212 $self->connect ($1 => delete $self->{$_});
194 } 213 }
195 } 214 }
196 215
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH;
220 $self->{user_y} = $layout->{y} * $::HEIGHT;
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
223 }
198 224
199 $self 225 $self
200} 226}
201 227
202sub destroy { 228sub destroy {
… …
858 my $class = shift; 884 my $class = shift;
859 885
860 my $self; 886 my $self;
861 887
862 my $slider = new CFClient::UI::Slider 888 my $slider = new CFClient::UI::Slider
863 vertical => 1, 889 vertical => 1,
864 range => [0, 0, 1, 0.01], # HACK fix 890 range => [0, 0, 1, 0.01], # HACK fix
865 connect_changed => sub { 891 on_changed => sub {
866 $self->{vp}->set_offset (0, $_[1]); 892 $self->{vp}->set_offset (0, $_[1]);
867 }, 893 },
868 ; 894 ;
869 895
870 $self = $class->SUPER::new ( 896 $self = $class->SUPER::new (
… …
1025 my ($ev, $x, $y) = @_; 1051 my ($ev, $x, $y) = @_;
1026 1052
1027 my $dx = $ev->{x} - $ox; 1053 my $dx = $ev->{x} - $ox;
1028 my $dy = $ev->{y} - $oy; 1054 my $dy = $ev->{y} - $oy;
1029 1055
1056 $self->{user_x} = $wx + $dx * $mx;
1057 $self->{user_y} = $wy + $dy * $my;
1030 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1058 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
1031 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1059 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
1032 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1060 $self->move ($self->{user_x}, $self->{user_y});
1033 $self->check_size; 1061 $self->check_size;
1034 }; 1062 };
1035 1063
1036 } elsif ($lr ^ $td) { 1064 } elsif ($lr ^ $td) {
1037 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1065 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1040 $self->{motion} = sub { 1068 $self->{motion} = sub {
1041 my ($ev, $x, $y) = @_; 1069 my ($ev, $x, $y) = @_;
1042 1070
1043 ($x, $y) = ($ev->{x}, $ev->{y}); 1071 ($x, $y) = ($ev->{x}, $ev->{y});
1044 1072
1045 $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});
1046 $self->update; 1076 $self->update;
1047 }; 1077 };
1048 } 1078 }
1049} 1079}
1050 1080
… …
2544 2574
2545sub new { 2575sub new {
2546 my $class = shift; 2576 my $class = shift;
2547 2577
2548 my $self = $class->SUPER::new ( 2578 my $self = $class->SUPER::new (
2549 state => 0, 2579 state => 0,
2550 connect_activate => \&toggle_flopper, 2580 on_activate => \&toggle_flopper,
2551 @_ 2581 @_
2552 ); 2582 );
2553 2583
2554 if ($self->{state}) { 2584 if ($self->{state}) {
2555 $self->{state} = 0; 2585 $self->{state} = 0;
… …
3081 $_->() 3111 $_->()
3082 for values %{delete $self->{refresh_hook}}; 3112 for values %{delete $self->{refresh_hook}};
3083 } 3113 }
3084 3114
3085 if ($self->{check_size}) { 3115 if ($self->{check_size}) {
3086 my @queue = ([], []); 3116 my @queue;
3087 3117
3088 for (;;) { 3118 for (;;) {
3089 if ($self->{check_size}) { 3119 if ($self->{check_size}) {
3090 # heuristic: check containers last 3120 #TODO use array-of-depth approach
3091 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3121
3122 @queue = sort { $a->{visible} <=> $b->{visible} }
3092 for values %{delete $self->{check_size}} 3123 @queue, values %{delete $self->{check_size}};
3093 } 3124 }
3094 3125
3095 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
3096 3129
3097 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3130 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3098 ? @$widget{qw(user_w user_h)} 3131 ? @$widget{qw(user_w user_h)}
3099 : $widget->size_request; 3132 : $widget->size_request;
3100 3133

Diff Legend

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