… | |
… | |
3058 | |
3058 | |
3059 | ############################################################################# |
3059 | ############################################################################# |
3060 | |
3060 | |
3061 | package CFClient::UI::Face; |
3061 | package CFClient::UI::Face; |
3062 | |
3062 | |
3063 | our @ISA = CFClient::UI::Base::; |
3063 | our @ISA = CFClient::UI::DrawBG::; |
3064 | |
3064 | |
3065 | use CFClient::OpenGL; |
3065 | use CFClient::OpenGL; |
3066 | |
3066 | |
3067 | sub new { |
3067 | sub new { |
3068 | my $class = shift; |
3068 | my $class = shift; |
… | |
… | |
3104 | |
3104 | |
3105 | sub _draw { |
3105 | sub _draw { |
3106 | my ($self) = @_; |
3106 | my ($self) = @_; |
3107 | |
3107 | |
3108 | return unless $::CONN; |
3108 | return unless $::CONN; |
|
|
3109 | |
|
|
3110 | $self->SUPER::_draw; |
3109 | |
3111 | |
3110 | my $face; |
3112 | my $face; |
3111 | |
3113 | |
3112 | if ($self->{frame}) { |
3114 | if ($self->{frame}) { |
3113 | my $anim = $::CONN->{anim}[$self->{anim}]; |
3115 | my $anim = $::CONN->{anim}[$self->{anim}]; |
… | |
… | |
3360 | $self->emit (page_changed => $self->{multiplexer}{current}); |
3362 | $self->emit (page_changed => $self->{multiplexer}{current}); |
3361 | } |
3363 | } |
3362 | |
3364 | |
3363 | ############################################################################# |
3365 | ############################################################################# |
3364 | |
3366 | |
3365 | package CFClient::UI::Combobox; |
3367 | package CFClient::UI::Selector; |
3366 | |
3368 | |
3367 | use utf8; |
3369 | use utf8; |
3368 | |
3370 | |
3369 | our @ISA = CFClient::UI::Button::; |
3371 | our @ISA = CFClient::UI::Button::; |
3370 | |
3372 | |
… | |
… | |
3940 | $h = 0 if $h < 0; |
3942 | $h = 0 if $h < 0; |
3941 | |
3943 | |
3942 | $w = max $widget->{min_w}, $w; |
3944 | $w = max $widget->{min_w}, $w; |
3943 | $h = max $widget->{min_h}, $h; |
3945 | $h = max $widget->{min_h}, $h; |
3944 | |
3946 | |
|
|
3947 | # $w = min $self->{w} - $widget->{x}, $w if $self->{w}; |
|
|
3948 | # $h = min $self->{h} - $widget->{y}, $h if $self->{h}; |
|
|
3949 | |
3945 | $w = min $widget->{max_w}, $w if exists $widget->{max_w}; |
3950 | $w = min $widget->{max_w}, $w if exists $widget->{max_w}; |
3946 | $h = min $widget->{max_h}, $h if exists $widget->{max_h}; |
3951 | $h = min $widget->{max_h}, $h if exists $widget->{max_h}; |
3947 | |
3952 | |
3948 | $w = int $w + 0.5; |
3953 | $w = int $w + 0.5; |
3949 | $h = int $h + 0.5; |
3954 | $h = int $h + 0.5; |