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.389 by root, Sat Jul 21 13:02:05 2007 UTC vs.
Revision 1.395 by root, Sat Jul 21 13:56:00 2007 UTC

… …
741 can_events => 0, 741 can_events => 0,
742 %arg, 742 %arg,
743 ); 743 );
744 744
745 $self->add (@$children) 745 $self->add (@$children)
746 if $children; 746 if $children && @$children;
747 747
748 $self 748 $self
749} 749}
750 750
751sub realloc { 751sub realloc {
… …
760 my ($self, @widgets) = @_; 760 my ($self, @widgets) = @_;
761 761
762 $_->set_parent ($self) 762 $_->set_parent ($self)
763 for @widgets; 763 for @widgets;
764 764
765 # TODO: only do this in widgets that need it, e.g. root, fixed
765 use sort 'stable'; 766 use sort 'stable';
766 767
767 $self->{children} = [ 768 $self->{children} = [
768 sort { $a->{z} <=> $b->{z} } 769 sort { $a->{z} <=> $b->{z} }
769 @{$self->{children}}, @widgets 770 @{$self->{children}}, @widgets
… …
788} 789}
789 790
790sub clear { 791sub clear {
791 my ($self) = @_; 792 my ($self) = @_;
792 793
793 my $children = delete $self->{children}; 794 my $children = $self->{children};
794 $self->{children} = []; 795 $self->{children} = [];
795 796
796 for (@$children) { 797 for (@$children) {
797 delete $_->{parent}; 798 delete $_->{parent};
798 $_->hide; 799 $_->hide;
… …
1046 my $child = delete $arg{child}; 1047 my $child = delete $arg{child};
1047 1048
1048 my $self; 1049 my $self;
1049 1050
1050 my $hslider = new CFPlus::UI::Slider 1051 my $hslider = new CFPlus::UI::Slider
1052 col => 0,
1053 row => 1,
1051 vertical => 0, 1054 vertical => 0,
1052 range => [0, 0, 1, 0.01], # HACK fix 1055 range => [0, 0, 1, 0.01], # HACK fix
1053 on_changed => sub { 1056 on_changed => sub {
1054 $self->{hpos} = $_[1]; 1057 $self->{hpos} = $_[1];
1055 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1058 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1056 }, 1059 },
1057 ; 1060 ;
1058 1061
1059 my $vslider = new CFPlus::UI::Slider 1062 my $vslider = new CFPlus::UI::Slider
1063 col => 1,
1064 row => 0,
1060 vertical => 1, 1065 vertical => 1,
1061 range => [0, 0, 1, 0.01], # HACK fix 1066 range => [0, 0, 1, 0.01], # HACK fix
1062 on_changed => sub { 1067 on_changed => sub {
1063 $self->{vpos} = $_[1]; 1068 $self->{vpos} = $_[1];
1064 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1075 row_expand => [1, 0], 1080 row_expand => [1, 0],
1076 %arg, 1081 %arg,
1077 ); 1082 );
1078 1083
1079 $self->{vp} = new CFPlus::UI::ViewPort 1084 $self->{vp} = new CFPlus::UI::ViewPort
1085 col => 0,
1086 row => 0,
1080 expand => 1, 1087 expand => 1,
1081 scroll_x => $self->{scroll_x}, 1088 scroll_x => $self->{scroll_x},
1082 scroll_y => $self->{scroll_y}, 1089 scroll_y => $self->{scroll_y},
1083 on_changed => sub { 1090 on_changed => sub {
1084 my ($vp, $x, $y) = @_; 1091 my ($vp, $x, $y) = @_;
… …
1088 1095
1089 0 1096 0
1090 }, 1097 },
1091 ; 1098 ;
1092 1099
1093 $self->SUPER::add_at (0, 0, $self->{vp}); 1100 $self->SUPER::add ($self->{vp});
1094 1101
1095 $self->add ($child) if $child; 1102 $self->add ($child) if $child;
1096 1103
1097 $self 1104 $self
1098} 1105}
1099
1100#TODO# update range on size_allocate depending on child
1101 1106
1102sub add { 1107sub add {
1103 my ($self, $widget) = @_; 1108 my ($self, $widget) = @_;
1104 1109
1105 $self->{vp}->add ($self->{child} = $widget); 1110 $self->{vp}->add ($self->{child} = $widget);
… …
1112 1117
1113 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1114 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1115 1120
1116 my $visible = $w1 > $w2; 1121 my $visible = $w1 > $w2;
1117 if ($visible != $self->{hslider}{visible}) { 1122 if ($visible != $self->{hslider_visible}) {
1123 $self->{hslider_visible} = $visible;
1118 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider}) 1124 $visible ? $self->SUPER::add ($self->{hslider})
1119 : $self->{hslider}->hide; 1125 : $self->SUPER::remove ($self->{hslider});
1120 } 1126 }
1121 1127
1122 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1128 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1123 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1129 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1124 1130
1125 my $visible = $h1 > $h2; 1131 my $visible = $h1 > $h2;
1126 if ($visible != $self->{vslider}{visible}) { 1132 if ($visible != $self->{vslider_visible}) {
1133 $self->{vslider_visible} = $visible;
1127 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider}) 1134 $visible ? $self->SUPER::add ($self->{vslider})
1128 : $self->{vslider}->hide; 1135 : $self->SUPER::remove ($self->{vslider});
1129 } 1136 }
1130}
1131
1132sub update {
1133 my ($self) = @_;
1134
1135 $self->update_slider;
1136 $self->SUPER::update;
1137} 1137}
1138 1138
1139sub invoke_mouse_wheel { 1139sub invoke_mouse_wheel {
1140 my ($self, $ev) = @_; 1140 my ($self, $ev) = @_;
1141 1141
… …
1581 1581
1582############################################################################# 1582#############################################################################
1583 1583
1584package CFPlus::UI::Table; 1584package CFPlus::UI::Table;
1585 1585
1586our @ISA = CFPlus::UI::Base::; 1586our @ISA = CFPlus::UI::Container::;
1587 1587
1588use List::Util qw(max sum); 1588use List::Util qw(max sum);
1589 1589
1590use CFPlus::OpenGL; 1590use CFPlus::OpenGL;
1591 1591
1592sub new { 1592sub new {
1593 my $class = shift; 1593 my $class = shift;
1594 1594
1595 $class->SUPER::new ( 1595 $class->SUPER::new (
1596 children => [],
1597 col_expand => [], 1596 col_expand => [],
1598 row_expand => [], 1597 row_expand => [],
1599 @_, 1598 @_,
1600 ) 1599 )
1601} 1600}
1602 1601
1603sub children {
1604 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1605}
1606
1607# TODO: store row/col info in child widget and use standard add/del
1608sub add { 1602sub add {
1609 my $self = shift; 1603 my ($self, @widgets) = @_;
1610 1604
1611 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d# 1605 for my $child (@widgets) {
1612 $self->add_at (@_); 1606 $child->{rowspan} ||= 1;
1607 $child->{colspan} ||= 1;
1608 }
1609
1610 $self->SUPER::add (@widgets);
1613} 1611}
1614 1612
1615sub add_at { 1613sub add_at {
1616 my $self = shift; 1614 my $self = shift;
1617 1615
1616 my @widgets;
1617
1618 while (@_) { 1618 while (@_) {
1619 my ($col, $row, $child) = splice @_, 0, 3, (); 1619 my ($col, $row, $child) = splice @_, 0, 3, ();
1620 1620
1621 $child->{row} = $row; 1621 $child->{row} = $row;
1622 $child->{col} = $col; 1622 $child->{col} = $col;
1623 1623
1624 $child->{rowspan} ||= 1; 1624 push @widgets, $child;
1625 $child->{colspan} ||= 1;
1626
1627 $child->set_parent ($self);
1628 $self->{children}[$row][$col] = $child;
1629 } 1625 }
1630 1626
1631 $self->{force_realloc} = 1; 1627 $self->add (@widgets);
1632 $self->{force_size_alloc} = 1;
1633 $self->realloc;
1634} 1628}
1635 1629
1636sub remove { 1630sub get_wh {
1637 my ($self, $child) = @_; 1631 my ($self) = @_;
1638 1632
1639 for (@{ $self->{children} }) { 1633 my (@w, @h);
1640 for (@{ $_ || [] }) { 1634
1641 $_ = undef if $_ == $child; 1635 my @children = $self->children;
1636
1637 # first pass, columns
1638 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
1639 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
1640
1641 my $sw = sum @w[$c .. $c + $cs - 1];
1642
1643 if ($w > $sw) {
1644 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1642 } 1645 }
1643 } 1646 }
1644}
1645 1647
1646# TODO: move to container class maybe? send children a signal on removal? 1648 # second pass, rows
1647sub clear { 1649 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1648 my ($self) = @_;
1649
1650 my @children = $self->children;
1651 delete $self->{children};
1652
1653 for (@children) {
1654 delete $_->{parent};
1655 $_->hide;
1656 }
1657
1658 $self->realloc;
1659}
1660
1661sub get_wh {
1662 my ($self) = @_;
1663
1664 my (@w, @h);
1665
1666 my @children = $self->children;
1667
1668 for my $widget (sort { $b->{rowspan} * $b->{colspan} <=> $a->{rowspan} * $a->{colspan} } @children) {
1669 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1650 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1670 1651
1671 my $sw = sum @w[$c .. $c + $cs - 1];
1672 my $sh = sum @h[$r .. $r + $rs - 1]; 1652 my $sh = sum @h[$r .. $r + $rs - 1];
1673 1653
1674 if ($w > $sw) {
1675 $_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1];
1676 }
1677
1678 if ($h > $sh) { 1654 if ($h > $sh) {
1679 $_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1]; 1655 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1680 } 1656 }
1681 } 1657 }
1682 1658
1683 (\@w, \@h) 1659 (\@w, \@h)
1684} 1660}
… …
1717 1693
1718 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1694 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1719 1695
1720 CFPlus::UI::harmonize $hs; 1696 CFPlus::UI::harmonize $hs;
1721 1697
1722 my (@x, @y);
1723
1724 for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1698 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1725 for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1699 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1726 1700
1727 for my $widget ($self->children) { 1701 for my $widget ($self->children) {
1728 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1702 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1729 1703
1730 $widget->configure ( 1704 $widget->configure (
… …
1732 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1706 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1733 ); 1707 );
1734 } 1708 }
1735 1709
1736 1 1710 1
1737}
1738
1739sub find_widget {
1740 my ($self, $x, $y) = @_;
1741
1742 $x -= $self->{x};
1743 $y -= $self->{y};
1744
1745 my $res;
1746
1747 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1748 $res = $_->find_widget ($x, $y)
1749 and return $res;
1750 }
1751
1752 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1753}
1754
1755sub _draw {
1756 my ($self) = @_;
1757
1758 for (grep $_, @{$self->{children}}) {
1759 $_->draw for grep $_, @$_;
1760 }
1761} 1711}
1762 1712
1763############################################################################# 1713#############################################################################
1764 1714
1765package CFPlus::UI::Fixed; 1715package CFPlus::UI::Fixed;

Diff Legend

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