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.425 by root, Fri Aug 10 04:02:13 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
… …
593 593
594# using global variables seems a bit hacky, but passing through all drawing 594# using global variables seems a bit hacky, but passing through all drawing
595# functions seems pointless. 595# functions seems pointless.
596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 596our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
597 597
598sub draw { 598#sub draw {
599 my ($self) = @_; 599#CFPlus.xs
600
601 return unless $self->{h} && $self->{w};
602
603 # update screen rectangle
604 local $draw_x = $draw_x + $self->{x};
605 local $draw_y = $draw_y + $self->{y};
606
607 # skip widgets that are entirely outside the drawing area
608 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
609 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
610
611 glPushMatrix;
612 glTranslate $self->{x}, $self->{y}, 0;
613
614 if ($self == $HOVER && $self->{can_hover}) {
615 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
616 glEnable GL_BLEND;
617 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
618 glBegin GL_QUADS;
619 glVertex 0 , 0;
620 glVertex $self->{w}, 0;
621 glVertex $self->{w}, $self->{h};
622 glVertex 0 , $self->{h};
623 glEnd;
624 glDisable GL_BLEND;
625 }
626
627 if ($ENV{CFPLUS_DEBUG} & 1) {
628 glPushMatrix;
629 glColor 1, 1, 0, 1;
630 glTranslate 0.375, 0.375;
631 glBegin GL_LINE_LOOP;
632 glVertex 0 , 0;
633 glVertex $self->{w} - 1, 0;
634 glVertex $self->{w} - 1, $self->{h} - 1;
635 glVertex 0 , $self->{h} - 1;
636 glEnd;
637 glPopMatrix;
638 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
639 }
640
641 $self->_draw;
642 glPopMatrix;
643}
644 600
645sub _draw { 601sub _draw {
646 my ($self) = @_; 602 my ($self) = @_;
647 603
648 warn "no draw defined for $self\n"; 604 warn "no draw defined for $self\n";
649} 605}
650 606
651my $cntx;#d#
652sub DESTROY { 607sub DESTROY {
653 my ($self) = @_; 608 my ($self) = @_;
654 609
655 return if CFPlus::in_destruct; 610 return if CFPlus::in_destruct;
656 611
… …
741 can_events => 0, 696 can_events => 0,
742 %arg, 697 %arg,
743 ); 698 );
744 699
745 $self->add (@$children) 700 $self->add (@$children)
746 if $children; 701 if $children && @$children;
747 702
748 $self 703 $self
749} 704}
750 705
751sub realloc { 706sub realloc {
… …
760 my ($self, @widgets) = @_; 715 my ($self, @widgets) = @_;
761 716
762 $_->set_parent ($self) 717 $_->set_parent ($self)
763 for @widgets; 718 for @widgets;
764 719
720 # TODO: only do this in widgets that need it, e.g. root, fixed
765 use sort 'stable'; 721 use sort 'stable';
766 722
767 $self->{children} = [ 723 $self->{children} = [
768 sort { $a->{z} <=> $b->{z} } 724 sort { $a->{z} <=> $b->{z} }
769 @{$self->{children}}, @widgets 725 @{$self->{children}}, @widgets
770 ]; 726 ];
771 727
772 $self->realloc; 728 $self->realloc;
729
730 $self->emit (c_add => \@widgets);
731
732 map $_+0, @widgets
773} 733}
774 734
775sub children { 735sub children {
776 @{ $_[0]{children} } 736 @{ $_[0]{children} }
777} 737}
778 738
779sub remove { 739sub remove {
780 my ($self, $child) = @_; 740 my ($self, @widgets) = @_;
781 741
742 $self->emit (c_remove => \@widgets);
743
744 for my $child (@widgets) {
782 delete $child->{parent}; 745 delete $child->{parent};
783 $child->hide; 746 $child->hide;
784
785 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 747 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
748 }
786 749
787 $self->realloc; 750 $self->realloc;
788} 751}
789 752
790sub clear { 753sub clear {
791 my ($self) = @_; 754 my ($self) = @_;
792 755
793 my $children = delete $self->{children}; 756 my $children = $self->{children};
794 $self->{children} = []; 757 $self->{children} = [];
795 758
796 for (@$children) { 759 for (@$children) {
797 delete $_->{parent}; 760 delete $_->{parent};
798 $_->hide; 761 $_->hide;
… …
818} 781}
819 782
820sub _draw { 783sub _draw {
821 my ($self) = @_; 784 my ($self) = @_;
822 785
823 $_->draw for @{$self->{children}}; 786 $_->draw for $self->visible_children;
824} 787}
825 788
826############################################################################# 789#############################################################################
827 790
828package CFPlus::UI::Bin; 791package CFPlus::UI::Bin;
… …
838} 801}
839 802
840sub add { 803sub add {
841 my ($self, $child) = @_; 804 my ($self, $child) = @_;
842 805
843 $self->SUPER::remove ($_) for @{ $self->{children} }; 806 $self->clear;
844 $self->SUPER::add ($child); 807 $self->SUPER::add ($child);
845} 808}
846 809
847sub remove { 810sub remove {
848 my ($self, $widget) = @_; 811 my ($self, $widget) = @_;
… …
990 $self->{view_x} = $x; 953 $self->{view_x} = $x;
991 $self->{view_y} = $y; 954 $self->{view_y} = $y;
992 955
993 $self->emit (changed => $x, $y); 956 $self->emit (changed => $x, $y);
994 $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);
995 } 976 }
996} 977}
997 978
998# 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
999sub coord2local { 980sub coord2local {
… …
1046 my $child = delete $arg{child}; 1027 my $child = delete $arg{child};
1047 1028
1048 my $self; 1029 my $self;
1049 1030
1050 my $hslider = new CFPlus::UI::Slider 1031 my $hslider = new CFPlus::UI::Slider
1032 c_col => 0,
1033 c_row => 1,
1051 vertical => 0, 1034 vertical => 0,
1052 range => [0, 0, 1, 0.01], # HACK fix 1035 range => [0, 0, 1, 0.01], # HACK fix
1053 on_changed => sub { 1036 on_changed => sub {
1054 $self->{hpos} = $_[1]; 1037 $self->{hpos} = $_[1];
1055 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1056 }, 1039 },
1057 ; 1040 ;
1058 1041
1059 my $vslider = new CFPlus::UI::Slider 1042 my $vslider = new CFPlus::UI::Slider
1043 c_col => 1,
1044 c_row => 0,
1060 vertical => 1, 1045 vertical => 1,
1061 range => [0, 0, 1, 0.01], # HACK fix 1046 range => [0, 0, 1, 0.01], # HACK fix
1062 on_changed => sub { 1047 on_changed => sub {
1063 $self->{vpos} = $_[1]; 1048 $self->{vpos} = $_[1];
1064 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1075 row_expand => [1, 0], 1060 row_expand => [1, 0],
1076 %arg, 1061 %arg,
1077 ); 1062 );
1078 1063
1079 $self->{vp} = new CFPlus::UI::ViewPort 1064 $self->{vp} = new CFPlus::UI::ViewPort
1065 c_col => 0,
1066 c_row => 0,
1080 expand => 1, 1067 expand => 1,
1081 scroll_x => $self->{scroll_x}, 1068 scroll_x => $self->{scroll_x},
1082 scroll_y => $self->{scroll_y}, 1069 scroll_y => $self->{scroll_y},
1083 on_changed => sub { 1070 on_changed => sub {
1084 my ($vp, $x, $y) = @_; 1071 my ($vp, $x, $y) = @_;
… …
1086 $vp->{parent}{hslider}->set_value ($x); 1073 $vp->{parent}{hslider}->set_value ($x);
1087 $vp->{parent}{vslider}->set_value ($y); 1074 $vp->{parent}{vslider}->set_value ($y);
1088 1075
1089 0 1076 0
1090 }, 1077 },
1078 on_size_allocate => sub {
1079 my ($vp, $w, $h) = @_;
1080 $vp->{parent}->update_slider;
1081 0
1082 },
1091 ; 1083 ;
1092 1084
1093 $self->SUPER::add_at (0, 0, $self->{vp}); 1085 $self->SUPER::add ($self->{vp});
1094 1086
1095 $self->add ($child) if $child; 1087 $self->add ($child) if $child;
1096 1088
1097 $self 1089 $self
1098} 1090}
1099
1100#TODO# update range on size_allocate depending on child
1101 1091
1102sub add { 1092sub add {
1103 my ($self, $widget) = @_; 1093 my ($self, $widget) = @_;
1104 1094
1105 $self->{vp}->add ($self->{child} = $widget); 1095 $self->{vp}->add ($self->{child} = $widget);
1106} 1096}
1107 1097
1098sub set_offset { shift->{vp}->set_offset (@_) }
1099sub set_center { shift->{vp}->set_center (@_) }
1100sub make_visible { shift->{vp}->make_visible (@_) }
1101
1108sub update_slider { 1102sub update_slider {
1109 my ($self) = @_; 1103 my ($self) = @_;
1110 1104
1111 my $child = ($self->{vp} or return)->child; 1105 my $child = ($self->{vp} or return)->child;
1112 1106
1107 if ($self->{scroll_x}) {
1113 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1108 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1114 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1109 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1115 1110
1116 my $visible = $w1 > $w2; 1111 my $visible = $w1 > $w2;
1117 if ($visible != $self->{hslider}{visible}) { 1112 if ($visible != $self->{hslider_visible}) {
1113 $self->{hslider_visible} = $visible;
1118 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider}) 1114 $visible ? $self->SUPER::add ($self->{hslider})
1119 : $self->{hslider}->hide; 1115 : $self->SUPER::remove ($self->{hslider});
1116 }
1120 } 1117 }
1121 1118
1119 if ($self->{scroll_y}) {
1122 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1120 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1123 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1121 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1124 1122
1125 my $visible = $h1 > $h2; 1123 my $visible = $h1 > $h2;
1126 if ($visible != $self->{vslider}{visible}) { 1124 if ($visible != $self->{vslider_visible}) {
1125 $self->{vslider_visible} = $visible;
1127 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider}) 1126 $visible ? $self->SUPER::add ($self->{vslider})
1128 : $self->{vslider}->hide; 1127 : $self->SUPER::remove ($self->{vslider});
1128 }
1129 }
1130}
1131
1132sub start_dragging {
1133 my ($self, $ev) = @_;
1134
1135 $self->grab_focus;
1136
1137 my $ox = $self->{vp}{view_x};
1138 my $oy = $self->{vp}{view_y};
1139
1140 $self->{motion} = sub {
1141 my ($ev, $x, $y) = @_;
1142
1143 $ox -= $ev->{xrel};
1144 $oy -= $ev->{yrel};
1145
1146 $self->{vp}->set_offset ($ox, $oy);
1129 } 1147 };
1130}
1131
1132sub update {
1133 my ($self) = @_;
1134
1135 $self->update_slider;
1136 $self->SUPER::update;
1137} 1148}
1138 1149
1139sub invoke_mouse_wheel { 1150sub invoke_mouse_wheel {
1140 my ($self, $ev) = @_; 1151 my ($self, $ev) = @_;
1141 1152
1142 $self->{vslider}->emit (mouse_wheel => $ev) 1153 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1143 if $ev->{dy};
1144
1145 $self->{hslider}->emit (mouse_wheel => $ev) 1154 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1146 if $ev->{dx};
1147 1155
1148 1 1156 1
1149} 1157}
1150 1158
1151sub invoke_button_down { 1159sub invoke_button_down {
1152 my ($self, $ev, $x, $y) = @_; 1160 my ($self, $ev, $x, $y) = @_;
1153 1161
1154 if ($ev->{button} == 2) { 1162 if ($ev->{button} == 2) {
1155 $self->grab_focus; 1163 $self->start_dragging ($ev);
1156
1157 my $ox = $self->{vp}{view_x} + $ev->{x};
1158 my $oy = $self->{vp}{view_y} + $ev->{y};
1159
1160 $self->{motion} = sub {
1161 my ($ev, $x, $y) = @_;
1162
1163 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1164 $self->update;
1165 };
1166
1167 return 1; 1164 return 1;
1168 } 1165 }
1169 1166
1170 0 1167 0
1171} 1168}
… …
1581 1578
1582############################################################################# 1579#############################################################################
1583 1580
1584package CFPlus::UI::Table; 1581package CFPlus::UI::Table;
1585 1582
1586our @ISA = CFPlus::UI::Base::; 1583our @ISA = CFPlus::UI::Container::;
1587 1584
1588use List::Util qw(max sum); 1585use List::Util qw(max sum);
1589 1586
1590use CFPlus::OpenGL; 1587use CFPlus::OpenGL;
1591 1588
1592sub new { 1589sub new {
1593 my $class = shift; 1590 my $class = shift;
1594 1591
1595 $class->SUPER::new ( 1592 $class->SUPER::new (
1596 children => [],
1597 col_expand => [], 1593 col_expand => [],
1598 row_expand => [], 1594 row_expand => [],
1599 @_, 1595 @_,
1600 ) 1596 )
1601} 1597}
1602 1598
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 { 1599sub add {
1609 my $self = shift; 1600 my ($self, @widgets) = @_;
1610 1601
1611 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d# 1602 for my $child (@widgets) {
1612 $self->add_at (@_); 1603 $child->{c_rowspan} ||= 1;
1604 $child->{c_colspan} ||= 1;
1605 }
1606
1607 $self->SUPER::add (@widgets);
1613} 1608}
1614 1609
1615sub add_at { 1610sub add_at {
1616 my $self = shift; 1611 my $self = shift;
1617 1612
1613 my @widgets;
1614
1618 while (@_) { 1615 while (@_) {
1619 my ($col, $row, $child) = splice @_, 0, 3, (); 1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1620 1617
1621 $child->{row} = $row; 1618 $child->{c_row} = $row;
1622 $child->{col} = $col; 1619 $child->{c_col} = $col;
1623 1620
1624 $child->{rowspan} ||= 1; 1621 push @widgets, $child;
1625 $child->{colspan} ||= 1;
1626
1627 $child->set_parent ($self);
1628 $self->{children}[$row][$col] = $child;
1629 } 1622 }
1630 1623
1631 $self->{force_realloc} = 1; 1624 $self->add (@widgets);
1632 $self->{force_size_alloc} = 1;
1633 $self->realloc;
1634} 1625}
1635 1626
1636sub remove { 1627sub get_wh {
1637 my ($self, $child) = @_; 1628 my ($self) = @_;
1638 1629
1639 for (@{ $self->{children} }) { 1630 my (@w, @h);
1640 for (@{ $_ || [] }) { 1631
1641 $_ = undef if $_ == $child; 1632 my @children = $self->children;
1633
1634 # first pass, columns
1635 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1636 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1637
1638 my $sw = sum @w[$c .. $c + $cs - 1];
1639
1640 if ($w > $sw) {
1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1642 } 1642 }
1643 } 1643 }
1644}
1645 1644
1646# TODO: move to container class maybe? send children a signal on removal? 1645 # second pass, rows
1647sub clear {
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) { 1646 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1669 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1647 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1670 1648
1671 my $sw = sum @w[$c .. $c + $cs - 1];
1672 my $sh = sum @h[$r .. $r + $rs - 1]; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1673 1650
1674 if ($w > $sw) {
1675 $_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1];
1676 }
1677
1678 if ($h > $sh) { 1651 if ($h > $sh) {
1679 $_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1]; 1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1680 } 1653 }
1681 } 1654 }
1682 1655
1683 (\@w, \@h) 1656 (\@w, \@h)
1684} 1657}
… …
1717 1690
1718 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1691 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1719 1692
1720 CFPlus::UI::harmonize $hs; 1693 CFPlus::UI::harmonize $hs;
1721 1694
1722 my (@x, @y);
1723
1724 for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1725 for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1726 1697
1727 for my $widget ($self->children) { 1698 for my $widget ($self->children) {
1728 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)};
1729 1700
1730 $widget->configure ( 1701 $widget->configure (
1731 $x[$c], $y[$r], 1702 $x[$c], $y[$r],
1732 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1733 ); 1704 );
1734 } 1705 }
1735 1706
1736 1 1707 1
1737} 1708}
1738 1709
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}
1762
1763############################################################################# 1710#############################################################################
1764 1711
1765package CFPlus::UI::Fixed; 1712package CFPlus::UI::Fixed;
1766 1713
1767use List::Util qw(min max); 1714use List::Util qw(min max);
1768 1715
1769our @ISA = CFPlus::UI::Container::; 1716our @ISA = CFPlus::UI::Container::;
1770 1717
1771sub add {
1772 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1773
1774 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1775 $self->SUPER::add ($child);
1776}
1777
1778sub _scale($$$) { 1718sub _scale($$$) {
1779 my ($mode, $val, $max) = @_; 1719 my ($rel, $val, $max) = @_;
1780 1720
1781 $mode eq "abs" ? $val 1721 $rel ? $val * $max : $val
1782 : $mode eq "rel" ? $val * $max
1783 : 0
1784} 1722}
1785 1723
1786sub size_request { 1724sub size_request {
1787 my ($self) = @_; 1725 my ($self) = @_;
1788 1726
1789 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1727 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1790 1728
1791 # determine overall size by querying abs widgets 1729 # determine overall size by querying abs widgets
1792 for my $child ($self->visible_children) { 1730 for my $child ($self->visible_children) {
1793 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};
1794 1734
1795 if ($pos eq "abs") {
1796 $w = _scale $size, $w, $child->{req_w};
1797 $h = _scale $size, $h, $child->{req_h};
1798
1799 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1735 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1800 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1736 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1801 } 1737 }
1802 } 1738 }
1803 1739
1804 my $W = $x2 - $x1; 1740 my $W = $x2 - $x1;
1805 my $H = $y2 - $y1; 1741 my $H = $y2 - $y1;
1806 1742
1807 # now layout remaining widgets 1743 # now layout remaining widgets
1808 for my $child ($self->visible_children) { 1744 for my $child ($self->visible_children) {
1809 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;
1810 1748
1811 if ($pos ne "abs") {
1812 $x = _scale $pos, $x, $W;
1813 $y = _scale $pos, $x, $H;
1814 $w = _scale $size, $w, $child->{req_w};
1815 $h = _scale $size, $h, $child->{req_h};
1816
1817 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1749 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1818 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1750 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1819 } 1751 }
1820 } 1752 }
1821 1753
1822 my $W = $x2 - $x1; 1754 my $W = $x2 - $x1;
1823 my $H = $y2 - $y1; 1755 my $H = $y2 - $y1;
… …
1827 1759
1828sub invoke_size_allocate { 1760sub invoke_size_allocate {
1829 my ($self, $W, $H) = @_; 1761 my ($self, $W, $H) = @_;
1830 1762
1831 for my $child ($self->visible_children) { 1763 for my $child ($self->visible_children) {
1832 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;
1833 1766
1834 $x = _scale $pos, $x, $W; 1767 $x += $child->{c_halign} * $child->{req_w};
1835 $y = _scale $pos, $x, $H; 1768 $y += $child->{c_valign} * $child->{req_h};
1836 $w = _scale $size, $w, $child->{req_w};
1837 $h = _scale $size, $h, $child->{req_h};
1838 1769
1839 $child->configure ($x, $y, $w, $h); 1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1840 } 1771 }
1841 1772
1842 1 1773 1
1843} 1774}
1844 1775
… …
1848 1779
1849our @ISA = CFPlus::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1850 1781
1851sub size_request { 1782sub size_request {
1852 my ($self) = @_; 1783 my ($self) = @_;
1784
1785 my @children = $self->visible_children;
1853 1786
1854 $self->{vertical} 1787 $self->{vertical}
1855 ? ( 1788 ? (
1856 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1789 (List::Util::max map $_->{req_w}, @children),
1857 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1790 (List::Util::sum map $_->{req_h}, @children),
1858 ) 1791 )
1859 : ( 1792 : (
1860 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1793 (List::Util::sum map $_->{req_w}, @children),
1861 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1794 (List::Util::max map $_->{req_h}, @children),
1862 ) 1795 )
1863} 1796}
1864 1797
1865sub invoke_size_allocate { 1798sub invoke_size_allocate {
1866 my ($self, $w, $h) = @_; 1799 my ($self, $w, $h) = @_;
… …
1990 1923
1991 delete $self->{ox}; 1924 delete $self->{ox};
1992 $self->SUPER::realloc; 1925 $self->SUPER::realloc;
1993} 1926}
1994 1927
1928sub clear {
1929 my ($self) = @_;
1930
1931 $self->set_text ("");
1932}
1933
1995sub set_text { 1934sub set_text {
1996 my ($self, $text) = @_; 1935 my ($self, $text) = @_;
1997 1936
1998 return if $self->{text} eq "T$text"; 1937 return if $self->{text} eq "T$text";
1999 $self->{text} = "T$text"; 1938 $self->{text} = "T$text";
… …
2107 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2046 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2108 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2047 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2109 : ($self->{h} - $size->[1]) * 0.5); 2048 : ($self->{h} - $size->[1]) * 0.5);
2110 }; 2049 };
2111 2050
2112 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2051# unless ($self->{list}) {
2113 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};
2114 2059
2115 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2060 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2116} 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#}
2117 2070
2118############################################################################# 2071#############################################################################
2119 2072
2120package CFPlus::UI::EntryBase; 2073package CFPlus::UI::EntryBase;
2121 2074
… …
2127 my $class = shift; 2080 my $class = shift;
2128 2081
2129 $class->SUPER::new ( 2082 $class->SUPER::new (
2130 fg => [1, 1, 1], 2083 fg => [1, 1, 1],
2131 bg => [0, 0, 0, 0.2], 2084 bg => [0, 0, 0, 0.2],
2085 outline => [0.6, 0.3, 0.1],
2132 active_bg => [1, 1, 1, 0.5], 2086 active_bg => [0, 0, 1, .2],
2133 active_fg => [0, 0, 0], 2087 active_fg => [1, 1, 1],
2088 active_outline => [1, 1, 0],
2134 can_hover => 1, 2089 can_hover => 1,
2135 can_focus => 1, 2090 can_focus => 1,
2136 valign => 0, 2091 valign => 0,
2137 can_events => 1, 2092 can_events => 1,
2138 ellipsise => 0, 2093 ellipsise => 0,
… …
2295 2250
2296 unless (exists $self->{cur_h}) { 2251 unless (exists $self->{cur_h}) {
2297 my $text = substr $self->{text}, 0, $self->{cursor}; 2252 my $text = substr $self->{text}, 0, $self->{cursor};
2298 utf8::encode $text; 2253 utf8::encode $text;
2299 2254
2300 @$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);
2301 } 2256 }
2302 2257
2258 glColor_premultiply @{$self->{active_fg}};
2303 glBegin GL_LINES; 2259 glBegin GL_LINES;
2304 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};
2305 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;
2306 glEnd; 2282 glEnd;
2307 } 2283 }
2308} 2284}
2309 2285
2310############################################################################# 2286#############################################################################
… …
2397 1 2373 1
2398} 2374}
2399 2375
2400############################################################################# 2376#############################################################################
2401 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
2402package CFPlus::UI::Button; 2427package CFPlus::UI::Button;
2403 2428
2404our @ISA = CFPlus::UI::Label::; 2429our @ISA = CFPlus::UI::Label::;
2405 2430
2406use CFPlus::OpenGL; 2431use CFPlus::OpenGL;
… …
2540sub new { 2565sub new {
2541 my $class = shift; 2566 my $class = shift;
2542 2567
2543 my $self = $class->SUPER::new ( 2568 my $self = $class->SUPER::new (
2544 can_events => 0, 2569 can_events => 0,
2570 scale => 1,
2545 @_, 2571 @_,
2546 ); 2572 );
2547 2573
2548 $self->{path} || $self->{tex} 2574 $self->{path} || $self->{tex}
2549 or Carp::croak "'path' or 'tex' attributes required"; 2575 or Carp::croak "'path' or 'tex' attributes required";
… …
2574} 2600}
2575 2601
2576sub size_request { 2602sub size_request {
2577 my ($self) = @_; 2603 my ($self) = @_;
2578 2604
2579 ($self->{tex}{w}, $self->{tex}{h}) 2605 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2580} 2606}
2581 2607
2582sub _draw { 2608sub _draw {
2583 my ($self) = @_; 2609 my ($self) = @_;
2584 2610
… …
2594 } 2620 }
2595 2621
2596 glEnable GL_TEXTURE_2D; 2622 glEnable GL_TEXTURE_2D;
2597 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2623 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2598 2624
2599 $tex->draw_quad (0, 0, $w, $h); 2625 $tex->draw_quad_alpha (0, 0, $w, $h);
2600 2626
2601 glDisable GL_TEXTURE_2D; 2627 glDisable GL_TEXTURE_2D;
2602} 2628}
2603 2629
2604############################################################################# 2630#############################################################################
… …
2906 2932
2907 $self->SUPER::invoke_button_down ($ev, $x, $y); 2933 $self->SUPER::invoke_button_down ($ev, $x, $y);
2908 2934
2909 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2935 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2910 2936
2911 $self->invoke_mouse_motion ($ev, $x, $y) 2937 $self->invoke_mouse_motion ($ev, $x, $y);
2938
2939 1
2912} 2940}
2913 2941
2914sub invoke_mouse_motion { 2942sub invoke_mouse_motion {
2915 my ($self, $ev, $x, $y) = @_; 2943 my ($self, $ev, $x, $y) = @_;
2916 2944
… …
2936 2964
2937 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 2965 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2938 2966
2939 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 2967 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2940 2968
2941 ! ! $delta 2969 1
2942} 2970}
2943 2971
2944sub update { 2972sub update {
2945 my ($self) = @_; 2973 my ($self) = @_;
2946 2974
… …
3077} 3105}
3078 3106
3079sub size_request { 3107sub size_request {
3080 my ($self) = @_; 3108 my ($self) = @_;
3081 3109
3082 my ($empty, $slider) = @{ $self->{children} }; 3110 my ($empty, $slider) = $self->visible_children;
3083 3111
3084 local $self->{children} = [$empty, $slider]; 3112 local $self->{children} = [$empty, $slider];
3085 $self->SUPER::size_request 3113 $self->SUPER::size_request
3086} 3114}
3087 3115
… …
3476 glTranslate 0.375, 0.375; 3504 glTranslate 0.375, 0.375;
3477 3505
3478 my ($w, $h) = @$self{qw(w h)}; 3506 my ($w, $h) = @$self{qw(w h)};
3479 3507
3480 glColor 1, 0.8, 0.4; 3508 glColor 1, 0.8, 0.4;
3481 glBegin GL_QUADS; 3509 glRect 0, 0, $w, $h;
3482 glVertex 0 , 0;
3483 glVertex 0 , $h;
3484 glVertex $w, $h;
3485 glVertex $w, 0;
3486 glEnd;
3487 3510
3488 glColor 0, 0, 0; 3511 glColor 0, 0, 0;
3489 glBegin GL_LINE_LOOP; 3512 glBegin GL_LINE_LOOP;
3490 glVertex 0 , 0; 3513 glVertex 0 , 0;
3491 glVertex 0 , $h; 3514 glVertex 0 , $h;
… …
3519 3542
3520 if ($self->{anim} && $self->{animspeed}) { 3543 if ($self->{anim} && $self->{animspeed}) {
3521 CFPlus::weaken (my $widget = $self); 3544 CFPlus::weaken (my $widget = $self);
3522 3545
3523 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3546 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3524 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3547 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3525 $self->{timer} = Event->timer ( 3548 $self->{timer} = Event->timer (
3526 parked => 1, 3549 parked => 1,
3527 cb => sub { 3550 cb => sub {
3528 return unless $::CONN && $widget; 3551 return unless $::CONN && $widget;
3529 3552
… …
3566 3589
3567 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3590 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3568 if ($anim && @$anim) { 3591 if ($anim && @$anim) {
3569 delete $self->{wait_face}; 3592 delete $self->{wait_face};
3570 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3593 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3594 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]) {
3595 unless ($tex->{name} || $tex->{loading}) {
3596 $tex->upload (sub { $self->reconfigure });
3597 }
3598 }
3571 } 3599 }
3572 } 3600 }
3573} 3601}
3574 3602
3575sub size_request { 3603sub size_request {
3576 my ($self) = @_; 3604 my ($self) = @_;
3577 3605
3578 if ($::CONN) { 3606 if ($::CONN) {
3579 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3607 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3580 if (my $tex = $::CONN->{texture}[$faceid]) { 3608 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3609 if ($tex->{name}) {
3581 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3610 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3611 } elsif (!$tex->{loading}) {
3612 $tex->upload (sub { $self->reconfigure });
3613 }
3582 } else { 3614 } else {
3583 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3615 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3584 $self->realloc; 3616 $self->reconfigure;
3585 }); 3617 });
3586 } 3618 }
3587 } 3619 }
3588 } 3620 }
3589 3621
… …
3607} 3639}
3608 3640
3609sub _draw { 3641sub _draw {
3610 my ($self) = @_; 3642 my ($self) = @_;
3611 3643
3612 return unless $::CONN;
3613
3614 $self->SUPER::_draw; 3644 $self->SUPER::_draw;
3615 3645
3616 my $faceid = $::CONN->{faceid}[$self->{face}] 3646 if (my $tex = $self->{tex}) {
3617 or return;
3618
3619 my $tex = $::CONN->{texture}[$faceid];
3620
3621 if ($tex) {
3622 glEnable GL_TEXTURE_2D; 3647 glEnable GL_TEXTURE_2D;
3623 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3648 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3624 glColor 0, 0, 0, 1; 3649 glColor 0, 0, 0, 1;
3625 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3650 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3626 glDisable GL_TEXTURE_2D; 3651 glDisable GL_TEXTURE_2D;
… …
3678 children => [ 3703 children => [
3679 (new CFPlus::UI::Label markup => $left, expand => 1), 3704 (new CFPlus::UI::Label markup => $left, expand => 1),
3680 (new CFPlus::UI::Label markup => $right, align => +1), 3705 (new CFPlus::UI::Label markup => $right, align => +1),
3681 ], 3706 ],
3682 ; 3707 ;
3683 3708
3684 } else { 3709 } else {
3685 $widget = new CFPlus::UI::Label 3710 $widget = new CFPlus::UI::Label
3686 can_hover => 1, 3711 can_hover => 1,
3687 can_events => 1, 3712 can_events => 1,
3688 markup => $widget, 3713 markup => $widget,
… …
3824 buttonbar => (new CFPlus::UI::Buttonbar), 3849 buttonbar => (new CFPlus::UI::Buttonbar),
3825 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3850 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3826 # filter => # will be put between multiplexer and $self 3851 # filter => # will be put between multiplexer and $self
3827 @_, 3852 @_,
3828 ); 3853 );
3829 3854
3830 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3855 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3831 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3856 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3832 3857
3858 {
3859 Scalar::Util::weaken (my $wself = $self);
3860
3861 $self->{multiplexer}->connect (c_add => sub {
3862 my ($mplex, $widgets) = @_;
3863
3864 for my $child (@$widgets) {
3865 Scalar::Util::weaken $child;
3866 $child->{c_tab_} ||= do {
3867 my $tab =
3868 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
3869 ? $child->{c_tab}
3870 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3871
3872 $tab->connect (activate => sub {
3873 $wself->set_current_page ($child);
3874 });
3875
3876 $tab
3877 };
3878
3879 $self->{buttonbar}->add ($child->{c_tab_});
3880 }
3881 });
3882
3883 $self->{multiplexer}->connect (c_remove => sub {
3884 my ($mplex, $widgets) = @_;
3885
3886 for my $child (@$widgets) {
3887 $wself->{buttonbar}->remove ($child->{c_tab_});
3888 }
3889 });
3890 }
3891
3833 $self 3892 $self
3834} 3893}
3835 3894
3836sub add { 3895sub add {
3896 my ($self, @widgets) = @_;
3897
3898 $self->{multiplexer}->add (@widgets)
3899}
3900
3901sub remove {
3902 my ($self, @widgets) = @_;
3903
3904 $self->{multiplexer}->remove (@widgets)
3905}
3906
3907sub pages {
3908 my ($self) = @_;
3909 $self->{multiplexer}->children
3910}
3911
3912sub add_tab {
3837 my ($self, $title, $widget, $tooltip) = @_; 3913 my ($self, $title, $widget, $tooltip) = @_;
3838 3914
3839 CFPlus::weaken $self; 3915 $title = [$title, $tooltip] unless ref $title;
3916 $widget->{c_tab} = $title;
3840 3917
3841 $self->{buttonbar}->add (new CFPlus::UI::Button
3842 markup => $title,
3843 tooltip => $tooltip,
3844 on_activate => sub { $self->set_current_page ($widget) },
3845 );
3846
3847 $self->{multiplexer}->add ($widget); 3918 $self->add ($widget);
3848} 3919}
3849 3920
3850sub get_current_page { 3921sub get_current_page {
3851 my ($self) = @_; 3922 my ($self) = @_;
3852 3923
… …
4135} 4206}
4136 4207
4137sub update { 4208sub update {
4138 my ($self) = @_; 4209 my ($self) = @_;
4139 4210
4140 $::WANT_REFRESH++; 4211 $::WANT_REFRESH->start;
4141} 4212}
4142 4213
4143sub add { 4214sub add {
4144 my ($self, @children) = @_; 4215 my ($self, @children) = @_;
4145 4216
… …
4182 while ($self->{refresh_hook}) { 4253 while ($self->{refresh_hook}) {
4183 $_->() 4254 $_->()
4184 for values %{delete $self->{refresh_hook}}; 4255 for values %{delete $self->{refresh_hook}};
4185 } 4256 }
4186 4257
4187 if ($self->{realloc}) { 4258 while ($self->{realloc}) {
4188 my %queue; 4259 my %queue;
4189 my @queue; 4260 my @queue;
4190 my $widget; 4261 my $widget;
4191 4262
4192 outer: 4263 outer:
… …
4239 } 4310 }
4240 } 4311 }
4241 4312
4242 delete $self->{realloc}{$widget+0}; 4313 delete $self->{realloc}{$widget+0};
4243 } 4314 }
4244 }
4245 4315
4246 while (my $size_alloc = delete $self->{size_alloc}) { 4316 while (my $size_alloc = delete $self->{size_alloc}) {
4247 my @queue = sort { $b->{visible} <=> $a->{visible} } 4317 my @queue = sort { $a->{visible} <=> $b->{visible} }
4248 values %$size_alloc; 4318 values %$size_alloc;
4249 4319
4250 while () { 4320 while () {
4251 my $widget = pop @queue || last; 4321 my $widget = pop @queue || last;
4252 4322
4253 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4323 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4254 4324
4255 $w = 0 if $w < 0;
4256 $h = 0 if $h < 0;
4257
4258 $w = max $widget->{min_w}, $w; 4325 $w = max $widget->{min_w}, $w;
4259 $h = max $widget->{min_h}, $h; 4326 $h = max $widget->{min_h}, $h;
4260 4327
4261# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4328# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4262# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4329# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4263 4330
4264 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4331 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4265 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4332 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4266 4333
4267 $w = int $w + 0.5; 4334 $w = int $w + 0.5;
4268 $h = int $h + 0.5; 4335 $h = int $h + 0.5;
4269 4336
4270 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4337 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4271 $widget->{old_w} = $widget->{w}; 4338 $widget->{old_w} = $widget->{w};
4272 $widget->{old_h} = $widget->{h}; 4339 $widget->{old_h} = $widget->{h};
4273 4340
4274 $widget->{w} = $w; 4341 $widget->{w} = $w;
4275 $widget->{h} = $h; 4342 $widget->{h} = $h;
4276 4343
4277 $widget->emit (size_allocate => $w, $h); 4344 $widget->emit (size_allocate => $w, $h);
4345 }
4278 } 4346 }
4279 } 4347 }
4280 } 4348 }
4281 4349
4282 while ($self->{post_alloc_hook}) { 4350 while ($self->{post_alloc_hook}) {

Diff Legend

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