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.224 by elmex, Tue May 23 20:00:55 2006 UTC vs.
Revision 1.225 by root, Tue May 23 21:14:41 2006 UTC

743 743
744sub size_request { 744sub size_request {
745 my ($self) = @_; 745 my ($self) = @_;
746 746
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
748 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
749 748
750 @$self{qw(child_w child_h)} 749 @$self{qw(child_w child_h)}
751} 750}
752 751
753sub size_allocate { 752sub size_allocate {
754 my ($self, $w, $h) = @_; 753 my ($self, $w, $h) = @_;
755 754
755 my ($cw, $ch) = @$self{qw(child_w child_h)};
756# $w = $self->{w};
757 $self->child->configure (0, 0, $cw, $ch);
756 $self->update; 758 $self->update;
757} 759}
758 760
759sub set_offset { 761sub set_offset {
760 my ($self, $x, $y) = @_; 762 my ($self, $x, $y) = @_;
1488 active_fg => [0, 0, 0], 1490 active_fg => [0, 0, 0],
1489 can_hover => 1, 1491 can_hover => 1,
1490 can_focus => 1, 1492 can_focus => 1,
1491 valign => 0, 1493 valign => 0,
1492 can_events => 1, 1494 can_events => 1,
1495 #text => ...
1493 @_ 1496 @_
1494 ) 1497 )
1495} 1498}
1496 1499
1497sub _set_text { 1500sub _set_text {
2082 $self->update; 2085 $self->update;
2083 2086
2084 $self 2087 $self
2085} 2088}
2086 2089
2090sub set_range {
2091 my ($self, $range) = @_;
2092
2093 $self->{range} = $range;
2094
2095 $self->update;
2096}
2097
2087sub set_value { 2098sub set_value {
2088 my ($self, $value) = @_; 2099 my ($self, $value) = @_;
2089 2100
2090 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2101 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091 2102
2190 # draw handle 2201 # draw handle
2191 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2202 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2192 2203
2193 glDisable GL_TEXTURE_2D; 2204 glDisable GL_TEXTURE_2D;
2194} 2205}
2206
2207#############################################################################
2208
2209package CFClient::UI::ValSlider;
2210
2211our @ISA = CFClient::UI::HBox::;
2212
2213sub new {
2214 my ($class, %arg) = @_;
2215
2216 my $range = delete $arg{range};
2217
2218 my $self = $class->SUPER::new (
2219 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2220 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2221 to_value => sub { shift },
2222 from_value => sub { shift },
2223 %arg,
2224 );
2225
2226 $self->{slider}->connect (changed => sub {
2227 my ($self, $value) = @_;
2228 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2229 $self->{parent}->emit (changed => $value);
2230 });
2231
2232# $self->{entry}->connect (changed => sub {
2233# my ($self, $value) = @_;
2234# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2235# $self->{parent}->emit (changed => $value);
2236# });
2237
2238 $self->add ($self->{slider}, $self->{entry});
2239
2240 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2241
2242 $self
2243}
2244
2245sub set_range { shift->{slider}->set_range (@_) }
2246sub set_value { shift->{slider}->set_value (@_) }
2195 2247
2196############################################################################# 2248#############################################################################
2197 2249
2198package CFClient::UI::TextView; 2250package CFClient::UI::TextView;
2199 2251

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines