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.345 by root, Sun Aug 13 21:46:10 2006 UTC vs.
Revision 1.347 by root, Mon Aug 14 03:41:28 2006 UTC

… …
1127} 1127}
1128 1128
1129############################################################################# 1129#############################################################################
1130 1130
1131package CFPlus::UI::FancyFrame; 1131package CFPlus::UI::FancyFrame;
1132
1133our @ISA = CFPlus::UI::Bin::;
1134
1135use CFPlus::OpenGL;
1136
1137sub new {
1138 my ($class, %arg) = @_;
1139
1140 if ((exists $arg{label}) && !ref $arg{label}) {
1141 $arg{label} = new CFPlus::UI::Label
1142 align => 1,
1143 valign => 0,
1144 text => $arg{label},
1145 fontsize => ($arg{border} || 0.8) * 0.75;
1146 }
1147
1148 my $self = $class->SUPER::new (
1149 # label => "",
1150 fg => [0.6, 0.3, 0.1],
1151 border => 0.8,
1152 style => 'single',
1153 %arg,
1154 );
1155
1156 $self
1157}
1158
1159sub add {
1160 my ($self, @widgets) = @_;
1161
1162 $self->SUPER::add (@widgets);
1163 $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
1164}
1165
1166sub border {
1167 int $_[0]{border} * $::FONTSIZE
1168}
1169
1170sub size_request {
1171 my ($self) = @_;
1172
1173 ($self->{label_w}, undef) = $self->{label}->size_request
1174 if $self->{label};
1175
1176 my ($w, $h) = $self->SUPER::size_request;
1177
1178 (
1179 $w + $self->border * 2,
1180 $h + $self->border * 2,
1181 )
1182}
1183
1184sub invoke_size_allocate {
1185 my ($self, $w, $h) = @_;
1186
1187 my $border = $self->border;
1188
1189 $w -= List::Util::max 0, $border * 2;
1190 $h -= List::Util::max 0, $border * 2;
1191
1192 if (my $label = $self->{label}) {
1193 $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
1194 $label->{h} = List::Util::min $h, $border;
1195 $label->invoke_size_allocate ($label->{w}, $label->{h});
1196 }
1197
1198 $self->child->configure ($border, $border, $w, $h);
1199
1200 1
1201}
1202
1203sub _draw {
1204 my ($self) = @_;
1205
1206 my $child = $self->{children}[0];
1207
1208 my $border = $self->border;
1209 my ($w, $h) = ($self->{w}, $self->{h});
1210
1211 $child->draw;
1212
1213 glColor @{$self->{fg}};
1214 glBegin GL_LINE_STRIP;
1215 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1216 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1217 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1218 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1219 glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1220 glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
1221 glEnd;
1222
1223 if ($self->{label}) {
1224 glTranslate $border * 2, 0;
1225 $self->{label}->_draw;
1226 }
1227}
1228
1229#############################################################################
1230
1231package CFPlus::UI::Toplevel;
1132 1232
1133our @ISA = CFPlus::UI::Bin::; 1233our @ISA = CFPlus::UI::Bin::;
1134 1234
1135use CFPlus::OpenGL; 1235use CFPlus::OpenGL;
1136 1236
… …
2753} 2853}
2754 2854
2755sub current_paragraph { 2855sub current_paragraph {
2756 my ($self) = @_; 2856 my ($self) = @_;
2757 2857
2758 $self->force_uptodate;
2759 $self->{top_paragraph} - 1 2858 $self->{top_paragraph} - 1
2760} 2859}
2761 2860
2762sub scroll_to { 2861sub scroll_to {
2763 my ($self, $para) = @_; 2862 my ($self, $para) = @_;
2764 2863
2765 $self->force_uptodate;
2766
2767 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para; 2864 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2768 2865
2769 $self->{children}[1]->set_value ($self->{par}[$para]{y}); 2866 $self->{scroll_to} = $para;
2867 $self->update;
2770} 2868}
2771 2869
2772sub clear { 2870sub clear {
2773 my ($self) = @_; 2871 my ($self) = @_;
2774 2872
… …
2803} 2901}
2804 2902
2805sub scroll_to_bottom { 2903sub scroll_to_bottom {
2806 my ($self) = @_; 2904 my ($self) = @_;
2807 2905
2808 $self->{scroll_to_bottom} = 1; 2906 $self->{scroll_to} = $#{$self->{par}};
2809 $self->update; 2907 $self->update;
2810} 2908}
2811 2909
2812sub force_uptodate { 2910sub force_uptodate {
2813 my ($self) = @_; 2911 my ($self) = @_;
2814 2912
2815 if (delete $self->{need_reflow}) { 2913 if (delete $self->{need_reflow}) {
2816 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2914 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2817 2915
2818 my $height = 0; 2916 my $height = 0;
2819 my $paridx;
2820 my $top_paragraph;
2821 my $top = int $self->{children}[1]{range}[0];
2822 2917
2823 for my $para (@{$self->{par}}) { 2918 for my $para (@{$self->{par}}) {
2824 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) { 2919 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2825 my $layout = $self->get_layout ($para); 2920 my $layout = $self->get_layout ($para);
2826 my ($w, $h) = $layout->size; 2921 my ($w, $h) = $layout->size;
… …
2829 $para->{h} = $h; 2924 $para->{h} = $h;
2830 $para->{wrapped} = $layout->has_wrapped; 2925 $para->{wrapped} = $layout->has_wrapped;
2831 } 2926 }
2832 2927
2833 $para->{y} = $height; 2928 $para->{y} = $height;
2834
2835 $paridx++;
2836 $top_paragraph ||= $paridx if $height >= $top;
2837
2838 $height += $para->{h}; 2929 $height += $para->{h};
2839 } 2930 }
2840 2931
2841 $self->{top_paragraph} = $top_paragraph;
2842 $self->{height} = $height; 2932 $self->{height} = $height;
2843
2844 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]); 2933 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2845 2934
2846 delete $self->{texture}; 2935 delete $self->{texture};
2847 } 2936 }
2848 2937
2849 if (delete $self->{scroll_to_bottom}) { 2938 if (my $paridx = delete $self->{scroll_to}) {
2850 $self->{children}[1]->set_value (1e10); 2939 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
2851 } 2940 }
2852} 2941}
2853 2942
2854sub update { 2943sub update {
2855 my ($self) = @_; 2944 my ($self) = @_;
… …
2867 2956
2868 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub { 2957 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2869 glClearColor 0, 0, 0, 0; 2958 glClearColor 0, 0, 0, 0;
2870 glClear GL_COLOR_BUFFER_BIT; 2959 glClear GL_COLOR_BUFFER_BIT;
2871 2960
2961 my $top = int $self->{children}[1]{range}[0];
2962
2963 my $paridx = 0;
2964 my $top_paragraph;
2872 my $top = int $self->{children}[1]{range}[0]; 2965 my $top = int $self->{children}[1]{range}[0];
2873 2966
2874 my $y0 = $top; 2967 my $y0 = $top;
2875 my $y1 = $top + $H; 2968 my $y1 = $top + $H;
2876 2969
… …
2894 2987
2895 $_->draw; 2988 $_->draw;
2896 } 2989 }
2897 } 2990 }
2898 } 2991 }
2992
2993 $paridx++;
2994 $top_paragraph ||= $paridx if $y >= $top;
2899 } 2995 }
2996
2997 $self->{top_paragraph} = $top_paragraph;
2900 }; 2998 };
2901 }); 2999 });
2902} 3000}
2903 3001
2904sub reconfigure { 3002sub reconfigure {
… …
3189 3287
3190############################################################################# 3288#############################################################################
3191 3289
3192package CFPlus::UI::Menu; 3290package CFPlus::UI::Menu;
3193 3291
3194our @ISA = CFPlus::UI::FancyFrame::; 3292our @ISA = CFPlus::UI::Toplevel::;
3195 3293
3196use CFPlus::OpenGL; 3294use CFPlus::OpenGL;
3197 3295
3198sub new { 3296sub new {
3199 my $class = shift; 3297 my $class = shift;

Diff Legend

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