| … | |
… | |
| 1027 | my $child = delete $arg{child}; |
1027 | my $child = delete $arg{child}; |
| 1028 | |
1028 | |
| 1029 | my $self; |
1029 | my $self; |
| 1030 | |
1030 | |
| 1031 | my $hslider = new CFPlus::UI::Slider |
1031 | my $hslider = new CFPlus::UI::Slider |
| 1032 | col => 0, |
1032 | c_col => 0, |
| 1033 | row => 1, |
1033 | c_row => 1, |
| 1034 | vertical => 0, |
1034 | vertical => 0, |
| 1035 | range => [0, 0, 1, 0.01], # HACK fix |
1035 | range => [0, 0, 1, 0.01], # HACK fix |
| 1036 | on_changed => sub { |
1036 | on_changed => sub { |
| 1037 | $self->{hpos} = $_[1]; |
1037 | $self->{hpos} = $_[1]; |
| 1038 | $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); |
1038 | $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); |
| 1039 | }, |
1039 | }, |
| 1040 | ; |
1040 | ; |
| 1041 | |
1041 | |
| 1042 | my $vslider = new CFPlus::UI::Slider |
1042 | my $vslider = new CFPlus::UI::Slider |
| 1043 | col => 1, |
1043 | c_col => 1, |
| 1044 | row => 0, |
1044 | c_row => 0, |
| 1045 | vertical => 1, |
1045 | vertical => 1, |
| 1046 | range => [0, 0, 1, 0.01], # HACK fix |
1046 | range => [0, 0, 1, 0.01], # HACK fix |
| 1047 | on_changed => sub { |
1047 | on_changed => sub { |
| 1048 | $self->{vpos} = $_[1]; |
1048 | $self->{vpos} = $_[1]; |
| 1049 | $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); |
1049 | $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); |
| … | |
… | |
| 1060 | row_expand => [1, 0], |
1060 | row_expand => [1, 0], |
| 1061 | %arg, |
1061 | %arg, |
| 1062 | ); |
1062 | ); |
| 1063 | |
1063 | |
| 1064 | $self->{vp} = new CFPlus::UI::ViewPort |
1064 | $self->{vp} = new CFPlus::UI::ViewPort |
| 1065 | col => 0, |
1065 | c_col => 0, |
| 1066 | row => 0, |
1066 | c_row => 0, |
| 1067 | expand => 1, |
1067 | expand => 1, |
| 1068 | scroll_x => $self->{scroll_x}, |
1068 | scroll_x => $self->{scroll_x}, |
| 1069 | scroll_y => $self->{scroll_y}, |
1069 | scroll_y => $self->{scroll_y}, |
| 1070 | on_changed => sub { |
1070 | on_changed => sub { |
| 1071 | my ($vp, $x, $y) = @_; |
1071 | my ($vp, $x, $y) = @_; |
| … | |
… | |
| 1598 | |
1598 | |
| 1599 | sub add { |
1599 | sub add { |
| 1600 | my ($self, @widgets) = @_; |
1600 | my ($self, @widgets) = @_; |
| 1601 | |
1601 | |
| 1602 | for my $child (@widgets) { |
1602 | for my $child (@widgets) { |
| 1603 | $child->{rowspan} ||= 1; |
1603 | $child->{c_rowspan} ||= 1; |
| 1604 | $child->{colspan} ||= 1; |
1604 | $child->{c_colspan} ||= 1; |
| 1605 | } |
1605 | } |
| 1606 | |
1606 | |
| 1607 | $self->SUPER::add (@widgets); |
1607 | $self->SUPER::add (@widgets); |
| 1608 | } |
1608 | } |
| 1609 | |
1609 | |
| … | |
… | |
| 1613 | my @widgets; |
1613 | my @widgets; |
| 1614 | |
1614 | |
| 1615 | while (@_) { |
1615 | while (@_) { |
| 1616 | my ($col, $row, $child) = splice @_, 0, 3, (); |
1616 | my ($col, $row, $child) = splice @_, 0, 3, (); |
| 1617 | |
1617 | |
| 1618 | $child->{row} = $row; |
1618 | $child->{c_row} = $row; |
| 1619 | $child->{col} = $col; |
1619 | $child->{c_col} = $col; |
| 1620 | |
1620 | |
| 1621 | push @widgets, $child; |
1621 | push @widgets, $child; |
| 1622 | } |
1622 | } |
| 1623 | |
1623 | |
| 1624 | $self->add (@widgets); |
1624 | $self->add (@widgets); |
| … | |
… | |
| 1630 | my (@w, @h); |
1630 | my (@w, @h); |
| 1631 | |
1631 | |
| 1632 | my @children = $self->children; |
1632 | my @children = $self->children; |
| 1633 | |
1633 | |
| 1634 | # first pass, columns |
1634 | # first pass, columns |
| 1635 | for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { |
1635 | for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) { |
| 1636 | my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; |
1636 | my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)}; |
| 1637 | |
1637 | |
| 1638 | my $sw = sum @w[$c .. $c + $cs - 1]; |
1638 | my $sw = sum @w[$c .. $c + $cs - 1]; |
| 1639 | |
1639 | |
| 1640 | if ($w > $sw) { |
1640 | if ($w > $sw) { |
| 1641 | $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; |
1641 | $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; |
| 1642 | } |
1642 | } |
| 1643 | } |
1643 | } |
| 1644 | |
1644 | |
| 1645 | # second pass, rows |
1645 | # second pass, rows |
| 1646 | for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { |
1646 | for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) { |
| 1647 | my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; |
1647 | my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)}; |
| 1648 | |
1648 | |
| 1649 | my $sh = sum @h[$r .. $r + $rs - 1]; |
1649 | my $sh = sum @h[$r .. $r + $rs - 1]; |
| 1650 | |
1650 | |
| 1651 | if ($h > $sh) { |
1651 | if ($h > $sh) { |
| 1652 | $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; |
1652 | $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; |
| … | |
… | |
| 1694 | |
1694 | |
| 1695 | my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } |
1695 | my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } |
| 1696 | my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } |
1696 | my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } |
| 1697 | |
1697 | |
| 1698 | for my $widget ($self->children) { |
1698 | for my $widget ($self->children) { |
| 1699 | 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)}; |
| 1700 | |
1700 | |
| 1701 | $widget->configure ( |
1701 | $widget->configure ( |
| 1702 | $x[$c], $y[$r], |
1702 | $x[$c], $y[$r], |
| 1703 | $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], |
1703 | $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], |
| 1704 | ); |
1704 | ); |
