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.172 by root, Tue Apr 25 09:52:04 2006 UTC vs.
Revision 1.175 by root, Tue Apr 25 11:48:31 2006 UTC

… …
24 my $tip = $widget->{tooltip}; 24 my $tip = $widget->{tooltip};
25 25
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 26 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 27
28 $TOOLTIP->set_markup ($widget->{tooltip}); 28 $TOOLTIP->set_markup ($widget->{tooltip});
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0)); 29
30 $TOOLTIP->show; 30 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
31 } 39 }
32 40
33 return; 41 return;
34 } 42 }
35 } 43 }
… …
237sub size_allocate { 245sub size_allocate {
238 # nothing to be done 246 # nothing to be done
239} 247}
240 248
241sub children { 249sub children {
250}
251
252# call when resoltuion changes etc.
253sub reconfigure {
254 my ($self) = @_;
255
256 $_->reconfigure
257 for $self->children;
258
259 $_->check_size;
242} 260}
243 261
244sub set_max_size { 262sub set_max_size {
245 my ($self, $w, $h) = @_; 263 my ($self, $w, $h) = @_;
246 264
… …
633} 651}
634 652
635sub update { 653sub update {
636 my ($self) = @_; 654 my ($self) = @_;
637 655
638 # we want to do this delayed... 656 $ROOT->on_refresh ($self => sub { $self->render_child });
639 $self->render_chld;
640 $self->SUPER::update; 657 $self->SUPER::update;
641} 658}
642 659
660sub size_allocate {
661 my ($self, $w, $h) = @_;
662
663 $self->SUPER::size_allocate ($w, $h);
664 $self->update;
665}
666
643sub render_chld { 667sub render_child {
644 my ($self) = @_; 668 my ($self) = @_;
645 669
646 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
647 glClearColor 0, 0, 0, 1; 671 glClearColor 0, 0, 0, 0;
648 glClear GL_COLOR_BUFFER_BIT; 672 glClear GL_COLOR_BUFFER_BIT;
649 $self->child->draw; 673 $self->child->draw;
674# glColorMask 1, 1, 1, 0;
675# glEnable GL_BLEND;
676# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
677# glRasterPos 0, 0;
678# glCopyPixels 0, 0, $self->{w}, $self->{h};
679# glDisable GL_BLEND;
680# glColorMask 1, 1, 1, 1;
650 }; 681 };
651}
652
653sub size_allocate {
654 my ($self, $w, $h) = @_;
655
656 $self->child->configure (0, 0, $w, $h);
657
658 $self->render_chld;
659} 682}
660 683
661sub _draw { 684sub _draw {
662 my ($self) = @_; 685 my ($self) = @_;
663 686
… …
665 688
666 my $tex = $self->{texture} 689 my $tex = $self->{texture}
667 or return; 690 or return;
668 691
669 glEnable GL_BLEND; 692 glEnable GL_BLEND;
670 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
671 glEnable GL_TEXTURE_2D; 694 glEnable GL_TEXTURE_2D;
672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1;
673 697
674 $tex->draw_quad (0, 0, $w, $h); 698 $tex->draw_quad (0, 0, $w, $h);
675 699
676 glDisable GL_BLEND; 700 glDisable GL_BLEND;
677 glDisable GL_TEXTURE_2D; 701 glDisable GL_TEXTURE_2D;
… …
1204 s/</&lt;/g; 1228 s/</&lt;/g;
1205 1229
1206 $_[1] 1230 $_[1]
1207} 1231}
1208 1232
1233sub update {
1234 my ($self) = @_;
1235
1236 delete $self->{texture};
1237 $self->SUPER::update;
1238}
1239
1240sub reconfigure {
1241 my ($self) = @_;
1242
1243 delete $self->{texture};
1244}
1245
1209sub set_text { 1246sub set_text {
1210 my ($self, $text) = @_; 1247 my ($self, $text) = @_;
1211 1248
1249 return if $self->{text} eq "T$text";
1250 $self->{text} = "T$text";
1251
1212 $self->{layout}->set_text ($text); 1252 $self->{layout}->set_text ($text);
1213 1253
1214 delete $self->{texture}; 1254 delete $self->{texture};
1255 $self->update;
1215 $self->check_size; 1256 $self->check_size;
1216 $self->update;
1217} 1257}
1218 1258
1219sub set_markup { 1259sub set_markup {
1220 my ($self, $markup) = @_; 1260 my ($self, $markup) = @_;
1221 1261
1262 return if $self->{text} eq "M$markup";
1263 $self->{text} = "M$markup";
1264
1222 $self->{layout}->set_markup ($markup); 1265 $self->{layout}->set_markup ($markup);
1223 1266
1224 delete $self->{texture}; 1267 delete $self->{texture};
1268 $self->update;
1225 $self->check_size; 1269 $self->check_size;
1226 $self->update;
1227} 1270}
1228 1271
1229sub size_request { 1272sub size_request {
1230 my ($self) = @_; 1273 my ($self) = @_;
1231 1274
… …
1755} 1798}
1756 1799
1757sub set_max { 1800sub set_max {
1758 my ($self, $max) = @_; 1801 my ($self, $max) = @_;
1759 1802
1803 return if $self->{max_val} == $max;
1804
1760 $self->{max_val} = $max; 1805 $self->{max_val} = $max;
1806 $self->update;
1761} 1807}
1762 1808
1763sub set_value { 1809sub set_value {
1764 my ($self, $val, $max) = @_; 1810 my ($self, $val, $max) = @_;
1765 1811
1766 $self->set_max ($max) 1812 $self->set_max ($max)
1767 if defined $max; 1813 if defined $max;
1768 1814
1769 $max = $self->{max_val}; 1815 return if $self->{val} == $val;
1816
1770 $self->{val} = $val; 1817 $self->{val} = $val;
1771
1772 $self->update; 1818 $self->update;
1773} 1819}
1774 1820
1775sub _draw { 1821sub _draw {
1776 my ($self) = @_; 1822 my ($self) = @_;
… …
1859 1905
1860 $self->{value}->set_fontsize ($fsize); 1906 $self->{value}->set_fontsize ($fsize);
1861 $self->{max} ->set_fontsize ($fsize); 1907 $self->{max} ->set_fontsize ($fsize);
1862} 1908}
1863 1909
1910sub set_max {
1911 my ($self, $max) = @_;
1912
1913 $self->{gauge}->set_max ($max);
1914 $self->{max}->set_text ($max);
1915}
1916
1864sub set_value { 1917sub set_value {
1865 my ($self, $val, $max) = @_; 1918 my ($self, $val, $max) = @_;
1866 1919
1867 $self->set_max ($max) 1920 $self->set_max ($max)
1868 if defined $max; 1921 if defined $max;
1869 1922
1870 $self->{gauge}->set_value ($val, $max); 1923 $self->{gauge}->set_value ($val, $max);
1871 $self->{value}->set_text ($val); 1924 $self->{value}->set_text ($val);
1872}
1873
1874sub set_max {
1875 my ($self, $max) = @_;
1876
1877 $self->{gauge}->set_max ($max);
1878 $self->{max}->set_text ($max);
1879} 1925}
1880 1926
1881############################################################################# 1927#############################################################################
1882 1928
1883package CFClient::UI::Slider; 1929package CFClient::UI::Slider;
… …
2121 2167
2122 delete $self->{texture}; 2168 delete $self->{texture};
2123 } 2169 }
2124 2170
2125 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2171 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
2126 glClearColor 0, 0, 0, 1; 2172 glClearColor 0, 0, 0, 0;
2127 glClear GL_COLOR_BUFFER_BIT; 2173 glClear GL_COLOR_BUFFER_BIT;
2128 2174
2129 glEnable GL_BLEND; 2175 glEnable GL_BLEND;
2130 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2176 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2131 glEnable GL_TEXTURE_2D; 2177 glEnable GL_TEXTURE_2D;
… …
2164 2210
2165sub _draw { 2211sub _draw {
2166 my ($self) = @_; 2212 my ($self) = @_;
2167 2213
2168 if ($self->{texture}) { 2214 if ($self->{texture}) {
2215 glEnable GL_BLEND;
2216 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2169 glEnable GL_TEXTURE_2D; 2217 glEnable GL_TEXTURE_2D;
2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2218 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2171 glColor 1, 1, 1, 1; 2219 glColor 1, 1, 1, 1;
2172 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2220 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
2173 glDisable GL_TEXTURE_2D; 2221 glDisable GL_TEXTURE_2D;
2222 glDisable GL_BLEND;
2174 } 2223 }
2175 2224
2176 $self->{children}[1]->draw; 2225 $self->{children}[1]->draw;
2177 2226
2178} 2227}

Diff Legend

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