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.141 by root, Thu Apr 20 07:12:57 2006 UTC vs.
Revision 1.164 by root, Mon Apr 24 06:57:39 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 can_events => 0,
757 @_
758 );
759
645 $self->{title} &&= new CFClient::UI::Label 760 $self->{title} &&= new CFClient::UI::Label
646 align => 0, 761 align => 0,
647 valign => 1, 762 valign => 1,
648 text => $self->{title}, 763 text => $self->{title},
649 fontsize => 1; 764 fontsize => 1;
… …
656} 771}
657 772
658sub size_request { 773sub size_request {
659 my ($self) = @_; 774 my ($self) = @_;
660 775
661 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
662
663 my ($w, $h) = $self->SUPER::size_request; 776 my ($w, $h) = $self->SUPER::size_request;
664 777
665 ( 778 (
666 $w + $self->border * 2, 779 $w + $self->border * 2,
667 $h + $self->border * 2, 780 $h + $self->border * 2,
… …
799 912
800# TODO: move to container class maybe? send childs a signal on removal? 913# TODO: move to container class maybe? send childs a signal on removal?
801sub clear { 914sub clear {
802 my ($self) = @_; 915 my ($self) = @_;
803 916
804 delete $self->{children}; 917 my $children = delete $self->{children};
918
919 for (grep $_, map @$_, grep $_, @$children) {
920 delete $_->{parent};
921 $_->hide;
922 }
923
805 $self->update; 924 $self->update;
806} 925}
807 926
808sub get_wh { 927sub get_wh {
809 my ($self) = @_; 928 my ($self) = @_;
… …
815 or next; 934 or next;
816 935
817 for my $x (0 .. $#$row) { 936 for my $x (0 .. $#$row) {
818 my $widget = $row->[$x] 937 my $widget = $row->[$x]
819 or next; 938 or next;
820 my ($w, $h) = $widget->size_request; 939 my ($w, $h) = @$widget{qw(req_w req_h)};
821 940
822 $w[$x] = max $w[$x], $w; 941 $w[$x] = max $w[$x], $w;
823 $h[$y] = max $h[$y], $h; 942 $h[$y] = max $h[$y], $h;
824 } 943 }
825 } 944 }
… …
930 1049
931 ($h, $w) = ($w, $h); 1050 ($h, $w) = ($w, $h);
932 1051
933 my $children = $self->{children}; 1052 my $children = $self->{children};
934 1053
935 my @h = map +($_->size_request)[0], @$children; 1054 my @h = map $_->{req_w}, @$children;
936 1055
937 my $req_h = List::Util::sum @h; 1056 my $req_h = List::Util::sum @h;
938 1057
939 if ($req_h > $h) { 1058 if ($req_h > $h) {
940 # ah well, not enough space 1059 # ah well, not enough space
… …
988sub size_allocate { 1107sub size_allocate {
989 my ($self, $w, $h) = @_; 1108 my ($self, $w, $h) = @_;
990 1109
991 my $children = $self->{children}; 1110 my $children = $self->{children};
992 1111
993 my @h = map +($_->size_request)[1], @$children; 1112 my @h = map $_->{req_h}, @$children;
994 1113
995 my $req_h = List::Util::sum @h; 1114 my $req_h = List::Util::sum @h;
996 1115
997 if ($req_h > $h) { 1116 if ($req_h > $h) {
998 # ah well, not enough space 1117 # ah well, not enough space
… …
1032 1151
1033sub new { 1152sub new {
1034 my ($class, %arg) = @_; 1153 my ($class, %arg) = @_;
1035 1154
1036 my $self = $class->SUPER::new ( 1155 my $self = $class->SUPER::new (
1037 fg => [1, 1, 1], 1156 fg => [1, 1, 1],
1157 #font => default_font
1038 fontsize => 1, 1158 fontsize => 1,
1039 text => "", 1159 text => "",
1040 align => -1, 1160 align => -1,
1041 valign => -1, 1161 valign => -1,
1042 padding => 2, 1162 padding => 2,
1043 layout => new CFClient::Layout, 1163 layout => new CFClient::Layout,
1164 can_events => 0,
1044 %arg 1165 %arg
1045 ); 1166 );
1046 1167
1047 if (exists $self->{template}) { 1168 if (exists $self->{template}) {
1048 my $layout = new CFClient::Layout; 1169 my $layout = new CFClient::Layout;
… …
1054 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1175 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1055 1176
1056 $self 1177 $self
1057} 1178}
1058 1179
1059sub escape_text { 1180sub escape {
1060 local $_ = $_[1]; 1181 local $_ = $_[1];
1061 1182
1062 s/&/&amp;/g; 1183 s/&/&amp;/g;
1063 s/>/&gt;/g; 1184 s/>/&gt;/g;
1064 s/</&lt;/g; 1185 s/</&lt;/g;
… …
1070 my ($self, $text) = @_; 1191 my ($self, $text) = @_;
1071 1192
1072 $self->{layout}->set_text ($text); 1193 $self->{layout}->set_text ($text);
1073 1194
1074 delete $self->{texture}; 1195 delete $self->{texture};
1196 $self->check_size;
1075 $self->update; 1197 $self->update;
1076} 1198}
1077 1199
1078sub set_markup { 1200sub set_markup {
1079 my ($self, $markup) = @_; 1201 my ($self, $markup) = @_;
1080 1202
1081 $self->{layout}->set_markup ($markup); 1203 $self->{layout}->set_markup ($markup);
1082 1204
1083 delete $self->{texture}; 1205 delete $self->{texture};
1206 $self->check_size;
1084 $self->update; 1207 $self->update;
1085} 1208}
1086 1209
1087sub size_request { 1210sub size_request {
1088 my ($self) = @_; 1211 my ($self) = @_;
1089 1212
1090 $self->{layout}->set_width; 1213 $self->{layout}->set_font ($self->{font}) if $self->{font};
1214 $self->{layout}->set_width ($self->{max_w} || -1);
1091 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1215 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1092 1216
1093 my ($w, $h) = $self->{layout}->size; 1217 my ($w, $h) = $self->{layout}->size;
1094 1218
1095 if (exists $self->{template}) { 1219 if (exists $self->{template}) {
1220 $self->{template}->set_font ($self->{font}) if $self->{font};
1096 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1221 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1097 1222
1098 my ($w2, $h2) = $self->{template}->size; 1223 my ($w2, $h2) = $self->{template}->size;
1099 1224
1100 $w = List::Util::max $w, $w2; 1225 $w = List::Util::max $w, $w2;
… …
1111 my ($self, $w, $h) = @_; 1236 my ($self, $w, $h) = @_;
1112 1237
1113 delete $self->{texture}; 1238 delete $self->{texture};
1114} 1239}
1115 1240
1241sub set_fontsize {
1242 my ($self, $fontsize) = @_;
1243
1244 $self->{fontsize} = $fontsize;
1245 delete $self->{texture};
1246 $self->check_size;
1247 $self->update;
1248}
1249
1116sub _draw { 1250sub _draw {
1117 my ($self) = @_; 1251 my ($self) = @_;
1118 1252
1119 my $tex = $self->{texture} ||= do { 1253 my $tex = $self->{texture} ||= do {
1254 $self->{layout}->set_font ($self->{font}) if $self->{font};
1120 $self->{layout}->set_width ($self->{w}); 1255 $self->{layout}->set_width ($self->{w});
1121 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1256 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1122 new_from_layout CFClient::Texture $self->{layout} 1257 new_from_layout CFClient::Texture $self->{layout}
1123 }; 1258 };
1124 1259
… …
1157 1292
1158sub new { 1293sub new {
1159 my $class = shift; 1294 my $class = shift;
1160 1295
1161 $class->SUPER::new ( 1296 $class->SUPER::new (
1162 fg => [1, 1, 1], 1297 fg => [1, 1, 1],
1163 bg => [0, 0, 0, 0.2], 1298 bg => [0, 0, 0, 0.2],
1164 active_bg => [1, 1, 1, 0.5], 1299 active_bg => [1, 1, 1, 0.5],
1165 active_fg => [0, 0, 0], 1300 active_fg => [0, 0, 0],
1166 can_hover => 1, 1301 can_hover => 1,
1167 can_focus => 1, 1302 can_focus => 1,
1168 valign => 0, 1303 valign => 0,
1304 can_events => 1,
1169 @_ 1305 @_
1170 ) 1306 )
1171} 1307}
1172 1308
1173sub _set_text { 1309sub _set_text {
… …
1201} 1337}
1202 1338
1203sub size_allocate { 1339sub size_allocate {
1204 my ($self, $w, $h) = @_; 1340 my ($self, $w, $h) = @_;
1205 1341
1206 $self->_set_text ($self->{text}); 1342 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1207} 1343}
1208 1344
1209sub set_text { 1345sub set_text {
1210 my ($self, $text) = @_; 1346 my ($self, $text) = @_;
1211 1347
… …
1344our @ISA = CFClient::UI::Label::; 1480our @ISA = CFClient::UI::Label::;
1345 1481
1346use CFClient::OpenGL; 1482use CFClient::OpenGL;
1347 1483
1348my @tex = 1484my @tex =
1349 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1485 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1350 qw(b1_button_active.png); 1486 qw(b1_button_active.png);
1351 1487
1352sub new { 1488sub new {
1353 my $class = shift; 1489 my $class = shift;
1354 1490
1355 $class->SUPER::new ( 1491 $class->SUPER::new (
1356 padding => 4, 1492 padding => 4,
1357 fg => [1, 1, 1], 1493 fg => [1, 1, 1],
1358 bg => [1, 1, 1, 0.2], 1494 bg => [1, 1, 1, 0.2],
1359 active_fg => [0, 0, 1], 1495 active_fg => [0, 0, 1],
1360 can_hover => 1, 1496 can_hover => 1,
1361 align => 0, 1497 align => 0,
1362 valign => 0, 1498 valign => 0,
1499 can_events => 1,
1363 @_ 1500 @_
1364 ) 1501 )
1365} 1502}
1366 1503
1367sub button_up { 1504sub button_up {
… …
1401package CFClient::UI::CheckBox; 1538package CFClient::UI::CheckBox;
1402 1539
1403our @ISA = CFClient::UI::DrawBG::; 1540our @ISA = CFClient::UI::DrawBG::;
1404 1541
1405my @tex = 1542my @tex =
1406 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1543 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1407 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1544 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1408 1545
1409use CFClient::OpenGL; 1546use CFClient::OpenGL;
1410 1547
1411sub new { 1548sub new {
… …
1460 glDisable GL_BLEND; 1597 glDisable GL_BLEND;
1461} 1598}
1462 1599
1463############################################################################# 1600#############################################################################
1464 1601
1602package CFClient::UI::Image;
1603
1604our @ISA = CFClient::UI::Base::;
1605
1606use CFClient::OpenGL;
1607use Carp qw/confess/;
1608
1609our %loaded_images;
1610
1611sub new {
1612 my $class = shift;
1613
1614 my $self = $class->SUPER::new (can_events => 0, @_);
1615
1616 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1617
1618 $loaded_images{$self->{image}} ||=
1619 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1620
1621 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1622
1623 Scalar::Util::weaken $loaded_images{$self->{image}};
1624
1625 $self->{aspect} = $tex->{w} / $tex->{h};
1626
1627 $self
1628}
1629
1630sub size_request {
1631 my ($self) = @_;
1632
1633 ($self->{tex}->{w}, $self->{tex}->{h})
1634}
1635
1636sub _draw {
1637 my ($self) = @_;
1638
1639 my $tex = $self->{tex};
1640
1641 my ($w, $h) = ($self->{w}, $self->{h});
1642
1643 if ($self->{rot90}) {
1644 glRotate 90, 0, 0, 1;
1645 glTranslate 0, -$self->{w}, 0;
1646
1647 ($w, $h) = ($h, $w);
1648 }
1649
1650 glEnable GL_BLEND;
1651 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1652 glEnable GL_TEXTURE_2D;
1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1654
1655 $tex->draw_quad (0, 0, $w, $h);
1656
1657 glDisable GL_BLEND;
1658 glDisable GL_TEXTURE_2D;
1659}
1660
1661#############################################################################
1662
1465package CFClient::UI::VGauge; 1663package CFClient::UI::VGauge;
1466 1664
1467our @ISA = CFClient::UI::Base::; 1665our @ISA = CFClient::UI::Base::;
1666
1667use List::Util qw(min max);
1468 1668
1469use CFClient::OpenGL; 1669use CFClient::OpenGL;
1470 1670
1471my %tex = ( 1671my %tex = (
1472 food => [ 1672 food => [
1473 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1673 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1474 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1674 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1475 ], 1675 ],
1476 grace => [ 1676 grace => [
1477 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1677 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1478 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1678 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1479 ], 1679 ],
1480 hp => [ 1680 hp => [
1481 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1681 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1482 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1682 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1483 ], 1683 ],
1484 mana => [ 1684 mana => [
1485 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1685 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1486 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1686 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1487 ], 1687 ],
1488); 1688);
1489 1689
1490# eg. VGauge->new (gauge => 'food'), default gauge: food 1690# eg. VGauge->new (gauge => 'food'), default gauge: food
1491sub new { 1691sub new {
… …
1502} 1702}
1503 1703
1504sub size_request { 1704sub size_request {
1505 my ($self) = @_; 1705 my ($self) = @_;
1506 1706
1507 my $tex = $tex{$self->{type}}[0]; 1707 #my $tex = $tex{$self->{type}}[0];
1508
1509 @$tex{qw(w h)} 1708 #@$tex{qw(w h)}
1709 (0, 0)
1510} 1710}
1511 1711
1512sub set_max { 1712sub set_max {
1513 my ($self, $max) = @_; 1713 my ($self, $max) = @_;
1514 1714
… …
1529 1729
1530sub _draw { 1730sub _draw {
1531 my ($self) = @_; 1731 my ($self) = @_;
1532 1732
1533 my $tex = $tex{$self->{type}}; 1733 my $tex = $tex{$self->{type}};
1734 my ($t1, $t2, $t3) = @$tex;
1534 1735
1535 my ($w, $h) = ($self->{w}, $self->{h}); 1736 my ($w, $h) = ($self->{w}, $self->{h});
1536 1737
1738 if ($self->{vertical}) {
1739 glRotate 90, 0, 0, 1;
1740 glTranslate 0, -$self->{w}, 0;
1741
1742 ($w, $h) = ($h, $w);
1743 }
1744
1537 my $ycut = $self->{val} / ($self->{max_val} || 1); 1745 my $ycut = $self->{val} / ($self->{max_val} || 1);
1538 $ycut = 1 if $self->{val} > $self->{max_val};
1539 1746
1540 my $t1 = $tex->[0]; 1747 my $ycut1 = max 0, min 1, $ycut;
1541 my $t2 = $tex->[1]; 1748 my $ycut2 = max 0, min 1, $ycut - 1;
1749
1750 my $h1 = $self->{h} * (1 - $ycut1);
1751 my $h2 = $self->{h} * (1 - $ycut2);
1542 1752
1543 glEnable GL_BLEND; 1753 glEnable GL_BLEND;
1544 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1754 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1545 glEnable GL_TEXTURE_2D; 1755 glEnable GL_TEXTURE_2D;
1546 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1756 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1547 1757
1548 my $h1 = $self->{h} - $ycut * $self->{h};
1549 my $h2 = $ycut * $self->{h};
1550
1551 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1758 glBindTexture GL_TEXTURE_2D, $t1->{name};
1552 glBegin GL_QUADS; 1759 glBegin GL_QUADS;
1553 glTexCoord 0 , 0; glVertex 0 , 0; 1760 glTexCoord 0 , 0; glVertex 0 , 0;
1554 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1761 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1555 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1762 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1556 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1763 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1557 glEnd; 1764 glEnd;
1558 1765
1766 my $ycut1 = List::Util::min 1, $ycut;
1559 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1767 glBindTexture GL_TEXTURE_2D, $t2->{name};
1560 glBegin GL_QUADS; 1768 glBegin GL_QUADS;
1561 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1769 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1562 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1770 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1563 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1771 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1564 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1772 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1565 glEnd; 1773 glEnd;
1774
1775 if ($t3) {
1776 glBindTexture GL_TEXTURE_2D, $t3->{name};
1777 glBegin GL_QUADS;
1778 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1779 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1780 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1781 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1782 glEnd;
1783 }
1566 1784
1567 glDisable GL_BLEND; 1785 glDisable GL_BLEND;
1568 glDisable GL_TEXTURE_2D; 1786 glDisable GL_TEXTURE_2D;
1569} 1787}
1570 1788
… …
1573package CFClient::UI::Gauge; 1791package CFClient::UI::Gauge;
1574 1792
1575our @ISA = CFClient::UI::VBox::; 1793our @ISA = CFClient::UI::VBox::;
1576 1794
1577sub new { 1795sub new {
1578 my ($class, %arg) = shift; 1796 my ($class, %arg) = @_;
1579 1797
1580 my $self = $class->SUPER::new ( 1798 my $self = $class->SUPER::new (
1581 @_, 1799 tooltip => $arg{type},
1800 can_hover => 1,
1801 %arg,
1582 ); 1802 );
1583 1803
1584 $self->add ($self->{value} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1804 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1585 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 1805 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1586 $self->add ($self->{max} = new CFClient::UI::Label valign => 1, align => 0, template => "999"); 1806 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1587 1807
1588 $self 1808 $self
1809}
1810
1811sub set_fontsize {
1812 my ($self, $fsize) = @_;
1813
1814 $self->{value}->set_fontsize ($fsize);
1815 $self->{max} ->set_fontsize ($fsize);
1589} 1816}
1590 1817
1591sub set_value { 1818sub set_value {
1592 my ($self, $val, $max) = @_; 1819 my ($self, $val, $max) = @_;
1593 1820
… …
1750 1977
1751sub new { 1978sub new {
1752 my $class = shift; 1979 my $class = shift;
1753 1980
1754 my $self = $class->SUPER::new ( 1981 my $self = $class->SUPER::new (
1755 fontsize => 1, 1982 fontsize => 1,
1983 can_events => 0,
1984 #font => default_font
1756 @_, 1985 @_,
1757 1986
1758 layout => (new CFClient::Layout), 1987 layout => (new CFClient::Layout),
1759 par => [], 1988 par => [],
1760 height => 0, 1989 height => 0,
1761 children => [ 1990 children => [
1762 (new CFClient::UI::Empty expand => 1), 1991 (new CFClient::UI::Empty expand => 1),
1763 (new CFClient::UI::Slider vertical => 1), 1992 (new CFClient::UI::Slider vertical => 1),
1764 ], 1993 ],
1765 ); 1994 );
1766 1995
… …
1800sub size_allocate { 2029sub size_allocate {
1801 my ($self, $w, $h) = @_; 2030 my ($self, $w, $h) = @_;
1802 2031
1803 $self->SUPER::size_allocate ($w, $h); 2032 $self->SUPER::size_allocate ($w, $h);
1804 2033
2034 $self->{layout}->set_font ($self->{font}) if $self->{font};
1805 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2035 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1806 $self->{layout}->set_width ($self->{children}[0]{w}); 2036 $self->{layout}->set_width ($self->{children}[0]{w});
1807 2037
1808 $self->reflow; 2038 $self->reflow;
1809} 2039}
… …
1861 my $y1 = $top + $self->{h}; 2091 my $y1 = $top + $self->{h};
1862 2092
1863 my $y = 0; 2093 my $y = 0;
1864 2094
1865 my $layout = $self->{layout}; 2095 my $layout = $self->{layout};
2096
2097 $layout->set_font ($self->{font}) if $self->{font};
1866 2098
1867 for my $par (@{$self->{par}}) { 2099 for my $par (@{$self->{par}}) {
1868 my $h = $par->[0]; 2100 my $h = $par->[0];
1869 2101
1870 if ($y0 < $y + $h && $y < $y1) { 2102 if ($y0 < $y + $h && $y < $y1) {
… …
1948 2180
1949sub new { 2181sub new {
1950 my $class = shift; 2182 my $class = shift;
1951 2183
1952 my $self = $class->SUPER::new ( 2184 my $self = $class->SUPER::new (
1953 state => 0, 2185 state => 0,
1954 connect_activate => \&toggle_flopper, 2186 connect_activate => \&toggle_flopper,
1955 @_ 2187 @_
1956 ); 2188 );
1957 2189
1958 if ($self->{state}) { 2190 if ($self->{state}) {
… …
1979 $self->emit (changed => $self->{state}); 2211 $self->emit (changed => $self->{state});
1980} 2212}
1981 2213
1982############################################################################# 2214#############################################################################
1983 2215
2216package CFClient::UI::Tooltip;
2217
2218our @ISA = CFClient::UI::Bin::;
2219
2220use CFClient::OpenGL;
2221
2222sub new {
2223 my $class = shift;
2224
2225 $class->SUPER::new (
2226 @_,
2227 can_events => 0,
2228 )
2229}
2230
2231sub set_markup {
2232 my ($self, $text) = @_;
2233
2234 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2235 $self->{label}->set_markup ($text);
2236 $self->add ($self->{label});
2237}
2238
2239sub size_request {
2240 my ($self) = @_;
2241
2242 $self->child->set_max_size ($::WIDTH * 0.3);
2243
2244 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2245
2246 ($w + 4, $h + 4)
2247}
2248
2249sub size_allocate {
2250 my ($self, $w, $h) = @_;
2251
2252 $self->SUPER::size_allocate ($w - 4, $h - 4);
2253}
2254
2255sub _draw {
2256 my ($self) = @_;
2257
2258 glPushMatrix;
2259 glTranslate 0.375, 0.375;
2260
2261 my ($w, $h) = @$self{qw(w h)};
2262
2263 glColor 1, 0.8, 0.4;
2264 glBegin GL_QUADS;
2265 glVertex 0 , 0;
2266 glVertex 0 , $h;
2267 glVertex $w, $h;
2268 glVertex $w, 0;
2269 glEnd;
2270
2271 glColor 0, 0, 0;
2272 glBegin GL_LINE_LOOP;
2273 glVertex 0 , 0;
2274 glVertex 0 , $h;
2275 glVertex $w, $h;
2276 glVertex $w, 0;
2277 glEnd;
2278
2279 glPopMatrix;
2280
2281 glTranslate 2, 2;
2282 $self->SUPER::_draw;
2283}
2284
2285#############################################################################
2286
2287package CFClient::UI::Face;
2288
2289our @ISA = CFClient::UI::Base::;
2290
2291use CFClient::OpenGL;
2292
2293sub new {
2294 my $class = shift;
2295
2296 $class->SUPER::new (
2297 aspect => 1,
2298 @_,
2299 )
2300}
2301
2302sub size_request {
2303 (32, 8)
2304}
2305
2306sub draw {
2307 my ($self) = @_;
2308
2309 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2310
2311 if ($tex) {
2312 glEnable GL_BLEND;
2313 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2314 glEnable GL_TEXTURE_2D;
2315 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2316 glColor 1, 1, 1, 1;
2317 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2318 glDisable GL_TEXTURE_2D;
2319 glDisable GL_BLEND;
2320 }
2321}
2322
2323#############################################################################
2324
1984package CFClient::UI::Root; 2325package CFClient::UI::Root;
1985 2326
1986our @ISA = CFClient::UI::Container::; 2327our @ISA = CFClient::UI::Container::;
1987 2328
1988use CFClient::OpenGL; 2329use CFClient::OpenGL;
1989 2330
1990sub check_size { 2331sub check_size {
1991 my ($self) = @_; 2332 my ($self) = @_;
1992 2333
1993 $self->configure (0, 0, $::WITH, $::HEIGHT); 2334 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
1994} 2335}
1995 2336
1996sub size_request { 2337sub size_request {
1997 ($::WIDTH, $::HEIGHT) 2338 ($::WIDTH, $::HEIGHT)
1998} 2339}
… …
2000sub configure { 2341sub configure {
2001 my ($self, $x, $y, $w, $h) = @_; 2342 my ($self, $x, $y, $w, $h) = @_;
2002 2343
2003 $self->SUPER::configure ($x, $y, $w, $h); 2344 $self->SUPER::configure ($x, $y, $w, $h);
2004 2345
2005 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2006 for @{$self->{children}}; 2346 for my $child (@{$self->{children}}) {
2347 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2348
2349 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2350 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2351 $child->configure ($X, $Y, $W,$H);
2352 }
2007} 2353}
2008 2354
2009sub _topleft { 2355sub _topleft {
2010 my ($self, $x, $y) = @_; 2356 my ($self, $x, $y) = @_;
2011 2357
… …
2019 ::refresh (); 2365 ::refresh ();
2020} 2366}
2021 2367
2022sub add { 2368sub add {
2023 my ($self, $child) = @_; 2369 my ($self, $child) = @_;
2370
2371 # integerize window positions
2372 $child->{x} = int $child->{x};
2373 $child->{y} = int $child->{y};
2024 2374
2025 $self->SUPER::add ($child); 2375 $self->SUPER::add ($child);
2026} 2376}
2027 2377
2028sub on_refresh { 2378sub on_refresh {
… …
2054############################################################################# 2404#############################################################################
2055 2405
2056package CFClient::UI; 2406package CFClient::UI;
2057 2407
2058$ROOT = new CFClient::UI::Root; 2408$ROOT = new CFClient::UI::Root;
2409$TOOLTIP = new CFClient::UI::Tooltip;
2059 2410
20601 24111
2061 2412

Diff Legend

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