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.404 by root, Sat Jul 21 22:54:52 2007 UTC vs.
Revision 1.422 by root, Thu Aug 2 14:35:21 2007 UTC

… …
273 $self->emit ("destroy"); 273 $self->emit ("destroy");
274 %$self = (); 274 %$self = ();
275} 275}
276 276
277sub TO_JSON { 277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} } 278 { __w_ => $_[0]{s_id} }
279} 279}
280 280
281sub show { 281sub show {
282 my ($self) = @_; 282 my ($self) = @_;
283 283
… …
725 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
726 ]; 726 ];
727 727
728 $self->realloc; 728 $self->realloc;
729 729
730 $self->emit (c_add => \@widgets);
731
730 map $_+0, @widgets 732 map $_+0, @widgets
731} 733}
732 734
733sub children { 735sub children {
734 @{ $_[0]{children} } 736 @{ $_[0]{children} }
735} 737}
736 738
737sub remove { 739sub remove {
738 my ($self, $child) = @_; 740 my ($self, @widgets) = @_;
739 741
742 $self->emit (c_remove => \@widgets);
743
744 for my $child (@widgets) {
740 delete $child->{parent}; 745 delete $child->{parent};
741 $child->hide; 746 $child->hide;
742
743 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 747 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
748 }
744 749
745 $self->realloc; 750 $self->realloc;
746} 751}
747 752
748sub clear { 753sub clear {
… …
776} 781}
777 782
778sub _draw { 783sub _draw {
779 my ($self) = @_; 784 my ($self) = @_;
780 785
781 $_->draw for @{$self->{children}}; 786 $_->draw for $self->visible_children;
782} 787}
783 788
784############################################################################# 789#############################################################################
785 790
786package CFPlus::UI::Bin; 791package CFPlus::UI::Bin;
… …
796} 801}
797 802
798sub add { 803sub add {
799 my ($self, $child) = @_; 804 my ($self, $child) = @_;
800 805
801 $self->SUPER::remove ($_) for @{ $self->{children} }; 806 $self->clear;
802 $self->SUPER::add ($child); 807 $self->SUPER::add ($child);
803} 808}
804 809
805sub remove { 810sub remove {
806 my ($self, $widget) = @_; 811 my ($self, $widget) = @_;
… …
948 $self->{view_x} = $x; 953 $self->{view_x} = $x;
949 $self->{view_y} = $y; 954 $self->{view_y} = $y;
950 955
951 $self->emit (changed => $x, $y); 956 $self->emit (changed => $x, $y);
952 $self->update; 957 $self->update;
958 }
959}
960
961sub set_center {
962 my ($self, $x, $y) = @_;
963
964 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
965}
966
967sub make_visible {
968 my ($self, $x, $y, $border) = @_;
969
970 if ( $x < $self->{view_x} + $self->{w} * $border
971 || $x > $self->{view_x} + $self->{w} * (1 - $border)
972 || $y < $self->{view_y} + $self->{h} * $border
973 || $y > $self->{view_y} + $self->{h} * (1 - $border)
974 ) {
975 $self->set_center ($x, $y);
953 } 976 }
954} 977}
955 978
956# hmm, this does not work for topleft of $self... but we should not ask for that 979# hmm, this does not work for topleft of $self... but we should not ask for that
957sub coord2local { 980sub coord2local {
… …
1004 my $child = delete $arg{child}; 1027 my $child = delete $arg{child};
1005 1028
1006 my $self; 1029 my $self;
1007 1030
1008 my $hslider = new CFPlus::UI::Slider 1031 my $hslider = new CFPlus::UI::Slider
1009 col => 0, 1032 c_col => 0,
1010 row => 1, 1033 c_row => 1,
1011 vertical => 0, 1034 vertical => 0,
1012 range => [0, 0, 1, 0.01], # HACK fix 1035 range => [0, 0, 1, 0.01], # HACK fix
1013 on_changed => sub { 1036 on_changed => sub {
1014 $self->{hpos} = $_[1]; 1037 $self->{hpos} = $_[1];
1015 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1016 }, 1039 },
1017 ; 1040 ;
1018 1041
1019 my $vslider = new CFPlus::UI::Slider 1042 my $vslider = new CFPlus::UI::Slider
1020 col => 1, 1043 c_col => 1,
1021 row => 0, 1044 c_row => 0,
1022 vertical => 1, 1045 vertical => 1,
1023 range => [0, 0, 1, 0.01], # HACK fix 1046 range => [0, 0, 1, 0.01], # HACK fix
1024 on_changed => sub { 1047 on_changed => sub {
1025 $self->{vpos} = $_[1]; 1048 $self->{vpos} = $_[1];
1026 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1037 row_expand => [1, 0], 1060 row_expand => [1, 0],
1038 %arg, 1061 %arg,
1039 ); 1062 );
1040 1063
1041 $self->{vp} = new CFPlus::UI::ViewPort 1064 $self->{vp} = new CFPlus::UI::ViewPort
1042 col => 0, 1065 c_col => 0,
1043 row => 0, 1066 c_row => 0,
1044 expand => 1, 1067 expand => 1,
1045 scroll_x => $self->{scroll_x}, 1068 scroll_x => $self->{scroll_x},
1046 scroll_y => $self->{scroll_y}, 1069 scroll_y => $self->{scroll_y},
1047 on_changed => sub { 1070 on_changed => sub {
1048 my ($vp, $x, $y) = @_; 1071 my ($vp, $x, $y) = @_;
… …
1069sub add { 1092sub add {
1070 my ($self, $widget) = @_; 1093 my ($self, $widget) = @_;
1071 1094
1072 $self->{vp}->add ($self->{child} = $widget); 1095 $self->{vp}->add ($self->{child} = $widget);
1073} 1096}
1097
1098sub set_offset { shift->{vp}->set_offset (@_) }
1099sub set_center { shift->{vp}->set_center (@_) }
1100sub make_visible { shift->{vp}->make_visible (@_) }
1074 1101
1075sub update_slider { 1102sub update_slider {
1076 my ($self) = @_; 1103 my ($self) = @_;
1077 1104
1078 my $child = ($self->{vp} or return)->child; 1105 my $child = ($self->{vp} or return)->child;
… …
1571 1598
1572sub add { 1599sub add {
1573 my ($self, @widgets) = @_; 1600 my ($self, @widgets) = @_;
1574 1601
1575 for my $child (@widgets) { 1602 for my $child (@widgets) {
1576 $child->{rowspan} ||= 1; 1603 $child->{c_rowspan} ||= 1;
1577 $child->{colspan} ||= 1; 1604 $child->{c_colspan} ||= 1;
1578 } 1605 }
1579 1606
1580 $self->SUPER::add (@widgets); 1607 $self->SUPER::add (@widgets);
1581} 1608}
1582 1609
… …
1586 my @widgets; 1613 my @widgets;
1587 1614
1588 while (@_) { 1615 while (@_) {
1589 my ($col, $row, $child) = splice @_, 0, 3, (); 1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1590 1617
1591 $child->{row} = $row; 1618 $child->{c_row} = $row;
1592 $child->{col} = $col; 1619 $child->{c_col} = $col;
1593 1620
1594 push @widgets, $child; 1621 push @widgets, $child;
1595 } 1622 }
1596 1623
1597 $self->add (@widgets); 1624 $self->add (@widgets);
… …
1603 my (@w, @h); 1630 my (@w, @h);
1604 1631
1605 my @children = $self->children; 1632 my @children = $self->children;
1606 1633
1607 # first pass, columns 1634 # first pass, columns
1608 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1635 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1609 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1636 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1610 1637
1611 my $sw = sum @w[$c .. $c + $cs - 1]; 1638 my $sw = sum @w[$c .. $c + $cs - 1];
1612 1639
1613 if ($w > $sw) { 1640 if ($w > $sw) {
1614 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1615 } 1642 }
1616 } 1643 }
1617 1644
1618 # second pass, rows 1645 # second pass, rows
1619 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1646 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1620 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1647 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1621 1648
1622 my $sh = sum @h[$r .. $r + $rs - 1]; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1623 1650
1624 if ($h > $sh) { 1651 if ($h > $sh) {
1625 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
… …
1667 1694
1668 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1670 1697
1671 for my $widget ($self->children) { 1698 for my $widget ($self->children) {
1672 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1673 1700
1674 $widget->configure ( 1701 $widget->configure (
1675 $x[$c], $y[$r], 1702 $x[$c], $y[$r],
1676 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1677 ); 1704 );
… …
1686 1713
1687use List::Util qw(min max); 1714use List::Util qw(min max);
1688 1715
1689our @ISA = CFPlus::UI::Container::; 1716our @ISA = CFPlus::UI::Container::;
1690 1717
1691sub add_fixed {
1692 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1693
1694 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1695 $self->SUPER::add ($child);
1696}
1697
1698sub _scale($$$) { 1718sub _scale($$$) {
1699 my ($mode, $val, $max) = @_; 1719 my ($rel, $val, $max) = @_;
1700 1720
1701 $mode eq "abs" ? $val 1721 $rel ? $val * $max : $val
1702 : $mode eq "rel" ? $val * $max
1703 : 0
1704} 1722}
1705 1723
1706sub size_request { 1724sub size_request {
1707 my ($self) = @_; 1725 my ($self) = @_;
1708 1726
1709 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1727 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1710 1728
1711 # determine overall size by querying abs widgets 1729 # determine overall size by querying abs widgets
1712 for my $child ($self->visible_children) { 1730 for my $child ($self->visible_children) {
1713 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1731 unless ($child->{c_rel}) {
1732 my $x = $child->{c_x};
1733 my $y = $child->{c_y};
1714 1734
1715 if ($pos eq "abs") {
1716 $w = _scale $size, $w, $child->{req_w};
1717 $h = _scale $size, $h, $child->{req_h};
1718
1719 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1735 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1720 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1736 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1721 } 1737 }
1722 } 1738 }
1723 1739
1724 my $W = $x2 - $x1; 1740 my $W = $x2 - $x1;
1725 my $H = $y2 - $y1; 1741 my $H = $y2 - $y1;
1726 1742
1727 # now layout remaining widgets 1743 # now layout remaining widgets
1728 for my $child ($self->visible_children) { 1744 for my $child ($self->visible_children) {
1729 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1745 if ($child->{c_rel}) {
1746 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1747 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1730 1748
1731 if ($pos ne "abs") {
1732 $x = _scale $pos, $x, $W;
1733 $y = _scale $pos, $x, $H;
1734 $w = _scale $size, $w, $child->{req_w};
1735 $h = _scale $size, $h, $child->{req_h};
1736
1737 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1738 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1739 } 1751 }
1740 } 1752 }
1741 1753
1742 my $W = $x2 - $x1; 1754 my $W = $x2 - $x1;
1743 my $H = $y2 - $y1; 1755 my $H = $y2 - $y1;
… …
1747 1759
1748sub invoke_size_allocate { 1760sub invoke_size_allocate {
1749 my ($self, $W, $H) = @_; 1761 my ($self, $W, $H) = @_;
1750 1762
1751 for my $child ($self->visible_children) { 1763 for my $child ($self->visible_children) {
1752 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1764 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1765 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1753 1766
1754 $x = _scale $pos, $x, $W; 1767 $x += $child->{c_halign} * $child->{req_w};
1755 $y = _scale $pos, $x, $H; 1768 $y += $child->{c_valign} * $child->{req_h};
1756 $w = _scale $size, $w, $W;
1757 $h = _scale $size, $h, $H;
1758 1769
1759 $child->configure ($x, $y, $w, $h); 1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1760 } 1771 }
1761 1772
1762 1 1773 1
1763} 1774}
1764 1775
… …
1768 1779
1769our @ISA = CFPlus::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1770 1781
1771sub size_request { 1782sub size_request {
1772 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1773 1786
1774 $self->{vertical} 1787 $self->{vertical}
1775 ? ( 1788 ? (
1776 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1777 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1778 ) 1791 )
1779 : ( 1792 : (
1780 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1781 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1782 ) 1795 )
1783} 1796}
1784 1797
1785sub invoke_size_allocate { 1798sub invoke_size_allocate {
1786 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
… …
1910 1923
1911 delete $self->{ox}; 1924 delete $self->{ox};
1912 $self->SUPER::realloc; 1925 $self->SUPER::realloc;
1913} 1926}
1914 1927
1928sub clear {
1929 my ($self) = @_;
1930
1931 $self->set_text ("");
1932}
1933
1915sub set_text { 1934sub set_text {
1916 my ($self, $text) = @_; 1935 my ($self, $text) = @_;
1917 1936
1918 return if $self->{text} eq "T$text"; 1937 return if $self->{text} eq "T$text";
1919 $self->{text} = "T$text"; 1938 $self->{text} = "T$text";
… …
2027 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2046 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2028 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2047 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2029 : ($self->{h} - $size->[1]) * 0.5); 2048 : ($self->{h} - $size->[1]) * 0.5);
2030 }; 2049 };
2031 2050
2032 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2051# unless ($self->{list}) {
2033 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2052# $self->{list} = CFPlus::OpenGL::glGenList;
2053# CFPlus::OpenGL::glNewList $self->{list};
2054# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2055# CFPlus::OpenGL::glEndList;
2056# }
2057#
2058# CFPlus::OpenGL::glCallList $self->{list};
2034 2059
2035 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2060 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2036} 2061}
2062
2063#sub destroy {
2064# my ($self) = @_;
2065#
2066# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2067#
2068# $self->SUPER::destroy;
2069#}
2037 2070
2038############################################################################# 2071#############################################################################
2039 2072
2040package CFPlus::UI::EntryBase; 2073package CFPlus::UI::EntryBase;
2041 2074
… …
2047 my $class = shift; 2080 my $class = shift;
2048 2081
2049 $class->SUPER::new ( 2082 $class->SUPER::new (
2050 fg => [1, 1, 1], 2083 fg => [1, 1, 1],
2051 bg => [0, 0, 0, 0.2], 2084 bg => [0, 0, 0, 0.2],
2085 outline => [0.6, 0.3, 0.1],
2052 active_bg => [1, 1, 1, 0.5], 2086 active_bg => [0, 0, 1, .2],
2053 active_fg => [0, 0, 0], 2087 active_fg => [1, 1, 1],
2088 active_outline => [1, 1, 0],
2054 can_hover => 1, 2089 can_hover => 1,
2055 can_focus => 1, 2090 can_focus => 1,
2056 valign => 0, 2091 valign => 0,
2057 can_events => 1, 2092 can_events => 1,
2058 ellipsise => 0, 2093 ellipsise => 0,
… …
2215 2250
2216 unless (exists $self->{cur_h}) { 2251 unless (exists $self->{cur_h}) {
2217 my $text = substr $self->{text}, 0, $self->{cursor}; 2252 my $text = substr $self->{text}, 0, $self->{cursor};
2218 utf8::encode $text; 2253 utf8::encode $text;
2219 2254
2220 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2255 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2221 } 2256 }
2222 2257
2258 glColor_premultiply @{$self->{active_fg}};
2223 glBegin GL_LINES; 2259 glBegin GL_LINES;
2224 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2260 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
2225 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2261 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2262 glEnd;
2263
2264 glLineWidth 3;
2265 glColor @{$self->{active_outline}};
2266 glBegin GL_LINE_LOOP;
2267 glVertex 0, 0;
2268 glVertex $self->{w} - 1, 0;
2269 glVertex $self->{w} - 1, $self->{h} - 1;
2270 glVertex 0, $self->{h} - 1;
2271 glEnd;
2272 glLineWidth 1;
2273
2274 } else {
2275 glColor @{$self->{outline}};
2276 glTranslate .375, .375;
2277 glBegin GL_LINE_STRIP;
2278 glVertex 0, $self->{h} * .5;
2279 glVertex 0, $self->{h} - 3;
2280 glVertex $self->{w} - 1, $self->{h} - 3;
2281 glVertex $self->{w} - 1, $self->{h} * .5;
2226 glEnd; 2282 glEnd;
2227 } 2283 }
2228} 2284}
2229 2285
2230############################################################################# 2286#############################################################################
… …
2317 1 2373 1
2318} 2374}
2319 2375
2320############################################################################# 2376#############################################################################
2321 2377
2378package CFPlus::UI::ButtonBin;
2379
2380our @ISA = CFPlus::UI::Bin::;
2381
2382use CFPlus::OpenGL;
2383
2384my @tex =
2385 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2386 qw(b1_button_inactive.png b1_button_active.png);
2387
2388sub new {
2389 my $class = shift;
2390
2391 $class->SUPER::new (
2392 can_hover => 1,
2393 align => 0,
2394 valign => 0,
2395 can_events => 1,
2396 @_
2397 )
2398}
2399
2400sub invoke_button_up {
2401 my ($self, $ev, $x, $y) = @_;
2402
2403 $self->emit ("activate")
2404 if $x >= 0 && $x < $self->{w}
2405 && $y >= 0 && $y < $self->{h};
2406
2407 1
2408}
2409
2410sub _draw {
2411 my ($self) = @_;
2412
2413 glEnable GL_TEXTURE_2D;
2414 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2415 glColor 0, 0, 0, 1;
2416
2417 my $tex = $tex[$GRAB == $self];
2418 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2419
2420 glDisable GL_TEXTURE_2D;
2421
2422 $self->SUPER::_draw;
2423}
2424
2425#############################################################################
2426
2322package CFPlus::UI::Button; 2427package CFPlus::UI::Button;
2323 2428
2324our @ISA = CFPlus::UI::Label::; 2429our @ISA = CFPlus::UI::Label::;
2325 2430
2326use CFPlus::OpenGL; 2431use CFPlus::OpenGL;
… …
2460sub new { 2565sub new {
2461 my $class = shift; 2566 my $class = shift;
2462 2567
2463 my $self = $class->SUPER::new ( 2568 my $self = $class->SUPER::new (
2464 can_events => 0, 2569 can_events => 0,
2570 scale => 1,
2465 @_, 2571 @_,
2466 ); 2572 );
2467 2573
2468 $self->{path} || $self->{tex} 2574 $self->{path} || $self->{tex}
2469 or Carp::croak "'path' or 'tex' attributes required"; 2575 or Carp::croak "'path' or 'tex' attributes required";
… …
2494} 2600}
2495 2601
2496sub size_request { 2602sub size_request {
2497 my ($self) = @_; 2603 my ($self) = @_;
2498 2604
2499 ($self->{tex}{w}, $self->{tex}{h}) 2605 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2500} 2606}
2501 2607
2502sub _draw { 2608sub _draw {
2503 my ($self) = @_; 2609 my ($self) = @_;
2504 2610
… …
2514 } 2620 }
2515 2621
2516 glEnable GL_TEXTURE_2D; 2622 glEnable GL_TEXTURE_2D;
2517 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2623 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2518 2624
2519 $tex->draw_quad (0, 0, $w, $h); 2625 $tex->draw_quad_alpha (0, 0, $w, $h);
2520 2626
2521 glDisable GL_TEXTURE_2D; 2627 glDisable GL_TEXTURE_2D;
2522} 2628}
2523 2629
2524############################################################################# 2630#############################################################################
… …
2826 2932
2827 $self->SUPER::invoke_button_down ($ev, $x, $y); 2933 $self->SUPER::invoke_button_down ($ev, $x, $y);
2828 2934
2829 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2935 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2830 2936
2831 $self->invoke_mouse_motion ($ev, $x, $y) 2937 $self->invoke_mouse_motion ($ev, $x, $y);
2938
2939 1
2832} 2940}
2833 2941
2834sub invoke_mouse_motion { 2942sub invoke_mouse_motion {
2835 my ($self, $ev, $x, $y) = @_; 2943 my ($self, $ev, $x, $y) = @_;
2836 2944
… …
2856 2964
2857 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 2965 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2858 2966
2859 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 2967 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2860 2968
2861 ! ! $delta 2969 1
2862} 2970}
2863 2971
2864sub update { 2972sub update {
2865 my ($self) = @_; 2973 my ($self) = @_;
2866 2974
… …
2997} 3105}
2998 3106
2999sub size_request { 3107sub size_request {
3000 my ($self) = @_; 3108 my ($self) = @_;
3001 3109
3002 my ($empty, $slider) = @{ $self->{children} }; 3110 my ($empty, $slider) = $self->visible_children;
3003 3111
3004 local $self->{children} = [$empty, $slider]; 3112 local $self->{children} = [$empty, $slider];
3005 $self->SUPER::size_request 3113 $self->SUPER::size_request
3006} 3114}
3007 3115
… …
3396 glTranslate 0.375, 0.375; 3504 glTranslate 0.375, 0.375;
3397 3505
3398 my ($w, $h) = @$self{qw(w h)}; 3506 my ($w, $h) = @$self{qw(w h)};
3399 3507
3400 glColor 1, 0.8, 0.4; 3508 glColor 1, 0.8, 0.4;
3401 glBegin GL_QUADS; 3509 glRect 0, 0, $w, $h;
3402 glVertex 0 , 0;
3403 glVertex 0 , $h;
3404 glVertex $w, $h;
3405 glVertex $w, 0;
3406 glEnd;
3407 3510
3408 glColor 0, 0, 0; 3511 glColor 0, 0, 0;
3409 glBegin GL_LINE_LOOP; 3512 glBegin GL_LINE_LOOP;
3410 glVertex 0 , 0; 3513 glVertex 0 , 0;
3411 glVertex 0 , $h; 3514 glVertex 0 , $h;
… …
3439 3542
3440 if ($self->{anim} && $self->{animspeed}) { 3543 if ($self->{anim} && $self->{animspeed}) {
3441 CFPlus::weaken (my $widget = $self); 3544 CFPlus::weaken (my $widget = $self);
3442 3545
3443 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3546 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3444 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3547 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3445 $self->{timer} = Event->timer ( 3548 $self->{timer} = Event->timer (
3446 parked => 1, 3549 parked => 1,
3447 cb => sub { 3550 cb => sub {
3448 return unless $::CONN && $widget; 3551 return unless $::CONN && $widget;
3449 3552
… …
3593 children => [ 3696 children => [
3594 (new CFPlus::UI::Label markup => $left, expand => 1), 3697 (new CFPlus::UI::Label markup => $left, expand => 1),
3595 (new CFPlus::UI::Label markup => $right, align => +1), 3698 (new CFPlus::UI::Label markup => $right, align => +1),
3596 ], 3699 ],
3597 ; 3700 ;
3598 3701
3599 } else { 3702 } else {
3600 $widget = new CFPlus::UI::Label 3703 $widget = new CFPlus::UI::Label
3601 can_hover => 1, 3704 can_hover => 1,
3602 can_events => 1, 3705 can_events => 1,
3603 markup => $widget, 3706 markup => $widget,
… …
3739 buttonbar => (new CFPlus::UI::Buttonbar), 3842 buttonbar => (new CFPlus::UI::Buttonbar),
3740 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3843 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3741 # filter => # will be put between multiplexer and $self 3844 # filter => # will be put between multiplexer and $self
3742 @_, 3845 @_,
3743 ); 3846 );
3744 3847
3745 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3848 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3746 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3849 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3747 3850
3851 {
3852 Scalar::Util::weaken (my $wself = $self);
3853
3854 $self->{multiplexer}->connect (c_add => sub {
3855 my ($mplex, $widgets) = @_;
3856
3857 for my $child (@$widgets) {
3858 Scalar::Util::weaken $child;
3859 $child->{c_tab_} ||= do {
3860 my $tab =
3861 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3862 ? $child->{c_tab}
3863 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3864
3865 $tab->connect (activate => sub {
3866 $wself->set_current_page ($child);
3867 });
3868
3869 $tab
3870 };
3871
3872 $self->{buttonbar}->add ($child->{c_tab_});
3873 }
3874 });
3875
3876 $self->{multiplexer}->connect (c_remove => sub {
3877 my ($mplex, $widgets) = @_;
3878
3879 for my $child (@$widgets) {
3880 $wself->{buttonbar}->remove ($child->{c_tab_});
3881 }
3882 });
3883 }
3884
3748 $self 3885 $self
3749} 3886}
3750 3887
3751sub add { 3888sub add {
3889 my ($self, @widgets) = @_;
3890
3891 $self->{multiplexer}->add (@widgets)
3892}
3893
3894sub remove {
3895 my ($self, @widgets) = @_;
3896
3897 $self->{multiplexer}->remove (@widgets)
3898}
3899
3900sub pages {
3901 my ($self) = @_;
3902 $self->{multiplexer}->children
3903}
3904
3905sub add_tab {
3752 my ($self, $title, $widget, $tooltip) = @_; 3906 my ($self, $title, $widget, $tooltip) = @_;
3753 3907
3754 CFPlus::weaken $self; 3908 $title = [$title, $tooltip] unless ref $title;
3909 $widget->{c_tab} = $title;
3755 3910
3756 $self->{buttonbar}->add (new CFPlus::UI::Button
3757 markup => $title,
3758 tooltip => $tooltip,
3759 on_activate => sub { $self->set_current_page ($widget) },
3760 );
3761
3762 $self->{multiplexer}->add ($widget); 3911 $self->add ($widget);
3763} 3912}
3764 3913
3765sub get_current_page { 3914sub get_current_page {
3766 my ($self) = @_; 3915 my ($self) = @_;
3767 3916

Diff Legend

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