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.294 by root, Tue Jun 6 03:19:26 2006 UTC

… …
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 {
… …
2473 my $class = shift; 2477 my $class = shift;
2474 2478
2475 my $self = $class->SUPER::new ( 2479 my $self = $class->SUPER::new (
2476 fontsize => 1, 2480 fontsize => 1,
2477 can_events => 0, 2481 can_events => 0,
2482 indent => 0,
2478 #font => default_font 2483 #font => default_font
2479 @_, 2484 @_,
2480 2485
2481 layout => (new CFClient::Layout 1), 2486 layout => (new CFClient::Layout 1),
2482 par => [], 2487 par => [],
… …
2505 $self->SUPER::size_allocate ($w, $h); 2510 $self->SUPER::size_allocate ($w, $h);
2506 2511
2507 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2512 $self->{layout}->set_font ($self->{font}) if $self->{font};
2508 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2513 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2509 $self->{layout}->set_width ($self->{children}[0]{w}); 2514 $self->{layout}->set_width ($self->{children}[0]{w});
2515 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2510 2516
2511 $self->reflow; 2517 $self->reflow;
2512} 2518}
2513 2519
2514sub text_size { 2520sub text_size {
… …
2516 2522
2517 my $layout = $self->{layout}; 2523 my $layout = $self->{layout};
2518 2524
2519 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2525 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2520 $layout->set_width ($self->{children}[0]{w} - $indent); 2526 $layout->set_width ($self->{children}[0]{w} - $indent);
2527 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2521 $layout->set_markup ($text); 2528 $layout->set_markup ($text);
2522 2529
2523 $layout->size 2530 $layout->size
2524} 2531}
2525 2532
… …
2577 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2584 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2578 2585
2579 for (@{$self->{par}}) { 2586 for (@{$self->{par}}) {
2580 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2587 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2581 $layout->set_width ($W - $_->[3]); 2588 $layout->set_width ($W - $_->[3]);
2589 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2582 $layout->set_markup ($_->[4]); 2590 $layout->set_markup ($_->[4]);
2583 my ($w, $h) = $layout->size; 2591 my ($w, $h) = $layout->size;
2584 $_->[0] = $w + $_->[3]; 2592 $_->[0] = $w + $_->[3];
2585 $_->[1] = $h; 2593 $_->[1] = $h;
2586 } 2594 }
… …
2618 my $h = $par->[1]; 2626 my $h = $par->[1];
2619 2627
2620 if ($y0 < $y + $h && $y < $y1) { 2628 if ($y0 < $y + $h && $y < $y1) {
2621 $layout->set_foreground (@{ $par->[2] }); 2629 $layout->set_foreground (@{ $par->[2] });
2622 $layout->set_width ($W - $par->[3]); 2630 $layout->set_width ($W - $par->[3]);
2631 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2623 $layout->set_markup ($par->[4]); 2632 $layout->set_markup ($par->[4]);
2624 2633
2625 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2634 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2626 2635
2627 glRasterPos $par->[3], $y - $y0; 2636 glRasterPos $par->[3], $y - $y0;
… …
2920 ); 2929 );
2921 2930
2922 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2931 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2923 2932
2924 for my $item (@{ $self->{items} }) { 2933 for my $item (@{ $self->{items} }) {
2925 my ($widget, $cb) = @$item; 2934 my ($widget, $cb, $tooltip) = @$item;
2926 2935
2927 # handle various types of items, only text for now 2936 # handle various types of items, only text for now
2928 if (!ref $widget) { 2937 if (!ref $widget) {
2929 $widget = new CFClient::UI::Label 2938 $widget = new CFClient::UI::Label
2930 can_hover => 1, 2939 can_hover => 1,
2931 can_events => 1, 2940 can_events => 1,
2932 text => $widget; 2941 text => $widget,
2942 tooltip => $tooltip
2933 } 2943 }
2934 2944
2935 $self->{item}{$widget} = $item; 2945 $self->{item}{$widget} = $item;
2936 2946
2937 $self->{vbox}->add ($widget); 2947 $self->{vbox}->add ($widget);
… …
3084sub set_current_page { 3094sub set_current_page {
3085 my ($self, $page) = @_; 3095 my ($self, $page) = @_;
3086 3096
3087 $self->{multiplexer}->set_current_page ($page); 3097 $self->{multiplexer}->set_current_page ($page);
3088 $self->_emit (page_changed => $self->{multiplexer}{current}); 3098 $self->_emit (page_changed => $self->{multiplexer}{current});
3099}
3100
3101#############################################################################
3102
3103package CFClient::UI::Combobox;
3104
3105use utf8;
3106
3107our @ISA = CFClient::UI::Button::;
3108
3109sub new {
3110 my $class = shift;
3111
3112 my $self = $class->SUPER::new (
3113 options => [], # [title, value, tooltip], ...
3114 value => undef,
3115 @_,
3116 );
3117
3118 $self->_set_value ($self->{value});
3119
3120 $self
3121}
3122
3123sub button_down {
3124 my ($self, $ev) = @_;
3125
3126 my @menu_items;
3127
3128 for (@{ $self->{options} }) {
3129 my ($title, $value, $tooltip) = @$_;
3130
3131 push @menu_items, [$tooltip, sub { $self->set_value ($value) }];
3132 }
3133
3134 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3135}
3136
3137sub _set_value {
3138 my ($self, $value) = @_;
3139
3140 my ($item) = grep $_->[1] eq $value, @{ $self->{options} }
3141 or return;
3142
3143 $self->{value} = $item->[1];
3144 $self->set_markup ("$item->[0] ⇓");
3145 $self->set_tooltip ($item->[2]);
3146}
3147
3148sub set_value {
3149 my ($self, $value) = @_;
3150
3151 return unless $self->{value} ne $value;
3152
3153 $self->_set_value ($value);
3154 $self->_emit (changed => $value);
3089} 3155}
3090 3156
3091############################################################################# 3157#############################################################################
3092 3158
3093package CFClient::UI::Statusbox; 3159package CFClient::UI::Statusbox;

Diff Legend

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