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.368 by root, Mon Jun 25 05:43:37 2007 UTC vs.
Revision 1.369 by root, Sun Jul 15 20:25:26 2007 UTC

… …
320sub set_visibility { 320sub set_visibility {
321 my ($self, $visible) = @_; 321 my ($self, $visible) = @_;
322 322
323 return if $self->{visible} == $visible; 323 return if $self->{visible} == $visible;
324 324
325 $visible ? $self->hide 325 $visible ? $self->show
326 : $self->show; 326 : $self->hide;
327} 327}
328 328
329sub toggle_visibility { 329sub toggle_visibility {
330 my ($self) = @_; 330 my ($self) = @_;
331 331
… …
1033 1033
1034############################################################################# 1034#############################################################################
1035 1035
1036package CFPlus::UI::ScrolledWindow; 1036package CFPlus::UI::ScrolledWindow;
1037 1037
1038our @ISA = CFPlus::UI::HBox::; 1038our @ISA = CFPlus::UI::Table::;
1039 1039
1040sub new { 1040sub new {
1041 my ($class, %arg) = @_; 1041 my ($class, %arg) = @_;
1042 1042
1043 my $child = delete $arg{child}; 1043 my $child = delete $arg{child};
1044 1044
1045 my $self; 1045 my $self;
1046 1046
1047 my $slider = new CFPlus::UI::Slider 1047 my $hslider = new CFPlus::UI::Slider
1048 vertical => 0,
1049 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub {
1051 $self->{hpos} = $_[1];
1052 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053 },
1054 ;
1055
1056 my $vslider = new CFPlus::UI::Slider
1048 vertical => 1, 1057 vertical => 1,
1049 range => [0, 0, 1, 0.01], # HACK fix 1058 range => [0, 0, 1, 0.01], # HACK fix
1050 on_changed => sub { 1059 on_changed => sub {
1051 $self->{vp}->set_offset (0, $_[1]); 1060 $self->{vpos} = $_[1];
1061 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1052 }, 1062 },
1053 ; 1063 ;
1054 1064
1055 $self = $class->SUPER::new ( 1065 $self = $class->SUPER::new (
1056 vp => (new CFPlus::UI::ViewPort expand => 1), 1066 vp => (new CFPlus::UI::ViewPort expand => 1),
1057 can_events => 1, 1067 can_events => 1,
1058 slider => $slider, 1068 hslider => $hslider,
1069 vslider => $vslider,
1070 col_expand => [1, 0],
1071 row_expand => [1, 0],
1059 %arg, 1072 %arg,
1060 ); 1073 );
1061 1074
1075 $self->SUPER::add (0, 0, $self->{vp});
1062 $self->SUPER::add ($self->{vp}, $self->{slider}); 1076 $self->SUPER::add (1, 0, $self->{vslider});
1077 $self->SUPER::add (0, 1, $self->{hslider});
1078
1063 $self->add ($child) if $child; 1079 $self->add ($child) if $child;
1064 1080
1065 $self 1081 $self
1066} 1082}
1067 1083
… …
1076sub invoke_mouse_wheel { 1092sub invoke_mouse_wheel {
1077 my ($self, $ev) = @_; 1093 my ($self, $ev) = @_;
1078 1094
1079 return 0 unless $ev->{dy}; # only vertical movements 1095 return 0 unless $ev->{dy}; # only vertical movements
1080 1096
1081 $self->{slider}->emit (mouse_wheel => $ev); 1097 $self->{vslider}->emit (mouse_wheel => $ev);
1082 1098
1083 1 1099 1
1084} 1100}
1085 1101
1086sub update_slider { 1102sub update_slider {
1087 my ($self) = @_; 1103 my ($self) = @_;
1088 1104
1105 my ($w1, $w2) = ($self->{vp}->child->{w}, $self->{vp}{w});
1089 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1106 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1107 #$self->{hslider}->set_visibility ($w1 != $w2);
1108
1109 my ($h1, $h2) = ($self->{vp}->child->{h}, $self->{vp}{h});
1110 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1111 #$self->{vslider}->set_visibility ($h1 != $h2);
1090} 1112}
1091 1113
1092sub update { 1114sub update {
1093 my ($self) = @_; 1115 my ($self) = @_;
1094 1116
… …
1481sub new { 1503sub new {
1482 my $class = shift; 1504 my $class = shift;
1483 1505
1484 $class->SUPER::new ( 1506 $class->SUPER::new (
1485 col_expand => [], 1507 col_expand => [],
1508 row_expand => [],
1486 @_, 1509 @_,
1487 ) 1510 )
1488} 1511}
1489 1512
1490sub children { 1513sub children {
… …
1565 my ($ws, $hs) = $self->get_wh; 1588 my ($ws, $hs) = $self->get_wh;
1566 1589
1567 my $req_w = (sum @$ws) || 1; 1590 my $req_w = (sum @$ws) || 1;
1568 my $req_h = (sum @$hs) || 1; 1591 my $req_h = (sum @$hs) || 1;
1569 1592
1570 # TODO: nicer code && do row_expand 1593 # TODO: nicer code
1571 my @col_expand = @{$self->{col_expand}}; 1594 my @col_expand = @{$self->{col_expand}};
1572 @col_expand = (1) x @$ws unless @col_expand; 1595 @col_expand = (1) x @$ws unless @col_expand;
1573 my $col_expand = (sum @col_expand) || 1; 1596 my $col_expand = (sum @col_expand) || 1;
1574 1597
1575 # linearly scale sizes
1576 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1598 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1577 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1578 1599
1579 CFPlus::UI::harmonize $ws; 1600 CFPlus::UI::harmonize $ws;
1601
1602 my @row_expand = @{$self->{row_expand}};
1603 @row_expand = (1) x @$ws unless @row_expand;
1604 my $row_expand = (sum @row_expand) || 1;
1605
1606 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1607
1580 CFPlus::UI::harmonize $hs; 1608 CFPlus::UI::harmonize $hs;
1581 1609
1582 my $y; 1610 my $y;
1583 1611
1584 for my $r (0 .. $#{$self->{children}}) { 1612 for my $r (0 .. $#{$self->{children}}) {

Diff Legend

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