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.385 by root, Fri Jul 20 16:32:17 2007 UTC vs.
Revision 1.439 by root, Sun Sep 16 13:04:36 2007 UTC

… …
30 $TOOLTIP->{owner} = $widget; 30 $TOOLTIP->{owner} = $widget;
31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner}; 31 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32 32
33 return if $ENV{CFPLUS_DEBUG} & 8; 33 return if $ENV{CFPLUS_DEBUG} & 8;
34 34
35 my $tip = $widget->{tooltip};
36
37 $tip = $tip->($widget) if CODE:: eq ref $tip;
38
39 $TOOLTIP->set_tooltip_from ($widget); 35 $TOOLTIP->set_tooltip_from ($widget);
40 $TOOLTIP->show; 36 $TOOLTIP->show;
41 } 37 }
42 38
43 return; 39 return;
… …
113 } 109 }
114 110
115 if ($GRAB) { 111 if ($GRAB) {
116 if ($ev->{button} == 4 || $ev->{button} == 5) { 112 if ($ev->{button} == 4 || $ev->{button} == 5) {
117 # mousewheel 113 # mousewheel
118 $ev->{dx} = 0;
119 $ev->{dy} = $ev->{button} * 2 - 9; 114 my $delta = $ev->{button} * 2 - 9;
115 my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
116
117 $ev->{dx} = $shift ? $delta : 0;
118 $ev->{dy} = $shift ? 0 : $delta;
119
120 $GRAB->emit (mouse_wheel => $ev); 120 $GRAB->emit (mouse_wheel => $ev);
121 } else { 121 } else {
122 $GRAB->emit (button_down => $ev) 122 $GRAB->emit (button_down => $ev)
123 } 123 }
124 } 124 }
… …
269 $self->emit ("destroy"); 269 $self->emit ("destroy");
270 %$self = (); 270 %$self = ();
271} 271}
272 272
273sub TO_JSON { 273sub TO_JSON {
274 { __widget_ref__ => $_[0]{s_id} } 274 { "\fw" => $_[0]{s_id} }
275} 275}
276 276
277sub show { 277sub show {
278 my ($self) = @_; 278 my ($self) = @_;
279 279
… …
358 358
359 $self->{force_w} = $w; 359 $self->{force_w} = $w;
360 $self->{force_h} = $h; 360 $self->{force_h} = $h;
361 361
362 $self->realloc; 362 $self->realloc;
363}
364
365# travsle the widget chain up to find the maximum "physical" size constraints
366sub get_max_wh {
367 my ($self) = @_;
368
369 return ($self->{alloc_w}, $self->{alloc_h})
370 if $self->{alloc_w} && !$self->{root}{realloc}{$self+0};
371
372 return $self->{parent}->get_max_wh
373 if $self->{parent};
374
375 ($::WIDTH, $::HEIGHT)
363} 376}
364 377
365sub size_request { 378sub size_request {
366 require Carp; 379 require Carp;
367 Carp::confess "size_request is abstract"; 380 Carp::confess "size_request is abstract";
… …
547 560
548 # parent 561 # parent
549 $self->{parent} && $self->{parent}->emit ($signal, @args) 562 $self->{parent} && $self->{parent}->emit ($signal, @args)
550} 563}
551 564
552sub find_widget { 565#sub find_widget {
553 my ($self, $x, $y) = @_; 566# in .xs
554
555 return () unless $self->{can_events};
556
557 return $self
558 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
559 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
560
561 ()
562}
563 567
564sub set_parent { 568sub set_parent {
565 my ($self, $parent) = @_; 569 my ($self, $parent) = @_;
566 570
567 CFPlus::weaken ($self->{parent} = $parent); 571 CFPlus::weaken ($self->{parent} = $parent);
… …
598 602
599# using global variables seems a bit hacky, but passing through all drawing 603# using global variables seems a bit hacky, but passing through all drawing
600# functions seems pointless. 604# functions seems pointless.
601our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn 605our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
602 606
603sub draw { 607#sub draw {
604 my ($self) = @_; 608#CFPlus.xs
605
606 return unless $self->{h} && $self->{w};
607
608 # update screen rectangle
609 local $draw_x = $draw_x + $self->{x};
610 local $draw_y = $draw_y + $self->{y};
611
612 # skip widgets that are entirely outside the drawing area
613 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
614 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
615
616 glPushMatrix;
617 glTranslate $self->{x}, $self->{y}, 0;
618
619 if ($self == $HOVER && $self->{can_hover}) {
620 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
621 glEnable GL_BLEND;
622 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
623 glBegin GL_QUADS;
624 glVertex 0 , 0;
625 glVertex $self->{w}, 0;
626 glVertex $self->{w}, $self->{h};
627 glVertex 0 , $self->{h};
628 glEnd;
629 glDisable GL_BLEND;
630 }
631
632 if ($ENV{CFPLUS_DEBUG} & 1) {
633 glPushMatrix;
634 glColor 1, 1, 0, 1;
635 glTranslate 0.375, 0.375;
636 glBegin GL_LINE_LOOP;
637 glVertex 0 , 0;
638 glVertex $self->{w} - 1, 0;
639 glVertex $self->{w} - 1, $self->{h} - 1;
640 glVertex 0 , $self->{h} - 1;
641 glEnd;
642 glPopMatrix;
643 #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
644 }
645
646 $self->_draw;
647 glPopMatrix;
648}
649 609
650sub _draw { 610sub _draw {
651 my ($self) = @_; 611 my ($self) = @_;
652 612
653 warn "no draw defined for $self\n"; 613 warn "no draw defined for $self\n";
654} 614}
655 615
656my $cntx;#d#
657sub DESTROY { 616sub DESTROY {
658 my ($self) = @_; 617 my ($self) = @_;
659 618
660 return if CFPlus::in_destruct; 619 return if CFPlus::in_destruct;
661 620
621 local $@;
662 eval { $self->destroy }; 622 eval { $self->destroy };
663 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 623 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664 624
665 delete $WIDGET{$self+0}; 625 delete $WIDGET{$self+0};
666} 626}
… …
674use strict; 634use strict;
675use CFPlus::OpenGL; 635use CFPlus::OpenGL;
676 636
677sub new { 637sub new {
678 my $class = shift; 638 my $class = shift;
679
680 # range [value, low, high, page]
681 639
682 $class->SUPER::new ( 640 $class->SUPER::new (
683 #bg => [0, 0, 0, 0.2], 641 #bg => [0, 0, 0, 0.2],
684 #active_bg => [1, 1, 1, 0.5], 642 #active_bg => [1, 1, 1, 0.5],
685 @_ 643 @_
… …
697 my ($w, $h) = @$self{qw(w h)}; 655 my ($w, $h) = @$self{qw(w h)};
698 656
699 glEnable GL_BLEND; 657 glEnable GL_BLEND;
700 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 658 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
701 glColor_premultiply @$color; 659 glColor_premultiply @$color;
702
703 glBegin GL_QUADS;
704 glVertex 0 , 0;
705 glVertex 0 , $h;
706 glVertex $w, $h; 660 glRect 0, 0, $w, $h;
707 glVertex $w, 0;
708 glEnd;
709
710 glDisable GL_BLEND; 661 glDisable GL_BLEND;
711 } 662 }
712} 663}
713 664
714############################################################################# 665#############################################################################
… …
746 can_events => 0, 697 can_events => 0,
747 %arg, 698 %arg,
748 ); 699 );
749 700
750 $self->add (@$children) 701 $self->add (@$children)
751 if $children; 702 if $children && @$children;
752 703
753 $self 704 $self
754} 705}
755 706
756sub realloc { 707sub realloc {
… …
765 my ($self, @widgets) = @_; 716 my ($self, @widgets) = @_;
766 717
767 $_->set_parent ($self) 718 $_->set_parent ($self)
768 for @widgets; 719 for @widgets;
769 720
721 # TODO: only do this in widgets that need it, e.g. root, fixed
770 use sort 'stable'; 722 use sort 'stable';
771 723
772 $self->{children} = [ 724 $self->{children} = [
773 sort { $a->{z} <=> $b->{z} } 725 sort { $a->{z} <=> $b->{z} }
774 @{$self->{children}}, @widgets 726 @{$self->{children}}, @widgets
775 ]; 727 ];
776 728
777 $self->realloc; 729 $self->realloc;
730
731 $self->emit (c_add => \@widgets);
732
733 map $_+0, @widgets
778} 734}
779 735
780sub children { 736sub children {
781 @{ $_[0]{children} } 737 @{ $_[0]{children} }
782} 738}
783 739
784sub remove { 740sub remove {
785 my ($self, $child) = @_; 741 my ($self, @widgets) = @_;
786 742
743 $self->emit (c_remove => \@widgets);
744
745 for my $child (@widgets) {
787 delete $child->{parent}; 746 delete $child->{parent};
788 $child->hide; 747 $child->hide;
789
790 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 748 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
749 }
791 750
792 $self->realloc; 751 $self->realloc;
793} 752}
794 753
795sub clear { 754sub clear {
796 my ($self) = @_; 755 my ($self) = @_;
797 756
798 my $children = delete $self->{children}; 757 my $children = $self->{children};
799 $self->{children} = []; 758 $self->{children} = [];
800 759
801 for (@$children) { 760 for (@$children) {
802 delete $_->{parent}; 761 delete $_->{parent};
803 $_->hide; 762 $_->hide;
… …
823} 782}
824 783
825sub _draw { 784sub _draw {
826 my ($self) = @_; 785 my ($self) = @_;
827 786
828 $_->draw for @{$self->{children}}; 787 $_->draw for $self->visible_children;
829} 788}
830 789
831############################################################################# 790#############################################################################
832 791
833package CFPlus::UI::Bin; 792package CFPlus::UI::Bin;
… …
843} 802}
844 803
845sub add { 804sub add {
846 my ($self, $child) = @_; 805 my ($self, $child) = @_;
847 806
848 $self->SUPER::remove ($_) for @{ $self->{children} }; 807 $self->clear;
849 $self->SUPER::add ($child); 808 $self->SUPER::add ($child);
850} 809}
851 810
852sub remove { 811sub remove {
853 my ($self, $widget) = @_; 812 my ($self, $widget) = @_;
… …
871 830
872 1 831 1
873} 832}
874 833
875############################################################################# 834#############################################################################
876
877# back-buffered drawing area 835# back-buffered drawing area
878 836
879package CFPlus::UI::Window; 837package CFPlus::UI::Window;
880 838
881our @ISA = CFPlus::UI::Bin::; 839our @ISA = CFPlus::UI::Bin::;
… …
963sub size_request { 921sub size_request {
964 my ($self) = @_; 922 my ($self) = @_;
965 923
966 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 924 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
967 925
968 $w = 10 if $self->{scroll_x}; 926 $w = 1 if $self->{scroll_x};
969 $h = 10 if $self->{scroll_y}; 927 $h = 1 if $self->{scroll_y};
970 928
971 ($w, $h) 929 ($w, $h)
972} 930}
973 931
974sub invoke_size_allocate { 932sub invoke_size_allocate {
… …
998 $self->emit (changed => $x, $y); 956 $self->emit (changed => $x, $y);
999 $self->update; 957 $self->update;
1000 } 958 }
1001} 959}
1002 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);
976 }
977}
978
1003# 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
1004sub coord2local { 980sub coord2local {
1005 my ($self, $x, $y) = @_; 981 my ($self, $x, $y) = @_;
1006 982
1007 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y}) 983 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
… …
1020 my ($self, $x, $y) = @_; 996 my ($self, $x, $y) = @_;
1021 997
1022 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 998 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1023 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 999 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
1024 ) { 1000 ) {
1025 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y}) 1001 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1026 } else { 1002 } else {
1027 $self->CFPlus::UI::Base::find_widget ($x, $y) 1003 $self->CFPlus::UI::Base::find_widget ($x, $y)
1028 } 1004 }
1029} 1005}
1030 1006
… …
1051 my $child = delete $arg{child}; 1027 my $child = delete $arg{child};
1052 1028
1053 my $self; 1029 my $self;
1054 1030
1055 my $hslider = new CFPlus::UI::Slider 1031 my $hslider = new CFPlus::UI::Slider
1032 c_col => 0,
1033 c_row => 1,
1056 vertical => 0, 1034 vertical => 0,
1057 range => [0, 0, 1, 0.01], # HACK fix 1035 range => [0, 0, 1, 0.01], # HACK fix
1058 on_changed => sub { 1036 on_changed => sub {
1059 $self->{hpos} = $_[1]; 1037 $self->{hpos} = $_[1];
1060 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061 }, 1039 },
1062 ; 1040 ;
1063 1041
1064 my $vslider = new CFPlus::UI::Slider 1042 my $vslider = new CFPlus::UI::Slider
1043 c_col => 1,
1044 c_row => 0,
1065 vertical => 1, 1045 vertical => 1,
1066 range => [0, 0, 1, 0.01], # HACK fix 1046 range => [0, 0, 1, 0.01], # HACK fix
1067 on_changed => sub { 1047 on_changed => sub {
1068 $self->{vpos} = $_[1]; 1048 $self->{vpos} = $_[1];
1069 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1080 row_expand => [1, 0], 1060 row_expand => [1, 0],
1081 %arg, 1061 %arg,
1082 ); 1062 );
1083 1063
1084 $self->{vp} = new CFPlus::UI::ViewPort 1064 $self->{vp} = new CFPlus::UI::ViewPort
1065 c_col => 0,
1066 c_row => 0,
1085 expand => 1, 1067 expand => 1,
1086 scroll_x => $self->{scroll_x}, 1068 scroll_x => $self->{scroll_x},
1087 scroll_y => $self->{scroll_y}, 1069 scroll_y => $self->{scroll_y},
1088 on_changed => sub { 1070 on_changed => sub {
1089 my ($vp, $x, $y) = @_; 1071 my ($vp, $x, $y) = @_;
… …
1091 $vp->{parent}{hslider}->set_value ($x); 1073 $vp->{parent}{hslider}->set_value ($x);
1092 $vp->{parent}{vslider}->set_value ($y); 1074 $vp->{parent}{vslider}->set_value ($y);
1093 1075
1094 0 1076 0
1095 }, 1077 },
1078 on_size_allocate => sub {
1079 my ($vp, $w, $h) = @_;
1080 $vp->{parent}->update_slider;
1081 0
1082 },
1096 ; 1083 ;
1097 1084
1098 $self->SUPER::add_at (0, 0, $self->{vp}); 1085 $self->SUPER::add ($self->{vp});
1099 1086
1100 $self->add ($child) if $child; 1087 $self->add ($child) if $child;
1101 1088
1102 $self 1089 $self
1103} 1090}
1104
1105#TODO# update range on size_allocate depending on child
1106 1091
1107sub add { 1092sub add {
1108 my ($self, $widget) = @_; 1093 my ($self, $widget) = @_;
1109 1094
1110 $self->{vp}->add ($self->{child} = $widget); 1095 $self->{vp}->add ($self->{child} = $widget);
1111} 1096}
1112 1097
1098sub set_offset { shift->{vp}->set_offset (@_) }
1099sub set_center { shift->{vp}->set_center (@_) }
1100sub make_visible { shift->{vp}->make_visible (@_) }
1101
1113sub update_slider { 1102sub update_slider {
1114 my ($self) = @_; 1103 my ($self) = @_;
1115 1104
1116 my $child = ($self->{vp} or return)->child; 1105 my $child = ($self->{vp} or return)->child;
1117 1106
1107 if ($self->{scroll_x}) {
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1108 my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1119 $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]);
1120 1110
1121 my $visible = $w1 > $w2; 1111 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider}{visible}) { 1112 if ($visible != $self->{hslider_visible}) {
1113 $self->{hslider_visible} = $visible;
1123 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider}) 1114 $visible ? $self->SUPER::add ($self->{hslider})
1124 : $self->{hslider}->hide; 1115 : $self->SUPER::remove ($self->{hslider});
1116 }
1125 } 1117 }
1126 1118
1119 if ($self->{scroll_y}) {
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1120 my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1128 $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]);
1129 1122
1130 my $visible = $h1 > $h2; 1123 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) { 1124 if ($visible != $self->{vslider_visible}) {
1125 $self->{vslider_visible} = $visible;
1132 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider}) 1126 $visible ? $self->SUPER::add ($self->{vslider})
1133 : $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);
1134 } 1147 };
1135}
1136
1137sub update {
1138 my ($self) = @_;
1139
1140 $self->SUPER::update;
1141 $self->update_slider;
1142} 1148}
1143 1149
1144sub invoke_mouse_wheel { 1150sub invoke_mouse_wheel {
1145 my ($self, $ev) = @_; 1151 my ($self, $ev) = @_;
1146 1152
1147 return 0 unless $ev->{dy}; # only vertical movements for now
1148
1149 $self->{vslider}->emit (mouse_wheel => $ev); 1153 $self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1154 $self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1150 1155
1151 1 1156 1
1152} 1157}
1153 1158
1154sub invoke_button_down { 1159sub invoke_button_down {
1155 my ($self, $ev, $x, $y) = @_; 1160 my ($self, $ev, $x, $y) = @_;
1156 1161
1157 if ($ev->{button} == 2) { 1162 if ($ev->{button} == 2) {
1158 $self->grab_focus; 1163 $self->start_dragging ($ev);
1159
1160 my $ox = $self->{vp}{view_x} + $ev->{x};
1161 my $oy = $self->{vp}{view_y} + $ev->{y};
1162
1163 $self->{motion} = sub {
1164 my ($ev, $x, $y) = @_;
1165
1166 $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1167 $self->update;
1168 };
1169
1170 return 1; 1164 return 1;
1171 } 1165 }
1172 1166
1173 0 1167 0
1174} 1168}
… …
1225 my ($w, $h) = @$self{qw(w h)}; 1219 my ($w, $h) = @$self{qw(w h)};
1226 1220
1227 glEnable GL_BLEND; 1221 glEnable GL_BLEND;
1228 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 1222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1229 glColor_premultiply @{ $self->{bg} }; 1223 glColor_premultiply @{ $self->{bg} };
1230
1231 glBegin GL_QUADS;
1232 glVertex 0 , 0;
1233 glVertex 0 , $h;
1234 glVertex $w, $h; 1224 glRect 0, 0, $w, $h;
1235 glVertex $w, 0;
1236 glEnd;
1237
1238 glDisable GL_BLEND; 1225 glDisable GL_BLEND;
1239 } 1226 }
1240 1227
1241 $self->SUPER::_draw; 1228 $self->SUPER::_draw;
1242} 1229}
… …
1584 1571
1585############################################################################# 1572#############################################################################
1586 1573
1587package CFPlus::UI::Table; 1574package CFPlus::UI::Table;
1588 1575
1589our @ISA = CFPlus::UI::Base::; 1576our @ISA = CFPlus::UI::Container::;
1590 1577
1591use List::Util qw(max sum); 1578use List::Util qw(max sum);
1592 1579
1593use CFPlus::OpenGL; 1580use CFPlus::OpenGL;
1594 1581
1595sub new { 1582sub new {
1596 my $class = shift; 1583 my $class = shift;
1597 1584
1598 $class->SUPER::new ( 1585 $class->SUPER::new (
1599 children => [],
1600 col_expand => [], 1586 col_expand => [],
1601 row_expand => [], 1587 row_expand => [],
1602 @_, 1588 @_,
1603 ) 1589 )
1604} 1590}
1605 1591
1606sub children {
1607 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1608}
1609
1610# TODO: store row/col info in child widget and use standard add/del
1611sub add { 1592sub add {
1612 my $self = shift; 1593 my ($self, @widgets) = @_;
1613 1594
1614 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d# 1595 for my $child (@widgets) {
1615 $self->add_at (@_); 1596 $child->{c_rowspan} ||= 1;
1597 $child->{c_colspan} ||= 1;
1598 }
1599
1600 $self->SUPER::add (@widgets);
1616} 1601}
1617 1602
1618sub add_at { 1603sub add_at {
1619 my $self = shift; 1604 my $self = shift;
1620 1605
1606 my @widgets;
1607
1621 while (@_) { 1608 while (@_) {
1622 my ($col, $row, $child) = splice @_, 0, 3, (); 1609 my ($col, $row, $child) = splice @_, 0, 3, ();
1623 1610
1624 $child->set_parent ($self); 1611 $child->{c_row} = $row;
1625 $self->{children}[$row][$col] = $child; 1612 $child->{c_col} = $col;
1626 }
1627 1613
1628 $self->{force_realloc} = 1; 1614 push @widgets, $child;
1629 $self->{force_size_alloc} = 1; 1615 }
1630 $self->realloc;
1631}
1632 1616
1633sub remove { 1617 $self->add (@widgets);
1618}
1619
1620sub get_wh {
1634 my ($self, $child) = @_; 1621 my ($self) = @_;
1635 1622
1636 for (@{ $self->{children} }) { 1623 my (@w, @h);
1637 for (@{ $_ || [] }) { 1624
1638 $_ = undef if $_ == $child; 1625 my @children = $self->children;
1626
1627 # first pass, columns
1628 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1629 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1630
1631 my $sw = sum @w[$c .. $c + $cs - 1];
1632
1633 if ($w > $sw) {
1634 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1639 } 1635 }
1640 } 1636 }
1641}
1642 1637
1643# TODO: move to container class maybe? send children a signal on removal? 1638 # second pass, rows
1644sub clear { 1639 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1645 my ($self) = @_;
1646
1647 my @children = $self->children;
1648 delete $self->{children};
1649
1650 for (@children) {
1651 delete $_->{parent};
1652 $_->hide;
1653 }
1654
1655 $self->realloc;
1656}
1657
1658sub get_wh {
1659 my ($self) = @_;
1660
1661 my (@w, @h);
1662
1663 for my $y (0 .. $#{$self->{children}}) {
1664 my $row = $self->{children}[$y]
1665 or next;
1666
1667 for my $x (0 .. $#$row) {
1668 my $widget = $row->[$x]
1669 or next;
1670 my ($w, $h) = @$widget{qw(req_w req_h)}; 1640 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1671 1641
1672 $w[$x] = max $w[$x], $w; 1642 my $sh = sum @h[$r .. $r + $rs - 1];
1673 $h[$y] = max $h[$y], $h; 1643
1644 if ($h > $sh) {
1645 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1674 } 1646 }
1675 } 1647 }
1676 1648
1677 (\@w, \@h) 1649 (\@w, \@h)
1678} 1650}
… …
1694 my ($ws, $hs) = $self->get_wh; 1666 my ($ws, $hs) = $self->get_wh;
1695 1667
1696 my $req_w = (sum @$ws) || 1; 1668 my $req_w = (sum @$ws) || 1;
1697 my $req_h = (sum @$hs) || 1; 1669 my $req_h = (sum @$hs) || 1;
1698 1670
1699 # TODO: nicer code 1671 # now linearly scale the rows/columns to the allocated size
1700 my @col_expand = @{$self->{col_expand}}; 1672 my @col_expand = @{$self->{col_expand}};
1701 @col_expand = (1) x @$ws unless @col_expand; 1673 @col_expand = (1) x @$ws unless @col_expand;
1702 my $col_expand = (sum @col_expand) || 1; 1674 my $col_expand = (sum @col_expand) || 1;
1703 1675
1704 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1676 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
… …
1711 1683
1712 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs; 1684 $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1713 1685
1714 CFPlus::UI::harmonize $hs; 1686 CFPlus::UI::harmonize $hs;
1715 1687
1716 my $y; 1688 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1689 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1717 1690
1718 for my $r (0 .. $#{$self->{children}}) { 1691 for my $widget ($self->children) {
1719 my $row = $self->{children}[$r] 1692 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1720 or next;
1721 1693
1722 my $x = 0; 1694 $widget->configure (
1723 my $row_h = $hs->[$r]; 1695 $x[$c], $y[$r],
1696 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1724 1697 );
1725 for my $c (0 .. $#$row) {
1726 my $col_w = $ws->[$c];
1727
1728 if (my $widget = $row->[$c]) {
1729 $widget->configure ($x, $y, $col_w, $row_h);
1730 }
1731
1732 $x += $col_w;
1733 }
1734
1735 $y += $row_h;
1736 } 1698 }
1737 1699
1738 1 1700 1
1739} 1701}
1740 1702
1741sub find_widget {
1742 my ($self, $x, $y) = @_;
1743
1744 $x -= $self->{x};
1745 $y -= $self->{y};
1746
1747 my $res;
1748
1749 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1750 $res = $_->find_widget ($x, $y)
1751 and return $res;
1752 }
1753
1754 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1755}
1756
1757sub _draw {
1758 my ($self) = @_;
1759
1760 for (grep $_, @{$self->{children}}) {
1761 $_->draw for grep $_, @$_;
1762 }
1763}
1764
1765############################################################################# 1703#############################################################################
1766 1704
1767package CFPlus::UI::Fixed; 1705package CFPlus::UI::Fixed;
1768 1706
1769use List::Util qw(min max); 1707use List::Util qw(min max);
1770 1708
1771our @ISA = CFPlus::UI::Container::; 1709our @ISA = CFPlus::UI::Container::;
1772 1710
1773sub add {
1774 my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1775
1776 $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1777 $self->SUPER::add ($child);
1778}
1779
1780sub _scale($$$) { 1711sub _scale($$$) {
1781 my ($mode, $val, $max) = @_; 1712 my ($rel, $val, $max) = @_;
1782 1713
1783 $mode eq "abs" ? $val 1714 $rel ? $val * $max : $val
1784 : $mode eq "rel" ? $val * $max
1785 : 0
1786} 1715}
1787 1716
1788sub size_request { 1717sub size_request {
1789 my ($self) = @_; 1718 my ($self) = @_;
1790 1719
1791 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0); 1720 my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1792 1721
1793 # determine overall size by querying abs widgets 1722 # determine overall size by querying abs widgets
1794 for my $child ($self->visible_children) { 1723 for my $child ($self->visible_children) {
1795 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1724 unless ($child->{c_rel}) {
1725 my $x = $child->{c_x};
1726 my $y = $child->{c_y};
1796 1727
1797 if ($pos eq "abs") {
1798 $w = _scale $size, $w, $child->{req_w};
1799 $h = _scale $size, $h, $child->{req_h};
1800
1801 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1728 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1802 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1729 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1803 } 1730 }
1804 } 1731 }
1805 1732
1806 my $W = $x2 - $x1; 1733 my $W = $x2 - $x1;
1807 my $H = $y2 - $y1; 1734 my $H = $y2 - $y1;
1808 1735
1809 # now layout remaining widgets 1736 # now layout remaining widgets
1810 for my $child ($self->visible_children) { 1737 for my $child ($self->visible_children) {
1811 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1738 if ($child->{c_rel}) {
1739 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1740 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1812 1741
1813 if ($pos ne "abs") {
1814 $x = _scale $pos, $x, $W;
1815 $y = _scale $pos, $x, $H;
1816 $w = _scale $size, $w, $child->{req_w};
1817 $h = _scale $size, $h, $child->{req_h};
1818
1819 $x1 = min $x1, $x; $x2 = max $x2, $x + $w; 1742 $x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1820 $y1 = min $y1, $y; $y2 = max $y2, $y + $h; 1743 $y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1821 } 1744 }
1822 } 1745 }
1823 1746
1824 my $W = $x2 - $x1; 1747 my $W = $x2 - $x1;
1825 my $H = $y2 - $y1; 1748 my $H = $y2 - $y1;
… …
1829 1752
1830sub invoke_size_allocate { 1753sub invoke_size_allocate {
1831 my ($self, $W, $H) = @_; 1754 my ($self, $W, $H) = @_;
1832 1755
1833 for my $child ($self->visible_children) { 1756 for my $child ($self->visible_children) {
1834 my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} }; 1757 my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
1758 my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1835 1759
1836 $x = _scale $pos, $x, $W; 1760 $x += $child->{c_halign} * $child->{req_w};
1837 $y = _scale $pos, $x, $H; 1761 $y += $child->{c_valign} * $child->{req_h};
1838 $w = _scale $size, $w, $child->{req_w};
1839 $h = _scale $size, $h, $child->{req_h};
1840 1762
1841 $child->configure ($x, $y, $w, $h); 1763 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1842 } 1764 }
1843 1765
1844 1 1766 1
1845} 1767}
1846 1768
… …
1850 1772
1851our @ISA = CFPlus::UI::Container::; 1773our @ISA = CFPlus::UI::Container::;
1852 1774
1853sub size_request { 1775sub size_request {
1854 my ($self) = @_; 1776 my ($self) = @_;
1777
1778 my @children = $self->visible_children;
1855 1779
1856 $self->{vertical} 1780 $self->{vertical}
1857 ? ( 1781 ? (
1858 (List::Util::max map $_->{req_w}, @{$self->{children}}), 1782 (List::Util::max map $_->{req_w}, @children),
1859 (List::Util::sum map $_->{req_h}, @{$self->{children}}), 1783 (List::Util::sum map $_->{req_h}, @children),
1860 ) 1784 )
1861 : ( 1785 : (
1862 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1786 (List::Util::sum map $_->{req_w}, @children),
1863 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1787 (List::Util::max map $_->{req_h}, @children),
1864 ) 1788 )
1865} 1789}
1866 1790
1867sub invoke_size_allocate { 1791sub invoke_size_allocate {
1868 my ($self, $w, $h) = @_; 1792 my ($self, $w, $h) = @_;
… …
1992 1916
1993 delete $self->{ox}; 1917 delete $self->{ox};
1994 $self->SUPER::realloc; 1918 $self->SUPER::realloc;
1995} 1919}
1996 1920
1921sub clear {
1922 my ($self) = @_;
1923
1924 $self->set_text ("");
1925}
1926
1997sub set_text { 1927sub set_text {
1998 my ($self, $text) = @_; 1928 my ($self, $text) = @_;
1999 1929
2000 return if $self->{text} eq "T$text"; 1930 return if $self->{text} eq "T$text";
2001 $self->{text} = "T$text"; 1931 $self->{text} = "T$text";
… …
2024 1954
2025sub size_request { 1955sub size_request {
2026 my ($self) = @_; 1956 my ($self) = @_;
2027 1957
2028 $self->{size_req} ||= do { 1958 $self->{size_req} ||= do {
1959 my ($max_w, $max_h) = $self->get_max_wh;
1960
2029 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1961 $self->{layout}->set_font ($self->{font}) if $self->{font};
2030 $self->{layout}->set_width ($self->{max_w} || -1); 1962 $self->{layout}->set_width ($self->{max_w} || $max_w || -1);
2031 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1963 $self->{layout}->set_ellipsise ($self->{ellipsise});
2032 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1964 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
2033 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1965 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2034 1966
2035 my ($w, $h) = $self->{layout}->size; 1967 my ($w, $h) = $self->{layout}->size;
… …
2107 : ($self->{w} - $size->[0]) * 0.5); 2039 : ($self->{w} - $size->[0]) * 0.5);
2108 2040
2109 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2041 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2110 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2042 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2111 : ($self->{h} - $size->[1]) * 0.5); 2043 : ($self->{h} - $size->[1]) * 0.5);
2044
2045 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2112 }; 2046 };
2113 2047
2114 my $w = List::Util::min $self->{w} + 4, $size->[0]; 2048# unless ($self->{list}) {
2115 my $h = List::Util::min $self->{h} + 2, $size->[1]; 2049# $self->{list} = CFPlus::OpenGL::glGenList;
2116 2050# CFPlus::OpenGL::glNewList $self->{list};
2117 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2051# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2052# CFPlus::OpenGL::glEndList;
2053# }
2054#
2055# CFPlus::OpenGL::glCallList $self->{list};
2056
2057 $self->{layout}->draw;
2118} 2058}
2059
2060#sub destroy {
2061# my ($self) = @_;
2062#
2063# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2064#
2065# $self->SUPER::destroy;
2066#}
2119 2067
2120############################################################################# 2068#############################################################################
2121 2069
2122package CFPlus::UI::EntryBase; 2070package CFPlus::UI::EntryBase;
2123 2071
… …
2129 my $class = shift; 2077 my $class = shift;
2130 2078
2131 $class->SUPER::new ( 2079 $class->SUPER::new (
2132 fg => [1, 1, 1], 2080 fg => [1, 1, 1],
2133 bg => [0, 0, 0, 0.2], 2081 bg => [0, 0, 0, 0.2],
2082 outline => [0.6, 0.3, 0.1],
2134 active_bg => [1, 1, 1, 0.5], 2083 active_bg => [0, 0, 1, .2],
2135 active_fg => [0, 0, 0], 2084 active_fg => [1, 1, 1],
2085 active_outline => [1, 1, 0],
2136 can_hover => 1, 2086 can_hover => 1,
2137 can_focus => 1, 2087 can_focus => 1,
2138 valign => 0, 2088 valign => 0,
2139 can_events => 1, 2089 can_events => 1,
2140 ellipsise => 0, 2090 ellipsise => 0,
… …
2280 glColor_premultiply @{$self->{bg}}; 2230 glColor_premultiply @{$self->{bg}};
2281 } 2231 }
2282 2232
2283 glEnable GL_BLEND; 2233 glEnable GL_BLEND;
2284 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2234 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2285 glBegin GL_QUADS;
2286 glVertex 0 , 0;
2287 glVertex 0 , $self->{h};
2288 glVertex $self->{w}, $self->{h}; 2235 glRect 0, 0, $self->{w}, $self->{h};
2289 glVertex $self->{w}, 0;
2290 glEnd;
2291 glDisable GL_BLEND; 2236 glDisable GL_BLEND;
2292 2237
2293 $self->SUPER::_draw; 2238 $self->SUPER::_draw;
2294 2239
2295 #TODO: force update every cursor change :( 2240 #TODO: force update every cursor change :(
… …
2297 2242
2298 unless (exists $self->{cur_h}) { 2243 unless (exists $self->{cur_h}) {
2299 my $text = substr $self->{text}, 0, $self->{cursor}; 2244 my $text = substr $self->{text}, 0, $self->{cursor};
2300 utf8::encode $text; 2245 utf8::encode $text;
2301 2246
2302 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2247 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2303 } 2248 }
2304 2249
2250 glColor_premultiply @{$self->{active_fg}};
2305 glBegin GL_LINES; 2251 glBegin GL_LINES;
2306 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2252 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2307 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2253 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2254 glEnd;
2255
2256 glLineWidth 3;
2257 glColor @{$self->{active_outline}};
2258 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2259 glLineWidth 1;
2260
2261 } else {
2262 glColor @{$self->{outline}};
2263 glBegin GL_LINE_STRIP;
2264 glVertex .5, $self->{h} * .5;
2265 glVertex .5, $self->{h} - 2.5;
2266 glVertex $self->{w} - .5, $self->{h} - 2.5;
2267 glVertex $self->{w} - .5, $self->{h} * .5;
2308 glEnd; 2268 glEnd;
2309 } 2269 }
2310} 2270}
2311 2271
2312############################################################################# 2272#############################################################################
… …
2399 1 2359 1
2400} 2360}
2401 2361
2402############################################################################# 2362#############################################################################
2403 2363
2364package CFPlus::UI::ButtonBin;
2365
2366our @ISA = CFPlus::UI::Bin::;
2367
2368use CFPlus::OpenGL;
2369
2370my @tex =
2371 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2372 qw(b1_button_inactive.png b1_button_active.png);
2373
2374sub new {
2375 my $class = shift;
2376
2377 $class->SUPER::new (
2378 can_hover => 1,
2379 align => 0,
2380 valign => 0,
2381 can_events => 1,
2382 @_
2383 )
2384}
2385
2386sub invoke_button_up {
2387 my ($self, $ev, $x, $y) = @_;
2388
2389 $self->emit ("activate")
2390 if $x >= 0 && $x < $self->{w}
2391 && $y >= 0 && $y < $self->{h};
2392
2393 1
2394}
2395
2396sub _draw {
2397 my ($self) = @_;
2398
2399 glEnable GL_TEXTURE_2D;
2400 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2401 glColor 0, 0, 0, 1;
2402
2403 my $tex = $tex[$GRAB == $self];
2404 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2405
2406 glDisable GL_TEXTURE_2D;
2407
2408 $self->SUPER::_draw;
2409}
2410
2411#############################################################################
2412
2404package CFPlus::UI::Button; 2413package CFPlus::UI::Button;
2405 2414
2406our @ISA = CFPlus::UI::Label::; 2415our @ISA = CFPlus::UI::Label::;
2407 2416
2408use CFPlus::OpenGL; 2417use CFPlus::OpenGL;
… …
2512sub _draw { 2521sub _draw {
2513 my ($self) = @_; 2522 my ($self) = @_;
2514 2523
2515 $self->SUPER::_draw; 2524 $self->SUPER::_draw;
2516 2525
2517 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0; 2526 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2518 2527
2519 my ($w, $h) = @$self{qw(w h)}; 2528 my ($w, $h) = @$self{qw(w h)};
2520 2529
2521 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2; 2530 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2522 2531
… …
2542sub new { 2551sub new {
2543 my $class = shift; 2552 my $class = shift;
2544 2553
2545 my $self = $class->SUPER::new ( 2554 my $self = $class->SUPER::new (
2546 can_events => 0, 2555 can_events => 0,
2556 scale => 1,
2547 @_, 2557 @_,
2548 ); 2558 );
2549 2559
2550 $self->{path} || $self->{tex} 2560 $self->{path} || $self->{tex}
2551 or Carp::croak "'path' or 'tex' attributes required"; 2561 or Carp::croak "'path' or 'tex' attributes required";
… …
2576} 2586}
2577 2587
2578sub size_request { 2588sub size_request {
2579 my ($self) = @_; 2589 my ($self) = @_;
2580 2590
2581 ($self->{tex}{w}, $self->{tex}{h}) 2591 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2582} 2592}
2583 2593
2584sub _draw { 2594sub _draw {
2585 my ($self) = @_; 2595 my ($self) = @_;
2586 2596
… …
2596 } 2606 }
2597 2607
2598 glEnable GL_TEXTURE_2D; 2608 glEnable GL_TEXTURE_2D;
2599 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2609 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2600 2610
2601 $tex->draw_quad (0, 0, $w, $h); 2611 $tex->draw_quad_alpha (0, 0, $w, $h);
2602 2612
2603 glDisable GL_TEXTURE_2D; 2613 glDisable GL_TEXTURE_2D;
2604} 2614}
2605 2615
2606############################################################################# 2616#############################################################################
… …
2625 align => 0, 2635 align => 0,
2626 valign => 0, 2636 valign => 0,
2627 can_events => 1, 2637 can_events => 1,
2628 @_ 2638 @_
2629 ); 2639 );
2640}
2641
2642sub invoke_button_down {
2643 my ($self, $ev, $x, $y) = @_;
2644
2645 1
2630} 2646}
2631 2647
2632sub invoke_button_up { 2648sub invoke_button_up {
2633 my ($self, $ev, $x, $y) = @_; 2649 my ($self, $ev, $x, $y) = @_;
2634 2650
… …
2774 glDisable GL_TEXTURE_2D; 2790 glDisable GL_TEXTURE_2D;
2775} 2791}
2776 2792
2777############################################################################# 2793#############################################################################
2778 2794
2795package CFPlus::UI::Progress;
2796
2797our @ISA = CFPlus::UI::Label::;
2798
2799use CFPlus::OpenGL;
2800
2801sub new {
2802 my ($class, %arg) = @_;
2803
2804 my $self = $class->SUPER::new (
2805 fg => [1, 1, 1],
2806 bg => [0, 0, 1, 0.2],
2807 bar => [0.7, 0.5, 0.1, 0.8],
2808 outline => [0.4, 0.3, 0],
2809 fontsize => 0.9,
2810 valign => 0,
2811 align => 0,
2812 can_events => 1,
2813 ellipsise => 1,
2814 label => "%d%%",
2815 %arg,
2816 );
2817
2818 $self->set_value ($arg{value} || -1);
2819
2820 $self
2821}
2822
2823sub set_label {
2824 my ($self, $label) = @_;
2825
2826 return if $self->{label} eq $label;
2827 $self->{label} = $label;
2828
2829 $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
2830}
2831
2832sub set_value {
2833 my ($self, $value) = @_;
2834
2835 if ($self->{value} ne $value) {
2836 $self->{value} = $value;
2837
2838 if ($value < 0) {
2839 $self->set_text ("-");
2840 } else {
2841 $self->set_text (sprintf $self->{label}, $value * 100);
2842 }
2843
2844 $self->update;
2845 }
2846}
2847
2848sub _draw {
2849 my ($self) = @_;
2850
2851 glEnable GL_BLEND;
2852 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2853
2854 if ($self->{value} >= 0) {
2855 my $s = int 2 + ($self->{w} - 4) * $self->{value};
2856
2857 glColor_premultiply @{$self->{bar}};
2858 glRect 2, 2, $s, $self->{h} - 2;
2859 glColor_premultiply @{$self->{bg}};
2860 glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
2861 }
2862
2863 glColor_premultiply @{$self->{outline}};
2864 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2865
2866 glDisable GL_BLEND;
2867
2868 {
2869 local $self->{bg}; # do not draw background
2870 $self->SUPER::_draw;
2871 }
2872}
2873
2874#############################################################################
2875
2876package CFPlus::UI::ExperienceProgress;
2877
2878our @ISA = CFPlus::UI::Progress::;
2879
2880sub new {
2881 my ($class, %arg) = @_;
2882
2883 my $self = $class->SUPER::new (
2884 tooltip => sub {
2885 my ($self) = @_;
2886
2887 sprintf "level %d\n%s points\n%s next level\n%s to go",
2888 $self->{lvl},
2889 ::formsep ($self->{exp}),
2890 ::formsep ($self->{nxt}),
2891 ::formsep ($self->{nxt} - $self->{exp}),
2892 },
2893 %arg
2894 );
2895
2896 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2897 if $::CONN;
2898
2899 $self
2900}
2901
2902sub DESTROY {
2903 my ($self) = @_;
2904
2905 delete $::CONN->{on_exp_update}{$self+0}
2906 if $::CONN;
2907
2908 $self->SUPER::DESTROY;
2909}
2910
2911sub set_value {
2912 my ($self, $lvl, $exp) = @_;
2913
2914 $self->{lvl} = $lvl;
2915 $self->{exp} = $exp;
2916
2917 my $v = -1;
2918
2919 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2920 my $l0 = $table->[$lvl - 1];
2921 my $l1 = $table->[$lvl];
2922
2923 $self->{nxt} = $l1;
2924
2925 $v = ($exp - $l0) / ($l1 - $l0);
2926 }
2927
2928 $self->SUPER::set_value ($v);
2929}
2930
2931#############################################################################
2932
2779package CFPlus::UI::Gauge; 2933package CFPlus::UI::Gauge;
2780 2934
2781our @ISA = CFPlus::UI::VBox::; 2935our @ISA = CFPlus::UI::VBox::;
2782 2936
2783sub new { 2937sub new {
… …
2908 3062
2909 $self->SUPER::invoke_button_down ($ev, $x, $y); 3063 $self->SUPER::invoke_button_down ($ev, $x, $y);
2910 3064
2911 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3065 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2912 3066
2913 $self->invoke_mouse_motion ($ev, $x, $y) 3067 $self->invoke_mouse_motion ($ev, $x, $y);
3068
3069 1
2914} 3070}
2915 3071
2916sub invoke_mouse_motion { 3072sub invoke_mouse_motion {
2917 my ($self, $ev, $x, $y) = @_; 3073 my ($self, $ev, $x, $y) = @_;
2918 3074
… …
2938 3094
2939 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2; 3095 my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2940 3096
2941 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart); 3097 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2942 3098
2943 ! ! $delta 3099 1
2944} 3100}
2945 3101
2946sub update { 3102sub update {
2947 my ($self) = @_; 3103 my ($self) = @_;
2948 3104
… …
3079} 3235}
3080 3236
3081sub size_request { 3237sub size_request {
3082 my ($self) = @_; 3238 my ($self) = @_;
3083 3239
3084 my ($empty, $slider) = @{ $self->{children} }; 3240 my ($empty, $slider) = $self->visible_children;
3085 3241
3086 local $self->{children} = [$empty, $slider]; 3242 local $self->{children} = [$empty, $slider];
3087 $self->SUPER::size_request 3243 $self->SUPER::size_request
3088} 3244}
3089 3245
… …
3278 3434
3279 if ($y0 < $y + $h && $y < $y1) { 3435 if ($y0 < $y + $h && $y < $y1) {
3280 my $layout = $self->get_layout ($para); 3436 my $layout = $self->get_layout ($para);
3281 3437
3282 $layout->render ($para->{indent}, $y - $y0); 3438 $layout->render ($para->{indent}, $y - $y0);
3439 $layout->draw;
3283 3440
3284 if (my @w = @{ $para->{widget} }) { 3441 if (my @w = @{ $para->{widget} }) {
3285 my @s = $layout->get_shapes; 3442 my @s = $layout->get_shapes;
3286 3443
3287 for (@w) { 3444 for (@w) {
… …
3409} 3566}
3410 3567
3411sub set_tooltip_from { 3568sub set_tooltip_from {
3412 my ($self, $widget) = @_; 3569 my ($self, $widget) = @_;
3413 3570
3414 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3415 if $widget->{tooltip} =~ /^#(.*)$/;
3416
3417 my $tooltip = $widget->{tooltip}; 3571 my $tip = $widget->{tooltip};
3572 $tip = $tip->($widget) if "CODE" eq ref $tip;
3573
3574 $tip = CFPlus::Pod::section_label tooltip => $1
3575 if $tip =~ /^#(.*)$/;
3418 3576
3419 if ($ENV{CFPLUS_DEBUG} & 2) { 3577 if ($ENV{CFPLUS_DEBUG} & 2) {
3420 $tooltip .= "\n\n" . (ref $widget) . "\n" 3578 $tip .= "\n\n" . (ref $widget) . "\n"
3421 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 3579 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3422 . "req $widget->{req_w} $widget->{req_h}\n" 3580 . "req $widget->{req_w} $widget->{req_h}\n"
3423 . "visible $widget->{visible}"; 3581 . "visible $widget->{visible}";
3424 } 3582 }
3425 3583
3426 $tooltip =~ s/^\n+//; 3584 $tip =~ s/^\n+//;
3427 $tooltip =~ s/\n+$//; 3585 $tip =~ s/\n+$//;
3428 3586
3429 $self->add (new CFPlus::UI::Label 3587 $self->add (new CFPlus::UI::Label
3430 markup => $tooltip, 3588 markup => $tip,
3431 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3589 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3432 fontsize => 0.8, 3590 fontsize => 0.8,
3433 style => 1, # FLAG_INVERSE 3591 style => 1, # FLAG_INVERSE
3434 ellipsise => 0, 3592 ellipsise => 0,
3435 font => ($widget->{tooltip_font} || $::FONT_PROP), 3593 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
3473} 3631}
3474 3632
3475sub _draw { 3633sub _draw {
3476 my ($self) = @_; 3634 my ($self) = @_;
3477 3635
3478 glTranslate 0.375, 0.375;
3479
3480 my ($w, $h) = @$self{qw(w h)}; 3636 my ($w, $h) = @$self{qw(w h)};
3481 3637
3482 glColor 1, 0.8, 0.4; 3638 glColor 1, 0.8, 0.4;
3483 glBegin GL_QUADS; 3639 glRect 0, 0, $w, $h;
3484 glVertex 0 , 0;
3485 glVertex 0 , $h;
3486 glVertex $w, $h;
3487 glVertex $w, 0;
3488 glEnd;
3489 3640
3490 glColor 0, 0, 0; 3641 glColor 0, 0, 0;
3491 glBegin GL_LINE_LOOP; 3642 glRect_lineloop .5, .5, $w + .5, $h + .5;
3492 glVertex 0 , 0;
3493 glVertex 0 , $h;
3494 glVertex $w, $h;
3495 glVertex $w, 0;
3496 glEnd;
3497 3643
3498 glTranslate 2 - 0.375, 2 - 0.375; 3644 glTranslate 2, 2;
3499 3645
3500 $self->SUPER::_draw; 3646 $self->SUPER::_draw;
3501} 3647}
3502 3648
3503############################################################################# 3649#############################################################################
… …
3521 3667
3522 if ($self->{anim} && $self->{animspeed}) { 3668 if ($self->{anim} && $self->{animspeed}) {
3523 CFPlus::weaken (my $widget = $self); 3669 CFPlus::weaken (my $widget = $self);
3524 3670
3525 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3671 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3526 $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed}; 3672 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3527 $self->{timer} = Event->timer ( 3673 $self->{timer} = Event->timer (
3528 parked => 1, 3674 parked => 1,
3529 cb => sub { 3675 cb => sub {
3530 return unless $::CONN && $widget; 3676 return unless $::CONN;
3531 3677
3678 my $w = $widget
3679 or return;
3680
3532 ++$widget->{frame}; 3681 ++$w->{frame};
3533 $widget->update_face; 3682 $w->update_face;
3683
3684 # somehow, $widget can go away
3534 $widget->update; 3685 $w->update;
3535
3536 $widget->update_timer; 3686 $w->update_timer;
3537 }, 3687 },
3538 ); 3688 );
3539 3689
3540 $self->update_face; 3690 $self->update_face;
3541 $self->update_timer; 3691 $self->update_timer;
… …
3562} 3712}
3563 3713
3564sub update_face { 3714sub update_face {
3565 my ($self) = @_; 3715 my ($self) = @_;
3566 3716
3567 return unless $::CONN;
3568
3569 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3570 if ($anim && @$anim) {
3571 delete $self->{wait_face};
3572 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3573 }
3574 }
3575}
3576
3577sub size_request {
3578 my ($self) = @_;
3579
3580 if ($::CONN) { 3717 if ($::CONN) {
3581 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3718 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3582 if (my $tex = $::CONN->{texture}[$faceid]) { 3719 if ($anim && @$anim) {
3583 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3720 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3584 } else { 3721 delete $self->{face_change_cb};
3585 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3722
3586 $self->realloc; 3723 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3724 unless ($tex->{name} || $tex->{loading}) {
3725 $tex->upload (sub { $self->reconfigure });
3726 }
3587 }); 3727 }
3588 } 3728 }
3589 } 3729 }
3590 } 3730 }
3731}
3732
3733sub size_request {
3734 my ($self) = @_;
3735
3736 if ($::CONN) {
3737 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3738 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3739 if ($tex->{name}) {
3740 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3741 } elsif (!$tex->{loading}) {
3742 $tex->upload (sub { $self->reconfigure });
3743 }
3744 }
3745
3746 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3747 }
3748 }
3591 3749
3592 ($self->{size_w} || 8, $self->{size_h} || 8) 3750 ($self->{size_w} || 8, $self->{size_h} || 8)
3593} 3751}
3594 3752
3595sub update { 3753sub update {
… …
3609} 3767}
3610 3768
3611sub _draw { 3769sub _draw {
3612 my ($self) = @_; 3770 my ($self) = @_;
3613 3771
3614 return unless $::CONN;
3615
3616 $self->SUPER::_draw; 3772 $self->SUPER::_draw;
3617 3773
3618 my $faceid = $::CONN->{faceid}[$self->{face}] 3774 if (my $tex = $self->{tex}) {
3619 or return;
3620
3621 my $tex = $::CONN->{texture}[$faceid];
3622
3623 if ($tex) {
3624 glEnable GL_TEXTURE_2D; 3775 glEnable GL_TEXTURE_2D;
3625 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3776 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3626 glColor 0, 0, 0, 1; 3777 glColor 0, 0, 0, 1;
3627 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3778 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3628 glDisable GL_TEXTURE_2D; 3779 glDisable GL_TEXTURE_2D;
… …
3680 children => [ 3831 children => [
3681 (new CFPlus::UI::Label markup => $left, expand => 1), 3832 (new CFPlus::UI::Label markup => $left, expand => 1),
3682 (new CFPlus::UI::Label markup => $right, align => +1), 3833 (new CFPlus::UI::Label markup => $right, align => +1),
3683 ], 3834 ],
3684 ; 3835 ;
3685 3836
3686 } else { 3837 } else {
3687 $widget = new CFPlus::UI::Label 3838 $widget = new CFPlus::UI::Label
3688 can_hover => 1, 3839 can_hover => 1,
3689 can_events => 1, 3840 can_events => 1,
3690 markup => $widget, 3841 markup => $widget,
… …
3815 3966
3816############################################################################# 3967#############################################################################
3817 3968
3818package CFPlus::UI::Notebook; 3969package CFPlus::UI::Notebook;
3819 3970
3971use CFPlus::OpenGL;
3972
3820our @ISA = CFPlus::UI::VBox::; 3973our @ISA = CFPlus::UI::VBox::;
3821 3974
3822sub new { 3975sub new {
3823 my $class = shift; 3976 my $class = shift;
3824 3977
3825 my $self = $class->SUPER::new ( 3978 my $self = $class->SUPER::new (
3826 buttonbar => (new CFPlus::UI::Buttonbar), 3979 buttonbar => (new CFPlus::UI::Buttonbar),
3827 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3980 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3981 active_outline => [.7, .7, 0.2],
3828 # filter => # will be put between multiplexer and $self 3982 # filter => # will be put between multiplexer and $self
3829 @_, 3983 @_,
3830 ); 3984 );
3831 3985
3832 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3986 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3833 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3987 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3834 3988
3989 {
3990 Scalar::Util::weaken (my $wself = $self);
3991
3992 $self->{multiplexer}->connect (c_add => sub {
3993 my ($mplex, $widgets) = @_;
3994
3995 for my $child (@$widgets) {
3996 Scalar::Util::weaken $child;
3997 $child->{c_tab_} ||= do {
3998 my $tab =
3999 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
4000 ? $child->{c_tab}
4001 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4002
4003 $tab->connect (activate => sub {
4004 $wself->set_current_page ($child);
4005 });
4006
4007 $tab
4008 };
4009
4010 $self->{buttonbar}->add ($child->{c_tab_});
4011 }
4012 });
4013
4014 $self->{multiplexer}->connect (c_remove => sub {
4015 my ($mplex, $widgets) = @_;
4016
4017 for my $child (@$widgets) {
4018 $wself->{buttonbar}->remove ($child->{c_tab_});
4019 }
4020 });
4021 }
4022
3835 $self 4023 $self
3836} 4024}
3837 4025
3838sub add { 4026sub add {
4027 my ($self, @widgets) = @_;
4028
4029 $self->{multiplexer}->add (@widgets)
4030}
4031
4032sub remove {
4033 my ($self, @widgets) = @_;
4034
4035 $self->{multiplexer}->remove (@widgets)
4036}
4037
4038sub pages {
4039 my ($self) = @_;
4040 $self->{multiplexer}->children
4041}
4042
4043sub add_tab {
3839 my ($self, $title, $widget, $tooltip) = @_; 4044 my ($self, $title, $widget, $tooltip) = @_;
3840 4045
3841 CFPlus::weaken $self; 4046 $title = [$title, $tooltip] unless ref $title;
4047 $widget->{c_tab} = $title;
3842 4048
3843 $self->{buttonbar}->add (new CFPlus::UI::Button
3844 markup => $title,
3845 tooltip => $tooltip,
3846 on_activate => sub { $self->set_current_page ($widget) },
3847 );
3848
3849 $self->{multiplexer}->add ($widget); 4049 $self->add ($widget);
3850} 4050}
3851 4051
3852sub get_current_page { 4052sub get_current_page {
3853 my ($self) = @_; 4053 my ($self) = @_;
3854 4054
… …
3858sub set_current_page { 4058sub set_current_page {
3859 my ($self, $page) = @_; 4059 my ($self, $page) = @_;
3860 4060
3861 $self->{multiplexer}->set_current_page ($page); 4061 $self->{multiplexer}->set_current_page ($page);
3862 $self->emit (page_changed => $self->{multiplexer}{current}); 4062 $self->emit (page_changed => $self->{multiplexer}{current});
4063}
4064
4065sub _draw {
4066 my ($self) = @_;
4067
4068 $self->SUPER::_draw ();
4069
4070 if (my $cur = $self->{multiplexer}{current}) {
4071 if ($cur = $cur->{c_tab_}) {
4072 glTranslate $self->{buttonbar}{x} + $cur->{x},
4073 $self->{buttonbar}{y} + $cur->{y};
4074 glLineWidth 3;
4075 #glEnable GL_BLEND;
4076 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4077 glColor @{$self->{active_outline}};
4078 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4079 glLineWidth 1;
4080 #glDisable GL_BLEND;
4081 }
4082 }
3863} 4083}
3864 4084
3865############################################################################# 4085#############################################################################
3866 4086
3867package CFPlus::UI::Selector; 4087package CFPlus::UI::Selector;
… …
4137} 4357}
4138 4358
4139sub update { 4359sub update {
4140 my ($self) = @_; 4360 my ($self) = @_;
4141 4361
4142 $::WANT_REFRESH++; 4362 $::WANT_REFRESH->start;
4143} 4363}
4144 4364
4145sub add { 4365sub add {
4146 my ($self, @children) = @_; 4366 my ($self, @children) = @_;
4147 4367
… …
4184 while ($self->{refresh_hook}) { 4404 while ($self->{refresh_hook}) {
4185 $_->() 4405 $_->()
4186 for values %{delete $self->{refresh_hook}}; 4406 for values %{delete $self->{refresh_hook}};
4187 } 4407 }
4188 4408
4189 if ($self->{realloc}) { 4409 while ($self->{realloc}) {
4190 my %queue; 4410 my %queue;
4191 my @queue; 4411 my @queue;
4192 my $widget; 4412 my $widget;
4193 4413
4194 outer: 4414 outer:
… …
4241 } 4461 }
4242 } 4462 }
4243 4463
4244 delete $self->{realloc}{$widget+0}; 4464 delete $self->{realloc}{$widget+0};
4245 } 4465 }
4246 }
4247 4466
4248 while (my $size_alloc = delete $self->{size_alloc}) { 4467 while (my $size_alloc = delete $self->{size_alloc}) {
4249 my @queue = sort { $b->{visible} <=> $a->{visible} } 4468 my @queue = sort { $a->{visible} <=> $b->{visible} }
4250 values %$size_alloc; 4469 values %$size_alloc;
4251 4470
4252 while () { 4471 while () {
4253 my $widget = pop @queue || last; 4472 my $widget = pop @queue || last;
4254 4473
4255 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 4474 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4256 4475
4257 $w = 0 if $w < 0;
4258 $h = 0 if $h < 0;
4259
4260 $w = max $widget->{min_w}, $w; 4476 $w = max $widget->{min_w}, $w;
4261 $h = max $widget->{min_h}, $h; 4477 $h = max $widget->{min_h}, $h;
4262 4478
4263# $w = min $self->{w} - $widget->{x}, $w if $self->{w}; 4479# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4264# $h = min $self->{h} - $widget->{y}, $h if $self->{h}; 4480# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4265 4481
4266 $w = min $widget->{max_w}, $w if exists $widget->{max_w}; 4482 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4267 $h = min $widget->{max_h}, $h if exists $widget->{max_h}; 4483 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4268 4484
4269 $w = int $w + 0.5; 4485 $w = int $w + 0.5;
4270 $h = int $h + 0.5; 4486 $h = int $h + 0.5;
4271 4487
4272 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 4488 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4273 $widget->{old_w} = $widget->{w}; 4489 $widget->{old_w} = $widget->{w};
4274 $widget->{old_h} = $widget->{h}; 4490 $widget->{old_h} = $widget->{h};
4275 4491
4276 $widget->{w} = $w; 4492 $widget->{w} = $w;
4277 $widget->{h} = $h; 4493 $widget->{h} = $h;
4278 4494
4279 $widget->emit (size_allocate => $w, $h); 4495 $widget->emit (size_allocate => $w, $h);
4496 }
4280 } 4497 }
4281 } 4498 }
4282 } 4499 }
4283 4500
4284 while ($self->{post_alloc_hook}) { 4501 while ($self->{post_alloc_hook}) {

Diff Legend

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