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.237 by root, Thu May 25 21:36:45 2006 UTC vs.
Revision 1.243 by root, Sat May 27 20:46:54 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %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}
18 38
19sub check_tooltip { 39sub check_tooltip {
20 if (!$GRAB) { 40 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
… …
186 can_events => 1, 206 can_events => 1,
187 @_ 207 @_
188 }, $class; 208 }, $class;
189 209
190 for (keys %$self) { 210 for (keys %$self) {
191 if (/^connect_(.*)$/) { 211 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 212 $self->connect ($1 => delete $self->{$_});
193 } 213 }
194 } 214 }
195 215
196 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 }
197 224
198 $self 225 $self
199} 226}
200 227
201sub destroy { 228sub destroy {
… …
228sub set_invisible { 255sub set_invisible {
229 my ($self) = @_; 256 my ($self) = @_;
230 257
231 # broken show/hide model 258 # broken show/hide model
232 259
260 delete $self->{root};
233 delete $self->{visible}; 261 delete $self->{visible};
234 262
235 undef $GRAB if $GRAB == $self; 263 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 264 undef $HOVER if $HOVER == $self;
237 265
… …
459 my ($self, $parent) = @_; 487 my ($self, $parent) = @_;
460 488
461 Scalar::Util::weaken ($self->{parent} = $parent); 489 Scalar::Util::weaken ($self->{parent} = $parent);
462 490
463 $self->{root} = $parent->{root}; 491 $self->{root} = $parent->{root};
464 $self->{visible} = $parent->{visible}; 492 $self->{visible} = $parent->{visible} + 1;
465 493
466 # TODO: req_w _does_change after ->reconfigure 494 # TODO: req_w _does_change after ->reconfigure
467 $self->check_size 495 $self->check_size
468 unless exists $self->{req_w}; 496 unless exists $self->{req_w};
469 497
… …
856 my $class = shift; 884 my $class = shift;
857 885
858 my $self; 886 my $self;
859 887
860 my $slider = new CFClient::UI::Slider 888 my $slider = new CFClient::UI::Slider
861 vertical => 1, 889 vertical => 1,
862 range => [0, 0, 1, 0.01], # HACK fix 890 range => [0, 0, 1, 0.01], # HACK fix
863 connect_changed => sub { 891 on_changed => sub {
864 $self->{vp}->set_offset (0, $_[1]); 892 $self->{vp}->set_offset (0, $_[1]);
865 }, 893 },
866 ; 894 ;
867 895
868 $self = $class->SUPER::new ( 896 $self = $class->SUPER::new (
… …
874 $self->{vp}->add ($self->{scrolled}); 902 $self->{vp}->add ($self->{scrolled});
875 $self->add ($self->{vp}); 903 $self->add ($self->{vp});
876 $self->add ($self->{slider}); 904 $self->add ($self->{slider});
877 905
878 $self 906 $self
907}
908
909sub update {
910 my ($self) = @_;
911
912 $self->SUPER::update;
913
914 # todo: overwrite size_allocate of child
915 my $child = $self->{vp}->child;
916 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
879} 917}
880 918
881sub size_allocate { 919sub size_allocate {
882 my ($self, $w, $h) = @_; 920 my ($self, $w, $h) = @_;
883 921
… …
1013 my ($ev, $x, $y) = @_; 1051 my ($ev, $x, $y) = @_;
1014 1052
1015 my $dx = $ev->{x} - $ox; 1053 my $dx = $ev->{x} - $ox;
1016 my $dy = $ev->{y} - $oy; 1054 my $dy = $ev->{y} - $oy;
1017 1055
1056 $self->{user_x} = $wx + $dx * $mx;
1057 $self->{user_y} = $wy + $dy * $my;
1018 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1058 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
1019 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1059 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
1020 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1060 $self->move ($self->{user_x}, $self->{user_y});
1021 $self->check_size; 1061 $self->check_size;
1022 }; 1062 };
1023 1063
1024 } elsif ($lr ^ $td) { 1064 } elsif ($lr ^ $td) {
1025 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1065 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1028 $self->{motion} = sub { 1068 $self->{motion} = sub {
1029 my ($ev, $x, $y) = @_; 1069 my ($ev, $x, $y) = @_;
1030 1070
1031 ($x, $y) = ($ev->{x}, $ev->{y}); 1071 ($x, $y) = ($ev->{x}, $ev->{y});
1032 1072
1033 $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});
1034 $self->update; 1076 $self->update;
1035 }; 1077 };
1036 } 1078 }
1037} 1079}
1038 1080
… …
1171sub size_allocate { 1213sub size_allocate {
1172 my ($self, $w, $h) = @_; 1214 my ($self, $w, $h) = @_;
1173 1215
1174 my ($ws, $hs) = $self->get_wh; 1216 my ($ws, $hs) = $self->get_wh;
1175 1217
1176 my $req_w = sum @$ws; 1218 my $req_w = (sum @$ws) || 1;
1177 my $req_h = sum @$hs; 1219 my $req_h = (sum @$hs) || 1;
1178 1220
1179 # TODO: nicer code && do row_expand 1221 # TODO: nicer code && do row_expand
1180 my @col_expand = @{$self->{col_expand}}; 1222 my @col_expand = @{$self->{col_expand}};
1181 @col_expand = (1) x @$ws unless @col_expand; 1223 @col_expand = (1) x @$ws unless @col_expand;
1182 my $col_expand = (sum @col_expand) || 1; 1224 my $col_expand = (sum @col_expand) || 1;
… …
2136} 2178}
2137 2179
2138sub set_range { 2180sub set_range {
2139 my ($self, $range) = @_; 2181 my ($self, $range) = @_;
2140 2182
2141 $self->{range} = $range; 2183 ($range, $self->{range}) = ($self->{range}, $range);
2142 2184
2143 $self->update; 2185 $self->update
2186 if "@$range" ne "@{$self->{range}}";
2144} 2187}
2145 2188
2146sub set_value { 2189sub set_value {
2147 my ($self, $value) = @_; 2190 my ($self, $value) = @_;
2148 2191
… …
2531 2574
2532sub new { 2575sub new {
2533 my $class = shift; 2576 my $class = shift;
2534 2577
2535 my $self = $class->SUPER::new ( 2578 my $self = $class->SUPER::new (
2536 state => 0, 2579 state => 0,
2537 connect_activate => \&toggle_flopper, 2580 on_activate => \&toggle_flopper,
2538 @_ 2581 @_
2539 ); 2582 );
2540 2583
2541 if ($self->{state}) { 2584 if ($self->{state}) {
2542 $self->{state} = 0; 2585 $self->{state} = 0;
… …
2751 $self->{scrolled}->add (1, $row, $item->{desc_widget}); 2794 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2752 $self->{scrolled}->add (2, $row, $item->{weight_widget}); 2795 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2753 2796
2754 $row++; 2797 $row++;
2755 } 2798 }
2756
2757# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2758} 2799}
2759 2800
2760sub size_request { 2801sub size_request {
2761 my ($self) = @_; 2802 my ($self) = @_;
2762 ($self->{req_w}, $self->{req_h}); 2803 ($self->{req_w}, $self->{req_h});
… …
2954 2995
2955sub new { 2996sub new {
2956 my $class = shift; 2997 my $class = shift;
2957 2998
2958 $class->SUPER::new ( 2999 $class->SUPER::new (
3000 visible => 1,
2959 @_, 3001 @_,
2960 ) 3002 )
2961} 3003}
2962 3004
2963sub configure { 3005sub configure {
… …
3021sub add { 3063sub add {
3022 my ($self, @children) = @_; 3064 my ($self, @children) = @_;
3023 3065
3024 for (my @widgets = @children; my $w = pop @widgets; ) { 3066 for (my @widgets = @children; my $w = pop @widgets; ) {
3025 push @widgets, $w->children; 3067 push @widgets, $w->children;
3026 $w->{root} = $self; 3068 $w->{root} = $self;
3027 $w->{visible} = 1; 3069 $w->{visible} = $self->{visible} + 1;
3028 } 3070 }
3029 3071
3030 for my $child (@children) { 3072 for my $child (@children) {
3031 $child->{is_toplevel} = 1; 3073 $child->{is_toplevel} = 1;
3032 3074
… …
3069 $_->() 3111 $_->()
3070 for values %{delete $self->{refresh_hook}}; 3112 for values %{delete $self->{refresh_hook}};
3071 } 3113 }
3072 3114
3073 if ($self->{check_size}) { 3115 if ($self->{check_size}) {
3074 my @queue = ([], []); 3116 my @queue;
3075 3117
3076 for (;;) { 3118 for (;;) {
3077 if ($self->{check_size}) { 3119 if ($self->{check_size}) {
3078 # heuristic: check containers last 3120 #TODO use array-of-depth approach
3079 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3121
3122 @queue = sort { $a->{visible} <=> $b->{visible} }
3080 for values %{delete $self->{check_size}} 3123 @queue, values %{delete $self->{check_size}};
3081 } 3124 }
3082 3125
3083 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
3084 3129
3085 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3130 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3086 ? @$widget{qw(user_w user_h)} 3131 ? @$widget{qw(user_w user_h)}
3087 : $widget->size_request; 3132 : $widget->size_request;
3088 3133

Diff Legend

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