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.173 by root, Tue Apr 25 10:30:48 2006 UTC vs.
Revision 1.183 by elmex, Sun Apr 30 13:10:46 2006 UTC

… …
24 my $tip = $widget->{tooltip}; 24 my $tip = $widget->{tooltip};
25 25
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 27
28 $TOOLTIP->set_markup ($widget->{tooltip}); 28 $TOOLTIP->set_markup ($widget->{tooltip});
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0)); 29
30 $TOOLTIP->show; 30 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
31 } 39 }
32 40
33 return; 41 return;
34 } 42 }
35 } 43 }
… …
229 $self->{w} = $w; 237 $self->{w} = $w;
230 $self->{h} = $h; 238 $self->{h} = $h;
231 239
232 $self->size_allocate ($w, $h); 240 $self->size_allocate ($w, $h);
233 $self->update; 241 $self->update;
242 $self->emit (size_allocate => $w, $h);
234 } 243 }
235} 244}
236 245
237sub size_allocate { 246sub size_allocate {
238 # nothing to be done 247 # nothing to be done
239} 248}
240 249
241sub children { 250sub children {
242} 251}
243 252
244# call when resoltuion changes etc. 253# call when resolution changes etc.
245sub reconfigure { 254sub reconfigure {
246 my ($self) = @_; 255 my ($self) = @_;
247 256
248 $_->reconfigure 257 $_->reconfigure
249 for $self->children; 258 for $self->children;
… …
531 sort { $a->{z} <=> $b->{z} } 540 sort { $a->{z} <=> $b->{z} }
532 @{$self->{children}}, $child 541 @{$self->{children}}, $child
533 ]; 542 ];
534 543
535 $child->check_size; 544 $child->check_size;
545 $self->update;
536} 546}
537 547
538sub children { 548sub children {
539 @{ $_[0]{children} } 549 @{ $_[0]{children} }
540} 550}
… …
559 569
560 for (@$children) { 570 for (@$children) {
561 delete $_->{parent}; 571 delete $_->{parent};
562 $_->hide; 572 $_->hide;
563 } 573 }
574
575 $self->check_size;
576 $self->update;
564} 577}
565 578
566sub find_widget { 579sub find_widget {
567 my ($self, $x, $y) = @_; 580 my ($self, $x, $y) = @_;
568 581
… …
643} 656}
644 657
645sub update { 658sub update {
646 my ($self) = @_; 659 my ($self) = @_;
647 660
648 # we want to do this delayed... 661 $ROOT->on_refresh ($self => sub { $self->render_child });
649 $self->render_chld;
650 $self->SUPER::update; 662 $self->SUPER::update;
651}
652
653sub render_chld {
654 my ($self) = @_;
655
656 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
657 glClearColor 0, 0, 0, 1;
658 glClear GL_COLOR_BUFFER_BIT;
659 $self->child->draw;
660 };
661} 663}
662 664
663sub size_allocate { 665sub size_allocate {
664 my ($self, $w, $h) = @_; 666 my ($self, $w, $h) = @_;
665 667
666 $self->child->configure (0, 0, $w, $h); 668 $self->SUPER::size_allocate ($w, $h);
669 $self->update;
670}
667 671
672sub _render {
673 $_[0]{children}[0]->draw;
674}
675
676sub render_child {
677 my ($self) = @_;
678
679 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
680 glClearColor 0, 0, 0, 0;
681 glClear GL_COLOR_BUFFER_BIT;
682
668 $self->render_chld; 683 $self->_render;
684# glColorMask 1, 1, 1, 0;
685# glEnable GL_BLEND;
686# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
687# glRasterPos 0, 0;
688# glCopyPixels 0, 0, $self->{w}, $self->{h};
689# glDisable GL_BLEND;
690# glColorMask 1, 1, 1, 1;
691 };
669} 692}
670 693
671sub _draw { 694sub _draw {
672 my ($self) = @_; 695 my ($self) = @_;
673 696
… …
675 698
676 my $tex = $self->{texture} 699 my $tex = $self->{texture}
677 or return; 700 or return;
678 701
679 glEnable GL_BLEND; 702 glEnable GL_BLEND;
680 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 703 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
681 glEnable GL_TEXTURE_2D; 704 glEnable GL_TEXTURE_2D;
682 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
706 glColor 0, 0, 0, 1;
683 707
684 $tex->draw_quad (0, 0, $w, $h); 708 $tex->draw_quad (0, 0, $w, $h);
685 709
686 glDisable GL_BLEND; 710 glDisable GL_BLEND;
687 glDisable GL_TEXTURE_2D; 711 glDisable GL_TEXTURE_2D;
… …
691 715
692package CFClient::UI::ViewPort; 716package CFClient::UI::ViewPort;
693 717
694our @ISA = CFClient::UI::Window::; 718our @ISA = CFClient::UI::Window::;
695 719
696sub new { die }
697
698sub size_request { 720sub size_request {
699 my ($self) = @_; 721 my ($self) = @_;
700 722
701 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 723 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
702 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 724 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
703 725
704 @$self{qw(child_w child_h)} 726 @$self{qw(child_w child_h)}
705} 727}
706 728
707sub _draw { 729sub size_allocate {
708 my ($self) = @_; 730 my ($self, $w, $h) = @_;
709 731
710 $self->{children}[1]->draw; 732 $self->update;
711} 733}
712 734
735sub set_offset {
736 my ($self, $x, $y) = @_;
737
738 $self->{view_x} = int $x;
739 $self->{view_y} = int $y;
740
741 $self->update;
742}
743
744sub _render {
745 my ($self) = @_;
746
747 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
748
749 $self->SUPER::_render;
750}
751
752#############################################################################
753
754package CFClient::UI::ScrolledWindow;
755
756our @ISA = CFClient::UI::HBox::;
757
758sub new {
759 my $class = shift;
760
761 my $self;
762
763 my $slider = new CFClient::UI::Slider
764 vertical => 1,
765 range => [0, 0, 1, 0.01], # HACK fix
766 connect_changed => sub {
767 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
768 },
769 ;
770
771 $self = $class->SUPER::new (
772 vp => (new CFClient::UI::ViewPort),
773 slider => $slider,
774 @_,
775 );
776
777 $self->{vp}->add ($self->{scrolled});
778 $self->add ($self->{vp});
779 $self->add ($self->{slider});
780
781 $self
782}
783
784#TODO# update range on size_allocate depeneing on child
785# update viewport offset on scroll
713 786
714############################################################################# 787#############################################################################
715 788
716package CFClient::UI::Frame; 789package CFClient::UI::Frame;
717 790
… …
774 # TODO: user_x, user_y, overwrite moveto? 847 # TODO: user_x, user_y, overwrite moveto?
775 848
776 my $self = $class->SUPER::new ( 849 my $self = $class->SUPER::new (
777 bg => [1, 1, 1, 1], 850 bg => [1, 1, 1, 1],
778 border_bg => [1, 1, 1, 1], 851 border_bg => [1, 1, 1, 1],
779 border => 0.8, 852 border => 0.6,
780 can_events => 1, 853 can_events => 1,
781 @_ 854 @_
782 ); 855 );
783 856
784 $self->{title} &&= new CFClient::UI::Label 857 $self->{title} &&= new CFClient::UI::Label
785 align => 0, 858 align => 0,
786 valign => 1, 859 valign => 1,
787 text => $self->{title}, 860 text => $self->{title},
788 fontsize => 1; 861 fontsize => $self->{border};
789 862
790 $self 863 $self
791} 864}
792 865
793sub border { 866sub border {
… …
818} 891}
819 892
820sub button_down { 893sub button_down {
821 my ($self, $ev, $x, $y) = @_; 894 my ($self, $ev, $x, $y) = @_;
822 895
896 my ($w, $h) = @$self{qw(w h)};
823 my $border = $self->border; 897 my $border = $self->border;
824 898
825 if ($x < $self->{w} && $x >= $self->{w} - $border 899 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
826 && $y < $self->{h} && $y >= $self->{h} - $border) { 900 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
827 901
902 if ($lr & $td) {
903 my ($wx, $wy) = ($self->{x}, $self->{y});
828 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 904 my ($ox, $oy) = ($ev->{x}, $ev->{y});
829 my ($bw, $bh) = ($self->{w}, $self->{h}); 905 my ($bw, $bh) = ($self->{w}, $self->{h});
830 906
907 my $mx = $x < $border;
908 my $my = $y < $border;
909
831 $self->{motion} = sub { 910 $self->{motion} = sub {
832 my ($ev, $x, $y) = @_; 911 my ($ev, $x, $y) = @_;
833 912
834 ($x, $y) = ($ev->{x}, $ev->{y}); 913 my $dx = $ev->{x} - $ox;
914 my $dy = $ev->{y} - $oy;
835 915
836 $self->{user_w} = $bw + $x - $ox; 916 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
837 $self->{user_h} = $bh + $y - $oy; 917 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
918 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
838 $self->check_size; 919 $self->check_size;
839 }; 920 };
840 921
841 } elsif ($x >= 0 && $x < $self->{w} 922 } elsif ($lr ^ $td) {
842 && $y >= 0 && $y < $border) {
843
844 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 923 my ($ox, $oy) = ($ev->{x}, $ev->{y});
845 my ($bx, $by) = ($self->{x}, $self->{y}); 924 my ($bx, $by) = ($self->{x}, $self->{y});
846 925
847 $self->{motion} = sub { 926 $self->{motion} = sub {
848 my ($ev, $x, $y) = @_; 927 my ($ev, $x, $y) = @_;
… …
884 $tex[1]->draw_quad (0, 0, $w, $border); 963 $tex[1]->draw_quad (0, 0, $w, $border);
885 $tex[3]->draw_quad (0, $border, $border, $ch); 964 $tex[3]->draw_quad (0, $border, $border, $ch);
886 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 965 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
887 $tex[4]->draw_quad (0, $h - $border, $w, $border); 966 $tex[4]->draw_quad (0, $h - $border, $w, $border);
888 967
968 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
889 my $bg = $tex[0]; 969 my $bg = $tex[0];
890 970
891 # TODO: repeat texture not scale 971 # TODO: repeat texture not scale
892 my $rep_x = $cw / $bg->{w}; 972 my $rep_x = $cw / $bg->{w};
893 my $rep_y = $ch / $bg->{h}; 973 my $rep_y = $ch / $bg->{h};
894 974
895 glColor @{ $self->{bg} }; 975 glColor @{ $self->{bg} };
896 976
897 $bg->{s} = $rep_x; 977 $bg->{s} = $rep_x;
898 $bg->{t} = $rep_y; 978 $bg->{t} = $rep_y;
899 $bg->{wrap_mode} = 1; 979 $bg->{wrap_mode} = 1;
900 $bg->draw_quad ($border, $border, $cw, $ch); 980 $bg->draw_quad ($border, $border, $cw, $ch);
901 981
902 glDisable GL_TEXTURE_2D; 982 glDisable GL_TEXTURE_2D;
903 glDisable GL_BLEND; 983 glDisable GL_BLEND;
984 }
904 985
905 $self->{title}->draw if $self->{title}; 986 $self->{title}->draw if $self->{title};
987
906 $self->child->draw; 988 $self->child->draw;
907} 989}
908 990
909############################################################################# 991#############################################################################
910 992
… …
1934 # TODO: calculations are off 2016 # TODO: calculations are off
1935 my $self = $class->SUPER::new ( 2017 my $self = $class->SUPER::new (
1936 fg => [1, 1, 1], 2018 fg => [1, 1, 1],
1937 active_fg => [0, 0, 0], 2019 active_fg => [0, 0, 0],
1938 range => [0, 0, 100, 10], 2020 range => [0, 0, 100, 10],
1939 req_w => 20, 2021 req_w => $::WIDTH / 80,
1940 req_h => 20, 2022 req_h => $::WIDTH / 80,
1941 vertical => 0, 2023 vertical => 0,
1942 can_hover => 1, 2024 can_hover => 1,
1943 inner_pad => 5, 2025 inner_pad => 5,
1944 @_ 2026 @_
1945 ); 2027 );
… …
2069 (new CFClient::UI::Empty expand => 1), 2151 (new CFClient::UI::Empty expand => 1),
2070 (new CFClient::UI::Slider vertical => 1), 2152 (new CFClient::UI::Slider vertical => 1),
2071 ], 2153 ],
2072 ); 2154 );
2073 2155
2074 $self->{children}[1]->connect (changed => sub { 2156 $self->{children}[1]->connect (changed => sub { $self->update });
2075 $self->update;
2076 });
2077 2157
2078 $self 2158 $self
2079} 2159}
2080 2160
2081sub set_fontsize { 2161sub set_fontsize {
… …
2089 my ($self, $text) = @_; 2169 my ($self, $text) = @_;
2090 2170
2091 my $layout = $self->{layout}; 2171 my $layout = $self->{layout};
2092 2172
2093 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2173 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2094 $layout->set_width ($self->{w}); 2174 $layout->set_width ($self->{children}[0]{w});
2095 $layout->set_text ($text); 2175 $layout->set_text ($text);
2096 2176
2097 ($layout->size)[1] 2177 ($layout->size)[1]
2098} 2178}
2099 2179
… …
2152 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2232 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2153 2233
2154 delete $self->{texture}; 2234 delete $self->{texture};
2155 } 2235 }
2156 2236
2157 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2237 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2158 glClearColor 0, 0, 0, 1; 2238 glClearColor 0, 0, 0, 0;
2159 glClear GL_COLOR_BUFFER_BIT; 2239 glClear GL_COLOR_BUFFER_BIT;
2160 2240
2161 glEnable GL_BLEND; 2241 glEnable GL_BLEND;
2162 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2242 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2163 glEnable GL_TEXTURE_2D; 2243 glEnable GL_TEXTURE_2D;
… …
2195} 2275}
2196 2276
2197sub _draw { 2277sub _draw {
2198 my ($self) = @_; 2278 my ($self) = @_;
2199 2279
2200 if ($self->{texture}) { 2280 glEnable GL_BLEND;
2281 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2201 glEnable GL_TEXTURE_2D; 2282 glEnable GL_TEXTURE_2D;
2202 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2283 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2203 glColor 1, 1, 1, 1; 2284 glColor 1, 1, 1, 1;
2204 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2285 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2205 glDisable GL_TEXTURE_2D; 2286 glDisable GL_TEXTURE_2D;
2206 } 2287 glDisable GL_BLEND;
2207 2288
2208 $self->{children}[1]->draw; 2289 $self->{children}[1]->draw;
2209 2290
2210} 2291}
2211 2292
… …
2380 2461
2381sub size_request { 2462sub size_request {
2382 (32, 8) 2463 (32, 8)
2383} 2464}
2384 2465
2385sub draw { 2466sub _draw {
2386 my ($self) = @_; 2467 my ($self) = @_;
2387 2468
2388 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2469 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2389 2470
2471 # TODO animation
2390 if ($tex) { 2472 if ($tex) {
2391 glEnable GL_BLEND; 2473 glEnable GL_BLEND;
2392 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2393 glEnable GL_TEXTURE_2D; 2475 glEnable GL_TEXTURE_2D;
2394 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2476 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
… …
2399 } 2481 }
2400} 2482}
2401 2483
2402############################################################################# 2484#############################################################################
2403 2485
2486package CFClient::UI::Menu;
2487
2488our @ISA = CFClient::UI::FancyFrame::;
2489
2490use CFClient::OpenGL;
2491
2492sub new {
2493 my $class = shift;
2494
2495 my $self = $class->SUPER::new (
2496 items => [],
2497 z => 100,
2498 @_,
2499 );
2500
2501 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2502
2503 for my $item (@{ $self->{items} }) {
2504 my ($widget, $cb) = @$item;
2505
2506 # handle various types of items, only text for now
2507 if (!ref $widget) {
2508 $widget = new CFClient::UI::Label
2509 can_hover => 1,
2510 can_events => 1,
2511 text => $widget;
2512 }
2513
2514 $self->{item}{$widget} = $item;
2515
2516 $self->{vbox}->add ($widget);
2517 }
2518
2519 $self
2520}
2521
2522# popup given the event (must be a mouse button down event currently)
2523sub popup {
2524 my ($self, $ev) = @_;
2525
2526 $self->emit ("popdown");
2527
2528 # maybe save $GRAB? must be careful about events...
2529 $GRAB = $self;
2530 $self->{button} = $ev->{button};
2531
2532 $self->show;
2533 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2534}
2535
2536sub mouse_motion {
2537 my ($self, $ev, $x, $y) = @_;
2538
2539 # TODO: should use vbox->find_widget or so
2540 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2541 $self->{hover} = $self->{item}{$HOVER};
2542}
2543
2544sub button_up {
2545 my ($self, $ev, $x, $y) = @_;
2546
2547 if ($ev->{button} == $self->{button}) {
2548 undef $GRAB;
2549 $self->hide;
2550
2551 $self->emit ("popdown");
2552 $self->{hover}[1]->() if $self->{hover};
2553 }
2554}
2555
2556#############################################################################
2557
2404package CFClient::UI::Root; 2558package CFClient::UI::Root;
2405 2559
2406our @ISA = CFClient::UI::Container::; 2560our @ISA = CFClient::UI::Container::;
2407 2561
2408use CFClient::OpenGL; 2562use CFClient::OpenGL;
… …
2480 $self->_draw; 2634 $self->_draw;
2481} 2635}
2482 2636
2483############################################################################# 2637#############################################################################
2484 2638
2639package CFClient::UI::InventoryItem;
2640
2641our @ISA = CFClient::UI::HBox::;
2642
2643sub new {
2644 my $class = shift;
2645
2646 my %args = @_;
2647
2648 my $item = $args{item};
2649
2650 my $desc = $item->{nrof} < 2
2651 ? $item->{name}
2652 : "$item->{nrof} $item->{name_pl}";
2653
2654
2655 my $self = $class->SUPER::new (
2656 can_hover => 1,
2657 can_events => 1,
2658 tooltip => (CFClient::UI::Label->escape ($desc)
2659 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2660 connect_button_down => sub {
2661 my ($self, $ev, $x, $y) = @_;
2662
2663 # todo: maybe put examine on 1? but should just be a tooltip :(
2664 if ($ev->{button} == 1) {
2665 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2666 } elsif ($ev->{button} == 2) {
2667 $::CONN->send ("apply $item->{tag}");
2668 } elsif ($ev->{button} == 3) {
2669 CFClient::UI::Menu->new (
2670 items => [
2671 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2672 [
2673 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2674 sub { $::CONN->send ("lock $item->{tag}") },
2675 ],
2676 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2677 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2678 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2679 ],
2680 )->popup ($ev);
2681 }
2682
2683 1
2684 },
2685 %args
2686 );
2687 $self->add(new CFClient::UI::Face
2688 can_events => 0,
2689 face => $item->{face},
2690 anim => $item->{anim},
2691 animspeed => $item->{animspeed});
2692 $self->add(new CFClient::UI::Label
2693 can_events => 0,
2694 text => $desc);
2695
2696 $self
2697}
2698
2699#############################################################################
2700
2701package CFClient::UI::Inventory;
2702
2703our @ISA = CFClient::UI::ScrolledWindow::;
2704
2705sub new {
2706 my $class = shift;
2707
2708 my $self = $class->SUPER::new (
2709 scrolled => (new CFClient::UI::VBox),
2710 @_,
2711 );
2712
2713 $self
2714}
2715
2716sub set_items {
2717 my ($self, $items) = @_;
2718
2719 $self->{scrolled}->clear;
2720 return unless $items;
2721
2722 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2723
2724 $self->{real_items} = \@items;
2725
2726 for my $item (@items) {
2727 my $desc = $item->{nrof} < 2
2728 ? $item->{name}
2729 : "$item->{nrof} $item->{name_pl}";
2730
2731 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2732 }
2733
2734# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2735}
2736
2737sub size_request {
2738 my ($self) = @_;
2739 ($self->{req_w}, $self->{req_h});
2740}
2741
2742#############################################################################
2743
2485package CFClient::UI; 2744package CFClient::UI;
2486 2745
2487$ROOT = new CFClient::UI::Root; 2746$ROOT = new CFClient::UI::Root;
2488$TOOLTIP = new CFClient::UI::Tooltip; 2747$TOOLTIP = new CFClient::UI::Tooltip;
2489 2748

Diff Legend

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