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.290 by root, Mon Jun 5 22:30:35 2006 UTC vs.
Revision 1.296 by root, Wed Jun 7 05:48:53 2006 UTC

… …
315} 315}
316 316
317sub move_abs { 317sub move_abs {
318 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
319 319
320 $self->{x} = List::Util::max 0, int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
321 $self->{y} = List::Util::max 0, int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
322 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
323 323
324 $self->update; 324 $self->update;
325} 325}
326 326
… …
1658 : ($self->{h} - $tex->{h}) * 0.5); 1658 : ($self->{h} - $tex->{h}) * 0.5);
1659 }; 1659 };
1660 1660
1661 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1662 1662
1663 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1664 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1665
1663 if ($tex->{format} == GL_ALPHA) { 1666 if ($tex->{format} == GL_ALPHA) {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1667 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1665 glColor @{$self->{fg}}; 1668 glColor @{$self->{fg}};
1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1667 } else { 1670 } else {
1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1672 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1670 } 1673 }
1671 1674
1672 glDisable GL_TEXTURE_2D; 1675 glDisable GL_TEXTURE_2D;
1673} 1676}
1674 1677
… …
1691 can_hover => 1, 1694 can_hover => 1,
1692 can_focus => 1, 1695 can_focus => 1,
1693 valign => 0, 1696 valign => 0,
1694 can_events => 1, 1697 can_events => 1,
1695 #text => ... 1698 #text => ...
1699 #hidden => "*",
1696 @_ 1700 @_
1697 ) 1701 )
1698} 1702}
1699 1703
1700sub _set_text { 1704sub _set_text {
… …
2303sub set_range { 2307sub set_range {
2304 my ($self, $range) = @_; 2308 my ($self, $range) = @_;
2305 2309
2306 ($range, $self->{range}) = ($self->{range}, $range); 2310 ($range, $self->{range}) = ($self->{range}, $range);
2307 2311
2308 $self->update
2309 if "@$range" ne "@{$self->{range}}"; 2312 if ("@$range" ne "@{$self->{range}}") {
2313 $self->update;
2314 $self->set_value ($self->{range}[0]);
2315 }
2310} 2316}
2311 2317
2312sub set_value { 2318sub set_value {
2313 my ($self, $value) = @_; 2319 my ($self, $value) = @_;
2314 2320
… …
2473 my $class = shift; 2479 my $class = shift;
2474 2480
2475 my $self = $class->SUPER::new ( 2481 my $self = $class->SUPER::new (
2476 fontsize => 1, 2482 fontsize => 1,
2477 can_events => 0, 2483 can_events => 0,
2484 indent => 0,
2478 #font => default_font 2485 #font => default_font
2479 @_, 2486 @_,
2480 2487
2481 layout => (new CFClient::Layout 1), 2488 layout => (new CFClient::Layout 1),
2482 par => [], 2489 par => [],
… …
2505 $self->SUPER::size_allocate ($w, $h); 2512 $self->SUPER::size_allocate ($w, $h);
2506 2513
2507 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2514 $self->{layout}->set_font ($self->{font}) if $self->{font};
2508 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2515 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2509 $self->{layout}->set_width ($self->{children}[0]{w}); 2516 $self->{layout}->set_width ($self->{children}[0]{w});
2517 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2510 2518
2511 $self->reflow; 2519 $self->reflow;
2512} 2520}
2513 2521
2514sub text_size { 2522sub text_size {
… …
2516 2524
2517 my $layout = $self->{layout}; 2525 my $layout = $self->{layout};
2518 2526
2519 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2527 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2520 $layout->set_width ($self->{children}[0]{w} - $indent); 2528 $layout->set_width ($self->{children}[0]{w} - $indent);
2529 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2521 $layout->set_markup ($text); 2530 $layout->set_markup ($text);
2522 2531
2523 $layout->size 2532 $layout->size
2524} 2533}
2525 2534
… …
2564 2573
2565 return unless $self->{h} > 0; 2574 return unless $self->{h} > 0;
2566 2575
2567 delete $self->{texture}; 2576 delete $self->{texture};
2568 2577
2569 $ROOT->on_post_alloc ($self, sub { 2578 $ROOT->on_post_alloc ($self => sub {
2570 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2579 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2571 2580
2572 if (delete $self->{need_reflow}) { 2581 if (delete $self->{need_reflow}) {
2573 my $height = 0; 2582 my $height = 0;
2574 2583
… …
2577 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2586 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2578 2587
2579 for (@{$self->{par}}) { 2588 for (@{$self->{par}}) {
2580 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2589 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2581 $layout->set_width ($W - $_->[3]); 2590 $layout->set_width ($W - $_->[3]);
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2582 $layout->set_markup ($_->[4]); 2592 $layout->set_markup ($_->[4]);
2583 my ($w, $h) = $layout->size; 2593 my ($w, $h) = $layout->size;
2584 $_->[0] = $w + $_->[3]; 2594 $_->[0] = $w + $_->[3];
2585 $_->[1] = $h; 2595 $_->[1] = $h;
2586 } 2596 }
… …
2589 } 2599 }
2590 2600
2591 $self->{height} = $height; 2601 $self->{height} = $height;
2592 2602
2593 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2603 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2594 2604
2595 delete $self->{texture}; 2605 delete $self->{texture};
2596 } 2606 }
2597 2607
2598 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2608 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2599 glClearColor 0, 0, 0, 0; 2609 glClearColor 0, 0, 0, 0;
… …
2618 my $h = $par->[1]; 2628 my $h = $par->[1];
2619 2629
2620 if ($y0 < $y + $h && $y < $y1) { 2630 if ($y0 < $y + $h && $y < $y1) {
2621 $layout->set_foreground (@{ $par->[2] }); 2631 $layout->set_foreground (@{ $par->[2] });
2622 $layout->set_width ($W - $par->[3]); 2632 $layout->set_width ($W - $par->[3]);
2633 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2623 $layout->set_markup ($par->[4]); 2634 $layout->set_markup ($par->[4]);
2624 2635
2625 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2636 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2626 2637
2627 glRasterPos $par->[3], $y - $y0; 2638 glRasterPos $par->[3], $y - $y0;
… …
2778 or return; 2789 or return;
2779 2790
2780 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2791 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2781 2792
2782 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2793 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2783 if $x + $self->{w} > $::WIDTH; 2794 if $x + $self->{w} > $self->{root}{w};
2784 2795
2785 $self->move_abs ($x, $y); 2796 $self->move_abs ($x, $y);
2786 }); 2797 });
2787} 2798}
2788 2799
… …
2920 ); 2931 );
2921 2932
2922 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2933 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2923 2934
2924 for my $item (@{ $self->{items} }) { 2935 for my $item (@{ $self->{items} }) {
2925 my ($widget, $cb) = @$item; 2936 my ($widget, $cb, $tooltip) = @$item;
2926 2937
2927 # handle various types of items, only text for now 2938 # handle various types of items, only text for now
2928 if (!ref $widget) { 2939 if (!ref $widget) {
2929 $widget = new CFClient::UI::Label 2940 $widget = new CFClient::UI::Label
2930 can_hover => 1, 2941 can_hover => 1,
2931 can_events => 1, 2942 can_events => 1,
2932 text => $widget; 2943 text => $widget,
2944 tooltip => $tooltip
2933 } 2945 }
2934 2946
2935 $self->{item}{$widget} = $item; 2947 $self->{item}{$widget} = $item;
2936 2948
2937 $self->{vbox}->add ($widget); 2949 $self->{vbox}->add ($widget);
… …
3084sub set_current_page { 3096sub set_current_page {
3085 my ($self, $page) = @_; 3097 my ($self, $page) = @_;
3086 3098
3087 $self->{multiplexer}->set_current_page ($page); 3099 $self->{multiplexer}->set_current_page ($page);
3088 $self->_emit (page_changed => $self->{multiplexer}{current}); 3100 $self->_emit (page_changed => $self->{multiplexer}{current});
3101}
3102
3103#############################################################################
3104
3105package CFClient::UI::Combobox;
3106
3107use utf8;
3108
3109our @ISA = CFClient::UI::Button::;
3110
3111sub new {
3112 my $class = shift;
3113
3114 my $self = $class->SUPER::new (
3115 options => [], # [title, value, tooltip], ...
3116 value => undef,
3117 @_,
3118 );
3119
3120 $self->_set_value ($self->{value});
3121
3122 $self
3123}
3124
3125sub button_down {
3126 my ($self, $ev) = @_;
3127
3128 my @menu_items;
3129
3130 for (@{ $self->{options} }) {
3131 my ($title, $value, $tooltip) = @$_;
3132
3133 push @menu_items, [$tooltip, sub { $self->set_value ($value) }];
3134 }
3135
3136 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3137}
3138
3139sub _set_value {
3140 my ($self, $value) = @_;
3141
3142 my ($item) = grep $_->[1] eq $value, @{ $self->{options} }
3143 or return;
3144
3145 $self->{value} = $item->[1];
3146 $self->set_markup ("$item->[0] ⇓");
3147 $self->set_tooltip ($item->[2]);
3148}
3149
3150sub set_value {
3151 my ($self, $value) = @_;
3152
3153 return unless $self->{value} ne $value;
3154
3155 $self->_set_value ($value);
3156 $self->_emit (changed => $value);
3089} 3157}
3090 3158
3091############################################################################# 3159#############################################################################
3092 3160
3093package CFClient::UI::Statusbox; 3161package CFClient::UI::Statusbox;

Diff Legend

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