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.143 by root, Thu Apr 20 21:28:51 2006 UTC vs.
Revision 1.165 by root, Mon Apr 24 08:22:22 2006 UTC

… …
8use CFClient; 8use CFClient;
9 9
10our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
11 11
12our $ROOT; 12our $ROOT;
13our $TOOLTIP;
13our $BUTTON_STATE; 14our $BUTTON_STATE;
15
16sub check_tooltip {
17 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) {
20
21 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget;
23
24 my $tip = $widget->{tooltip};
25
26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27
28 $TOOLTIP->set_markup ($widget->{tooltip});
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show;
31 }
32
33 return;
34 }
35 }
36 }
37
38 $TOOLTIP->hide;
39 delete $TOOLTIP->{owner};
40}
14 41
15# class methods for events 42# class methods for events
16sub feed_sdl_key_down_event { 43sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 44 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
45 if $FOCUS;
18} 46}
19 47
20sub feed_sdl_key_up_event { 48sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
50 if $FOCUS;
22} 51}
23 52
24sub feed_sdl_button_down_event { 53sub feed_sdl_button_down_event {
25 my ($ev) = @_; 54 my ($ev) = @_;
26 my ($x, $y) = ($ev->{x}, $ev->{y}); 55 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
28 if (!$BUTTON_STATE) { 57 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 58 my $widget = $ROOT->find_widget ($x, $y);
30 59
31 $GRAB = $widget; 60 $GRAB = $widget;
32 $GRAB->update if $GRAB; 61 $GRAB->update if $GRAB;
62
63 check_tooltip;
33 } 64 }
34 65
35 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 66 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 67
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 68 if ($GRAB) {
69 ($x, $y) = $GRAB->coord2local ($x, $y);
70 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
71 }
38} 72}
39 73
40sub feed_sdl_button_up_event { 74sub feed_sdl_button_up_event {
41 my ($ev) = @_; 75 my ($ev) = @_;
42 my ($x, $y) = ($ev->{x}, $ev->{y}); 76 my ($x, $y) = ($ev->{x}, $ev->{y});
43 77
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 78 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 79
46 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 81
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 82 if ($GRAB) {
83 ($x, $y) = $GRAB->coord2local ($x, $y);
84 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85 }
49 86
50 if (!$BUTTON_STATE) { 87 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 88 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 89 $grab->update if $grab;
53 $GRAB->update if $GRAB; 90 $GRAB->update if $GRAB;
91
92 check_tooltip;
54 } 93 }
55} 94}
56 95
57sub feed_sdl_motion_event { 96sub feed_sdl_motion_event {
58 my ($ev) = @_; 97 my ($ev) = @_;
… …
63 if ($widget != $HOVER) { 102 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 103 my $hover = $HOVER; $HOVER = $widget;
65 104
66 $hover->update if $hover && $hover->{can_hover}; 105 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 106 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 107
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 108 check_tooltip;
109 }
110
111 if ($HOVER) {
112 ($x, $y) = $HOVER->coord2local ($x, $y);
113 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
114 }
71} 115}
72 116
73# convert position array to integers 117# convert position array to integers
74sub harmonize { 118sub harmonize {
75 my ($vals) = @_; 119 my ($vals) = @_;
… …
93 137
94sub new { 138sub new {
95 my $class = shift; 139 my $class = shift;
96 140
97 my $self = bless { 141 my $self = bless {
98 x => 0, 142 x => 0,
99 y => 0, 143 y => 0,
100 z => 0, 144 z => 0,
145 can_events => 1,
101 @_ 146 @_
102 }, $class; 147 }, $class;
103 148
104 for (keys %$self) { 149 for (keys %$self) {
105 if (/^connect_(.*)$/) { 150 if (/^connect_(.*)$/) {
… …
108 } 153 }
109 154
110 $self 155 $self
111} 156}
112 157
158sub destroy {
159 my ($self) = @_;
160
161 $self->hide;
162 %$self = ();
163}
164
113sub show { 165sub show {
114 my ($self) = @_; 166 my ($self) = @_;
115 167
116 return if $self->{parent}; 168 return if $self->{parent};
117 169
… …
119} 171}
120 172
121sub hide { 173sub hide {
122 my ($self) = @_; 174 my ($self) = @_;
123 175
124 return unless $self->{parent}; 176 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self;
125 178
126 $self->{parent}->remove ($self); 179 $self->{parent}->remove ($self)
180 if $self->{parent};
127} 181}
128 182
129sub move { 183sub move {
130 my ($self, $x, $y, $z) = @_; 184 my ($self, $x, $y, $z) = @_;
131 185
… …
134 $self->{z} = $z if defined $z; 188 $self->{z} = $z if defined $z;
135 189
136 $self->update; 190 $self->update;
137} 191}
138 192
139sub needs_redraw { 193sub set_size {
140 0 194 my ($self, $w, $h) = @_;
195
196 $self->{user_w} = $w;
197 $self->{user_h} = $h;
198
199 $self->check_size;
141} 200}
142 201
143sub size_request { 202sub size_request {
144 require Carp; 203 require Carp;
145 Carp::confess "size_request is abtract"; 204 Carp::confess "size_request is abstract";
146} 205}
147 206
148sub configure { 207sub configure {
149 my ($self, $x, $y, $w, $h) = @_; 208 my ($self, $x, $y, $w, $h) = @_;
150 209
… …
152 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 211 my $w2 = List::Util::min $w, int $h * $self->{aspect};
153 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 212 my $h2 = List::Util::min $h, int $w / $self->{aspect};
154 213
155 # use alignment to adjust x, y 214 # use alignment to adjust x, y
156 215
157 $x += ($w - $w2) * 0.5; 216 $x += int +($w - $w2) * 0.5;
158 $y += ($h - $h2) * 0.5; 217 $y += int +($h - $h2) * 0.5;
159 218
160 ($w, $h) = ($w2, $h2); 219 ($w, $h) = ($w2, $h2);
161 } 220 }
162 221
163 if ($self->{x} != $x || $self->{y} != $y) { 222 if ($self->{x} != $x || $self->{y} != $y) {
… …
175 } 234 }
176} 235}
177 236
178sub size_allocate { 237sub size_allocate {
179 # nothing to be done 238 # nothing to be done
239}
240
241sub set_max_size {
242 my ($self, $w, $h) = @_;
243
244 delete $self->{max_w}; $self->{max_w} = $w if $w;
245 delete $self->{max_h}; $self->{max_h} = $h if $h;
180} 246}
181 247
182# return top left coordinates 248# return top left coordinates
183sub _topleft { 249sub _topleft {
184 my ($self, $x, $y) = @_; 250 my ($self, $x, $y) = @_;
… …
267 glVertex $x + $self->{w}, $y + $self->{h}; 333 glVertex $x + $self->{w}, $y + $self->{h};
268 glVertex $x , $y + $self->{h}; 334 glVertex $x , $y + $self->{h};
269 glEnd; 335 glEnd;
270 glDisable GL_BLEND; 336 glDisable GL_BLEND;
271 } 337 }
338
339 if ($ENV{PCLIENT_DEBUG}) {
340 glPushMatrix;
341 glColor 1, 1, 0, 1;
342 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
343 glBegin GL_LINE_LOOP;
344 glVertex 0 , 0;
345 glVertex $self->{w}, 0;
346 glVertex $self->{w}, $self->{h};
347 glVertex 0 , $self->{h};
348 glEnd;
349 glPopMatrix;
350 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
351 }
272} 352}
273 353
274sub _draw { 354sub _draw {
275 my ($self) = @_; 355 my ($self) = @_;
276 356
277 warn "no draw defined for $self\n"; 357 warn "no draw defined for $self\n";
278} 358}
279 359
280sub find_widget { 360sub find_widget {
281 my ($self, $x, $y) = @_; 361 my ($self, $x, $y) = @_;
362
363 return () unless $self->{can_events};
282 364
283 return $self 365 return $self
284 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 366 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
285 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 367 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
286 368
… …
294} 376}
295 377
296sub check_size { 378sub check_size {
297 my ($self) = @_; 379 my ($self) = @_;
298 380
299 my ($w, $h) = $self->size_request; 381 $self->{parent}
382 or return 1;
300 383
384 my ($w, $h) = $self->{user_w} && $self->{user_h}
385 ? @$self{qw(user_w user_h)}
386 : $self->size_request;
387
301 if ($w != $self->{req_w} || $h != $self->{req_h}) { 388 if ($w != $self->{req_w} || $h != $self->{req_h}) {
302 $self->{req_w} = $w; 389 $self->{req_w} = $w;
303 $self->{req_h} = $h; 390 $self->{req_h} = $h;
304 391
305 $self->{parent}->check_size 392 $self->{parent}->check_size
306 if $self->{parent}; 393 or $self->size_allocate (
394 (List::Util::max $self->{w}, $w),
395 (List::Util::max $self->{h}, $h),
396 );
397
398 1
399 } else {
400 0
307 } 401 }
308} 402}
309 403
310sub update { 404sub update {
311 my ($self) = @_; 405 my ($self) = @_;
… …
321} 415}
322 416
323sub emit { 417sub emit {
324 my ($self, $signal, @args) = @_; 418 my ($self, $signal, @args) = @_;
325 419
326 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 420 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
327 $cb->($self, @args);
328 }
329} 421}
330 422
331sub DESTROY { 423sub DESTROY {
332 my ($self) = @_; 424 my ($self) = @_;
333 425
… …
378 470
379package CFClient::UI::Empty; 471package CFClient::UI::Empty;
380 472
381our @ISA = CFClient::UI::Base::; 473our @ISA = CFClient::UI::Base::;
382 474
475sub new {
476 my ($class, %arg) = @_;
477 $class->SUPER::new (can_events => 0, %arg);
478}
479
383sub size_request { 480sub size_request {
384 (0, 0) 481 (0, 0)
385} 482}
386 483
387sub draw { } 484sub draw { }
… …
395sub new { 492sub new {
396 my ($class, %arg) = @_; 493 my ($class, %arg) = @_;
397 494
398 my $children = delete $arg{children} || []; 495 my $children = delete $arg{children} || [];
399 496
400 my $self = $class->SUPER::new (children => [], %arg); 497 my $self = $class->SUPER::new (children => [], can_events => 0, %arg);
401 $self->add ($_) for @$children; 498 $self->add ($_) for @$children;
402 499
403 $self 500 $self
404} 501}
405 502
… …
420 517
421sub remove { 518sub remove {
422 my ($self, $child) = @_; 519 my ($self, $child) = @_;
423 520
424 delete $child->{parent}; 521 delete $child->{parent};
522 $child->hide;
425 523
426 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 524 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
427 525
428 $self->check_size; 526 $self->check_size;
527 $self->update;
528}
529
530sub clear {
531 my ($self) = @_;
532
533 my $children = delete $self->{children};
534 $self->{children} = [];
535
536 for (@$children) {
537 delete $_->{parent};
538 $_->hide;
539 }
429} 540}
430 541
431sub find_widget { 542sub find_widget {
432 my ($self, $x, $y) = @_; 543 my ($self, $x, $y) = @_;
433 544
… …
561sub new { die } 672sub new { die }
562 673
563sub size_request { 674sub size_request {
564 my ($self) = @_; 675 my ($self) = @_;
565 676
566 @$self{qw(child_w child_h)} = $self->child->size_request; 677 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
567 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 678 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
568 679
569 @$self{qw(child_w child_h)} 680 @$self{qw(child_w child_h)}
570} 681}
571 682
… …
581package CFClient::UI::Frame; 692package CFClient::UI::Frame;
582 693
583our @ISA = CFClient::UI::Bin::; 694our @ISA = CFClient::UI::Bin::;
584 695
585use CFClient::OpenGL; 696use CFClient::OpenGL;
586
587sub size_request {
588 my ($self) = @_;
589 my $chld = $self->child
590 or return (0, 0);
591
592 $chld->move (2, 2);
593
594 map { $_ + 4 } $chld->size_request;
595}
596
597sub size_allocate {
598 my ($self, $x, $y, $w, $h) = @_;
599
600 $self->child->configure (2, 2, $w - 4, $h - 4);
601}
602
603sub _draw {
604 my ($self) = @_;
605
606 my $chld = $self->child;
607
608 my ($w, $h) = $chld->size_request;
609
610 glBegin GL_QUADS;
611 glColor 0, 0, 0;
612 glVertex 0 , 0;
613 glVertex 0 , $h + 4;
614 glVertex $w + 4 , $h + 4;
615 glVertex $w + 4 , 0;
616 glEnd;
617
618 $chld->draw;
619}
620
621#############################################################################
622
623package CFClient::UI::FancyFrame;
624
625our @ISA = CFClient::UI::Bin::;
626
627use CFClient::OpenGL;
628
629my @tex =
630 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
631 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
632 697
633sub new { 698sub new {
634 my $class = shift; 699 my $class = shift;
635
636 # TODO: user_x, user_y, overwrite moveto?
637 700
638 my $self = $class->SUPER::new ( 701 my $self = $class->SUPER::new (
639 bg => [1, 1, 1, 1], 702 bg => [1, 1, 1, 1],
640 border_bg => [1, 1, 1, 1], 703 border_bg => [1, 1, 1, 1],
641 border => 0.8, 704 border => 0.8,
642 @_ 705 @_
643 ); 706 );
644 707
708 $self
709}
710
711sub _draw {
712 my ($self) = @_;
713
714 my ($w, $h) = ($self->{w}, $self->{h});
715
716 glEnable GL_BLEND;
717 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
718 glEnable GL_TEXTURE_2D;
719 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
720
721# glBegin GL_QUADS;
722# glColor 0, 0, 0, 0;
723# glVertex 0 , 0;
724# glVertex 0 , $h;
725# glVertex $w, $h;
726# glVertex $w, 0;
727# glEnd;
728
729
730 $self->child->draw;
731 glDisable GL_BLEND;
732 glDisable GL_TEXTURE_2D;
733}
734
735#############################################################################
736
737package CFClient::UI::FancyFrame;
738
739our @ISA = CFClient::UI::Bin::;
740
741use CFClient::OpenGL;
742
743my @tex =
744 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
745 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
746
747sub new {
748 my $class = shift;
749
750 # TODO: user_x, user_y, overwrite moveto?
751
752 my $self = $class->SUPER::new (
753 bg => [1, 1, 1, 1],
754 border_bg => [1, 1, 1, 1],
755 border => 0.8,
756 @_
757 );
758
645 $self->{title} &&= new CFClient::UI::Label 759 $self->{title} &&= new CFClient::UI::Label
646 align => 0, 760 align => 0,
647 valign => 1, 761 valign => 1,
648 text => $self->{title}, 762 text => $self->{title},
649 fontsize => 1; 763 fontsize => 1;
… …
656} 770}
657 771
658sub size_request { 772sub size_request {
659 my ($self) = @_; 773 my ($self) = @_;
660 774
661 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
662
663 my ($w, $h) = $self->SUPER::size_request; 775 my ($w, $h) = $self->SUPER::size_request;
664 776
665 ( 777 (
666 $w + $self->border * 2, 778 $w + $self->border * 2,
667 $h + $self->border * 2, 779 $h + $self->border * 2,
… …
799 911
800# TODO: move to container class maybe? send childs a signal on removal? 912# TODO: move to container class maybe? send childs a signal on removal?
801sub clear { 913sub clear {
802 my ($self) = @_; 914 my ($self) = @_;
803 915
804 delete $self->{children}; 916 my $children = delete $self->{children};
917
918 for (grep $_, map @$_, grep $_, @$children) {
919 delete $_->{parent};
920 $_->hide;
921 }
922
805 $self->update; 923 $self->update;
806} 924}
807 925
808sub get_wh { 926sub get_wh {
809 my ($self) = @_; 927 my ($self) = @_;
… …
815 or next; 933 or next;
816 934
817 for my $x (0 .. $#$row) { 935 for my $x (0 .. $#$row) {
818 my $widget = $row->[$x] 936 my $widget = $row->[$x]
819 or next; 937 or next;
820 my ($w, $h) = $widget->size_request; 938 my ($w, $h) = @$widget{qw(req_w req_h)};
821 939
822 $w[$x] = max $w[$x], $w; 940 $w[$x] = max $w[$x], $w;
823 $h[$y] = max $h[$y], $h; 941 $h[$y] = max $h[$y], $h;
824 } 942 }
825 } 943 }
… …
930 1048
931 ($h, $w) = ($w, $h); 1049 ($h, $w) = ($w, $h);
932 1050
933 my $children = $self->{children}; 1051 my $children = $self->{children};
934 1052
935 my @h = map +($_->size_request)[0], @$children; 1053 my @h = map $_->{req_w}, @$children;
936 1054
937 my $req_h = List::Util::sum @h; 1055 my $req_h = List::Util::sum @h;
938 1056
939 if ($req_h > $h) { 1057 if ($req_h > $h) {
940 # ah well, not enough space 1058 # ah well, not enough space
… …
988sub size_allocate { 1106sub size_allocate {
989 my ($self, $w, $h) = @_; 1107 my ($self, $w, $h) = @_;
990 1108
991 my $children = $self->{children}; 1109 my $children = $self->{children};
992 1110
993 my @h = map +($_->size_request)[1], @$children; 1111 my @h = map $_->{req_h}, @$children;
994 1112
995 my $req_h = List::Util::sum @h; 1113 my $req_h = List::Util::sum @h;
996 1114
997 if ($req_h > $h) { 1115 if ($req_h > $h) {
998 # ah well, not enough space 1116 # ah well, not enough space
… …
1032 1150
1033sub new { 1151sub new {
1034 my ($class, %arg) = @_; 1152 my ($class, %arg) = @_;
1035 1153
1036 my $self = $class->SUPER::new ( 1154 my $self = $class->SUPER::new (
1037 fg => [1, 1, 1], 1155 fg => [1, 1, 1],
1156 #font => default_font
1038 fontsize => 1, 1157 fontsize => 1,
1039 text => "", 1158 text => "",
1040 align => -1, 1159 align => -1,
1041 valign => -1, 1160 valign => -1,
1042 padding => 2, 1161 padding => 2,
1043 layout => new CFClient::Layout, 1162 layout => new CFClient::Layout,
1163 can_events => 0,
1044 %arg 1164 %arg
1045 ); 1165 );
1046 1166
1047 if (exists $self->{template}) { 1167 if (exists $self->{template}) {
1048 my $layout = new CFClient::Layout; 1168 my $layout = new CFClient::Layout;
… …
1054 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1174 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1055 1175
1056 $self 1176 $self
1057} 1177}
1058 1178
1059sub escape_text { 1179sub escape {
1060 local $_ = $_[1]; 1180 local $_ = $_[1];
1061 1181
1062 s/&/&amp;/g; 1182 s/&/&amp;/g;
1063 s/>/&gt;/g; 1183 s/>/&gt;/g;
1064 s/</&lt;/g; 1184 s/</&lt;/g;
… …
1070 my ($self, $text) = @_; 1190 my ($self, $text) = @_;
1071 1191
1072 $self->{layout}->set_text ($text); 1192 $self->{layout}->set_text ($text);
1073 1193
1074 delete $self->{texture}; 1194 delete $self->{texture};
1195 $self->check_size;
1075 $self->update; 1196 $self->update;
1076} 1197}
1077 1198
1078sub set_markup { 1199sub set_markup {
1079 my ($self, $markup) = @_; 1200 my ($self, $markup) = @_;
1080 1201
1081 $self->{layout}->set_markup ($markup); 1202 $self->{layout}->set_markup ($markup);
1082 1203
1083 delete $self->{texture}; 1204 delete $self->{texture};
1205 $self->check_size;
1084 $self->update; 1206 $self->update;
1085} 1207}
1086 1208
1087sub size_request { 1209sub size_request {
1088 my ($self) = @_; 1210 my ($self) = @_;
1089 1211
1090 $self->{layout}->set_width; 1212 $self->{layout}->set_font ($self->{font}) if $self->{font};
1213 $self->{layout}->set_width ($self->{max_w} || -1);
1091 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1214 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1092 1215
1093 my ($w, $h) = $self->{layout}->size; 1216 my ($w, $h) = $self->{layout}->size;
1094 1217
1095 if (exists $self->{template}) { 1218 if (exists $self->{template}) {
1219 $self->{template}->set_font ($self->{font}) if $self->{font};
1096 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1220 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1097 1221
1098 my ($w2, $h2) = $self->{template}->size; 1222 my ($w2, $h2) = $self->{template}->size;
1099 1223
1100 $w = List::Util::max $w, $w2; 1224 $w = List::Util::max $w, $w2;
… …
1111 my ($self, $w, $h) = @_; 1235 my ($self, $w, $h) = @_;
1112 1236
1113 delete $self->{texture}; 1237 delete $self->{texture};
1114} 1238}
1115 1239
1240sub set_fontsize {
1241 my ($self, $fontsize) = @_;
1242
1243 $self->{fontsize} = $fontsize;
1244 delete $self->{texture};
1245 $self->check_size;
1246 $self->update;
1247}
1248
1116sub _draw { 1249sub _draw {
1117 my ($self) = @_; 1250 my ($self) = @_;
1118 1251
1119 my $tex = $self->{texture} ||= do { 1252 my $tex = $self->{texture} ||= do {
1253 $self->{layout}->set_font ($self->{font}) if $self->{font};
1120 $self->{layout}->set_width ($self->{w}); 1254 $self->{layout}->set_width ($self->{w});
1121 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1255 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1122 new_from_layout CFClient::Texture $self->{layout} 1256 new_from_layout CFClient::Texture $self->{layout}
1123 }; 1257 };
1124 1258
… …
1157 1291
1158sub new { 1292sub new {
1159 my $class = shift; 1293 my $class = shift;
1160 1294
1161 $class->SUPER::new ( 1295 $class->SUPER::new (
1162 fg => [1, 1, 1], 1296 fg => [1, 1, 1],
1163 bg => [0, 0, 0, 0.2], 1297 bg => [0, 0, 0, 0.2],
1164 active_bg => [1, 1, 1, 0.5], 1298 active_bg => [1, 1, 1, 0.5],
1165 active_fg => [0, 0, 0], 1299 active_fg => [0, 0, 0],
1166 can_hover => 1, 1300 can_hover => 1,
1167 can_focus => 1, 1301 can_focus => 1,
1168 valign => 0, 1302 valign => 0,
1303 can_events => 1,
1169 @_ 1304 @_
1170 ) 1305 )
1171} 1306}
1172 1307
1173sub _set_text { 1308sub _set_text {
… …
1201} 1336}
1202 1337
1203sub size_allocate { 1338sub size_allocate {
1204 my ($self, $w, $h) = @_; 1339 my ($self, $w, $h) = @_;
1205 1340
1206 $self->_set_text ($self->{text}); 1341 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1207} 1342}
1208 1343
1209sub set_text { 1344sub set_text {
1210 my ($self, $text) = @_; 1345 my ($self, $text) = @_;
1211 1346
… …
1344our @ISA = CFClient::UI::Label::; 1479our @ISA = CFClient::UI::Label::;
1345 1480
1346use CFClient::OpenGL; 1481use CFClient::OpenGL;
1347 1482
1348my @tex = 1483my @tex =
1349 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1484 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1350 qw(b1_button_active.png); 1485 qw(b1_button_active.png);
1351 1486
1352sub new { 1487sub new {
1353 my $class = shift; 1488 my $class = shift;
1354 1489
1355 $class->SUPER::new ( 1490 $class->SUPER::new (
1356 padding => 4, 1491 padding => 4,
1357 fg => [1, 1, 1], 1492 fg => [1, 1, 1],
1358 bg => [1, 1, 1, 0.2], 1493 bg => [1, 1, 1, 0.2],
1359 active_fg => [0, 0, 1], 1494 active_fg => [0, 0, 1],
1360 can_hover => 1, 1495 can_hover => 1,
1361 align => 0, 1496 align => 0,
1362 valign => 0, 1497 valign => 0,
1498 can_events => 1,
1363 @_ 1499 @_
1364 ) 1500 )
1365} 1501}
1366 1502
1367sub button_up { 1503sub button_up {
… …
1401package CFClient::UI::CheckBox; 1537package CFClient::UI::CheckBox;
1402 1538
1403our @ISA = CFClient::UI::DrawBG::; 1539our @ISA = CFClient::UI::DrawBG::;
1404 1540
1405my @tex = 1541my @tex =
1406 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1542 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1407 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1543 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1408 1544
1409use CFClient::OpenGL; 1545use CFClient::OpenGL;
1410 1546
1411sub new { 1547sub new {
… …
1460 glDisable GL_BLEND; 1596 glDisable GL_BLEND;
1461} 1597}
1462 1598
1463############################################################################# 1599#############################################################################
1464 1600
1601package CFClient::UI::Image;
1602
1603our @ISA = CFClient::UI::Base::;
1604
1605use CFClient::OpenGL;
1606use Carp qw/confess/;
1607
1608our %loaded_images;
1609
1610sub new {
1611 my $class = shift;
1612
1613 my $self = $class->SUPER::new (can_events => 0, @_);
1614
1615 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1616
1617 $loaded_images{$self->{image}} ||=
1618 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1619
1620 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1621
1622 Scalar::Util::weaken $loaded_images{$self->{image}};
1623
1624 $self->{aspect} = $tex->{w} / $tex->{h};
1625
1626 $self
1627}
1628
1629sub size_request {
1630 my ($self) = @_;
1631
1632 ($self->{tex}->{w}, $self->{tex}->{h})
1633}
1634
1635sub _draw {
1636 my ($self) = @_;
1637
1638 my $tex = $self->{tex};
1639
1640 my ($w, $h) = ($self->{w}, $self->{h});
1641
1642 if ($self->{rot90}) {
1643 glRotate 90, 0, 0, 1;
1644 glTranslate 0, -$self->{w}, 0;
1645
1646 ($w, $h) = ($h, $w);
1647 }
1648
1649 glEnable GL_BLEND;
1650 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1651 glEnable GL_TEXTURE_2D;
1652 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1653
1654 $tex->draw_quad (0, 0, $w, $h);
1655
1656 glDisable GL_BLEND;
1657 glDisable GL_TEXTURE_2D;
1658}
1659
1660#############################################################################
1661
1465package CFClient::UI::VGauge; 1662package CFClient::UI::VGauge;
1466 1663
1467our @ISA = CFClient::UI::Base::; 1664our @ISA = CFClient::UI::Base::;
1665
1666use List::Util qw(min max);
1468 1667
1469use CFClient::OpenGL; 1668use CFClient::OpenGL;
1470 1669
1471my %tex = ( 1670my %tex = (
1472 food => [ 1671 food => [
1473 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1672 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1474 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1673 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1475 ], 1674 ],
1476 grace => [ 1675 grace => [
1477 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1676 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1478 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1677 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1479 ], 1678 ],
1480 hp => [ 1679 hp => [
1481 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1680 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1482 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1681 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1483 ], 1682 ],
1484 mana => [ 1683 mana => [
1485 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1684 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1486 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1685 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1487 ], 1686 ],
1488); 1687);
1489 1688
1490# eg. VGauge->new (gauge => 'food'), default gauge: food 1689# eg. VGauge->new (gauge => 'food'), default gauge: food
1491sub new { 1690sub new {
… …
1529 1728
1530sub _draw { 1729sub _draw {
1531 my ($self) = @_; 1730 my ($self) = @_;
1532 1731
1533 my $tex = $tex{$self->{type}}; 1732 my $tex = $tex{$self->{type}};
1733 my ($t1, $t2, $t3) = @$tex;
1534 1734
1535 my ($w, $h) = ($self->{w}, $self->{h}); 1735 my ($w, $h) = ($self->{w}, $self->{h});
1536 1736
1537 if ($self->{vertical}) { 1737 if ($self->{vertical}) {
1538 glRotate 90, 0, 0, 1; 1738 glRotate 90, 0, 0, 1;
… …
1540 1740
1541 ($w, $h) = ($h, $w); 1741 ($w, $h) = ($h, $w);
1542 } 1742 }
1543 1743
1544 my $ycut = $self->{val} / ($self->{max_val} || 1); 1744 my $ycut = $self->{val} / ($self->{max_val} || 1);
1545 $ycut = 1 if $self->{val} > $self->{max_val};
1546 1745
1547 my $t1 = $tex->[0]; 1746 my $ycut1 = max 0, min 1, $ycut;
1548 my $t2 = $tex->[1]; 1747 my $ycut2 = max 0, min 1, $ycut - 1;
1748
1749 my $h1 = $self->{h} * (1 - $ycut1);
1750 my $h2 = $self->{h} * (1 - $ycut2);
1549 1751
1550 glEnable GL_BLEND; 1752 glEnable GL_BLEND;
1551 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1753 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1552 glEnable GL_TEXTURE_2D; 1754 glEnable GL_TEXTURE_2D;
1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1755 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1554 1756
1555 my $h1 = $self->{h} - $ycut * $self->{h};
1556 my $h2 = $ycut * $self->{h};
1557
1558 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1757 glBindTexture GL_TEXTURE_2D, $t1->{name};
1559 glBegin GL_QUADS; 1758 glBegin GL_QUADS;
1560 glTexCoord 0 , 0; glVertex 0 , 0; 1759 glTexCoord 0 , 0; glVertex 0 , 0;
1561 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1760 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1562 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1761 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1563 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1762 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1564 glEnd; 1763 glEnd;
1565 1764
1765 my $ycut1 = List::Util::min 1, $ycut;
1566 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1766 glBindTexture GL_TEXTURE_2D, $t2->{name};
1567 glBegin GL_QUADS; 1767 glBegin GL_QUADS;
1568 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1768 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1569 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1769 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1570 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1770 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1571 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1771 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1572 glEnd; 1772 glEnd;
1773
1774 if ($t3) {
1775 glBindTexture GL_TEXTURE_2D, $t3->{name};
1776 glBegin GL_QUADS;
1777 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1778 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1779 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1780 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1781 glEnd;
1782 }
1573 1783
1574 glDisable GL_BLEND; 1784 glDisable GL_BLEND;
1575 glDisable GL_TEXTURE_2D; 1785 glDisable GL_TEXTURE_2D;
1576} 1786}
1577 1787
… …
1580package CFClient::UI::Gauge; 1790package CFClient::UI::Gauge;
1581 1791
1582our @ISA = CFClient::UI::VBox::; 1792our @ISA = CFClient::UI::VBox::;
1583 1793
1584sub new { 1794sub new {
1585 my ($class, %arg) = shift; 1795 my ($class, %arg) = @_;
1586 1796
1587 my $self = $class->SUPER::new ( 1797 my $self = $class->SUPER::new (
1588 @_, 1798 tooltip => $arg{type},
1799 can_hover => 1,
1800 %arg,
1589 ); 1801 );
1590 1802
1591 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1803 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1592 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 1804 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1593 $self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1805 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1594 1806
1595 $self 1807 $self
1808}
1809
1810sub set_fontsize {
1811 my ($self, $fsize) = @_;
1812
1813 $self->{value}->set_fontsize ($fsize);
1814 $self->{max} ->set_fontsize ($fsize);
1596} 1815}
1597 1816
1598sub set_value { 1817sub set_value {
1599 my ($self, $val, $max) = @_; 1818 my ($self, $val, $max) = @_;
1600 1819
… …
1757 1976
1758sub new { 1977sub new {
1759 my $class = shift; 1978 my $class = shift;
1760 1979
1761 my $self = $class->SUPER::new ( 1980 my $self = $class->SUPER::new (
1762 fontsize => 1, 1981 fontsize => 1,
1982 can_events => 0,
1983 #font => default_font
1763 @_, 1984 @_,
1764 1985
1765 layout => (new CFClient::Layout), 1986 layout => (new CFClient::Layout),
1766 par => [], 1987 par => [],
1767 height => 0, 1988 height => 0,
1768 children => [ 1989 children => [
1769 (new CFClient::UI::Empty expand => 1), 1990 (new CFClient::UI::Empty expand => 1),
1770 (new CFClient::UI::Slider vertical => 1), 1991 (new CFClient::UI::Slider vertical => 1),
1771 ], 1992 ],
1772 ); 1993 );
1773 1994
… …
1807sub size_allocate { 2028sub size_allocate {
1808 my ($self, $w, $h) = @_; 2029 my ($self, $w, $h) = @_;
1809 2030
1810 $self->SUPER::size_allocate ($w, $h); 2031 $self->SUPER::size_allocate ($w, $h);
1811 2032
2033 $self->{layout}->set_font ($self->{font}) if $self->{font};
1812 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2034 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1813 $self->{layout}->set_width ($self->{children}[0]{w}); 2035 $self->{layout}->set_width ($self->{children}[0]{w});
1814 2036
1815 $self->reflow; 2037 $self->reflow;
1816} 2038}
… …
1868 my $y1 = $top + $self->{h}; 2090 my $y1 = $top + $self->{h};
1869 2091
1870 my $y = 0; 2092 my $y = 0;
1871 2093
1872 my $layout = $self->{layout}; 2094 my $layout = $self->{layout};
2095
2096 $layout->set_font ($self->{font}) if $self->{font};
1873 2097
1874 for my $par (@{$self->{par}}) { 2098 for my $par (@{$self->{par}}) {
1875 my $h = $par->[0]; 2099 my $h = $par->[0];
1876 2100
1877 if ($y0 < $y + $h && $y < $y1) { 2101 if ($y0 < $y + $h && $y < $y1) {
… …
1955 2179
1956sub new { 2180sub new {
1957 my $class = shift; 2181 my $class = shift;
1958 2182
1959 my $self = $class->SUPER::new ( 2183 my $self = $class->SUPER::new (
1960 state => 0, 2184 state => 0,
1961 connect_activate => \&toggle_flopper, 2185 connect_activate => \&toggle_flopper,
1962 @_ 2186 @_
1963 ); 2187 );
1964 2188
1965 if ($self->{state}) { 2189 if ($self->{state}) {
… …
1986 $self->emit (changed => $self->{state}); 2210 $self->emit (changed => $self->{state});
1987} 2211}
1988 2212
1989############################################################################# 2213#############################################################################
1990 2214
2215package CFClient::UI::Tooltip;
2216
2217our @ISA = CFClient::UI::Bin::;
2218
2219use CFClient::OpenGL;
2220
2221sub new {
2222 my $class = shift;
2223
2224 $class->SUPER::new (
2225 @_,
2226 can_events => 0,
2227 )
2228}
2229
2230sub set_markup {
2231 my ($self, $text) = @_;
2232
2233 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2234 $self->{label}->set_markup ($text);
2235 $self->add ($self->{label});
2236}
2237
2238sub size_request {
2239 my ($self) = @_;
2240
2241 $self->child->set_max_size ($::WIDTH * 0.3);
2242
2243 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2244
2245 ($w + 4, $h + 4)
2246}
2247
2248sub size_allocate {
2249 my ($self, $w, $h) = @_;
2250
2251 $self->SUPER::size_allocate ($w - 4, $h - 4);
2252}
2253
2254sub _draw {
2255 my ($self) = @_;
2256
2257 glPushMatrix;
2258 glTranslate 0.375, 0.375;
2259
2260 my ($w, $h) = @$self{qw(w h)};
2261
2262 glColor 1, 0.8, 0.4;
2263 glBegin GL_QUADS;
2264 glVertex 0 , 0;
2265 glVertex 0 , $h;
2266 glVertex $w, $h;
2267 glVertex $w, 0;
2268 glEnd;
2269
2270 glColor 0, 0, 0;
2271 glBegin GL_LINE_LOOP;
2272 glVertex 0 , 0;
2273 glVertex 0 , $h;
2274 glVertex $w, $h;
2275 glVertex $w, 0;
2276 glEnd;
2277
2278 glPopMatrix;
2279
2280 glTranslate 2, 2;
2281 $self->SUPER::_draw;
2282}
2283
2284#############################################################################
2285
2286package CFClient::UI::Face;
2287
2288our @ISA = CFClient::UI::Base::;
2289
2290use CFClient::OpenGL;
2291
2292sub new {
2293 my $class = shift;
2294
2295 $class->SUPER::new (
2296 aspect => 1,
2297 @_,
2298 )
2299}
2300
2301sub size_request {
2302 (32, 8)
2303}
2304
2305sub draw {
2306 my ($self) = @_;
2307
2308 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2309
2310 if ($tex) {
2311 glEnable GL_BLEND;
2312 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2313 glEnable GL_TEXTURE_2D;
2314 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2315 glColor 1, 1, 1, 1;
2316 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2317 glDisable GL_TEXTURE_2D;
2318 glDisable GL_BLEND;
2319 }
2320}
2321
2322#############################################################################
2323
1991package CFClient::UI::Root; 2324package CFClient::UI::Root;
1992 2325
1993our @ISA = CFClient::UI::Container::; 2326our @ISA = CFClient::UI::Container::;
1994 2327
1995use CFClient::OpenGL; 2328use CFClient::OpenGL;
1996 2329
1997sub check_size { 2330sub check_size {
1998 my ($self) = @_; 2331 my ($self) = @_;
1999 2332
2000 $self->configure (0, 0, $::WITH, $::HEIGHT); 2333 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2001} 2334}
2002 2335
2003sub size_request { 2336sub size_request {
2004 ($::WIDTH, $::HEIGHT) 2337 ($::WIDTH, $::HEIGHT)
2005} 2338}
… …
2007sub configure { 2340sub configure {
2008 my ($self, $x, $y, $w, $h) = @_; 2341 my ($self, $x, $y, $w, $h) = @_;
2009 2342
2010 $self->SUPER::configure ($x, $y, $w, $h); 2343 $self->SUPER::configure ($x, $y, $w, $h);
2011 2344
2012 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2013 for @{$self->{children}}; 2345 for my $child (@{$self->{children}}) {
2346 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2347
2348 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2349 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2350 $child->configure ($X, $Y, $W,$H);
2351 }
2014} 2352}
2015 2353
2016sub _topleft { 2354sub _topleft {
2017 my ($self, $x, $y) = @_; 2355 my ($self, $x, $y) = @_;
2018 2356
… …
2026 ::refresh (); 2364 ::refresh ();
2027} 2365}
2028 2366
2029sub add { 2367sub add {
2030 my ($self, $child) = @_; 2368 my ($self, $child) = @_;
2369
2370 # integerize window positions
2371 $child->{x} = int $child->{x};
2372 $child->{y} = int $child->{y};
2031 2373
2032 $self->SUPER::add ($child); 2374 $self->SUPER::add ($child);
2033} 2375}
2034 2376
2035sub on_refresh { 2377sub on_refresh {
… …
2061############################################################################# 2403#############################################################################
2062 2404
2063package CFClient::UI; 2405package CFClient::UI;
2064 2406
2065$ROOT = new CFClient::UI::Root; 2407$ROOT = new CFClient::UI::Root;
2408$TOOLTIP = new CFClient::UI::Tooltip;
2066 2409
20671 24101
2068 2411

Diff Legend

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