[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.202 by root, Sun May 14 20:51:19 2006 UTC vs.
Revision 1.206 by root, Mon May 15 17:45:29 2006 UTC

…		…
31	$TOOLTIP->set_tooltip_from ($widget);	31	$TOOLTIP->set_tooltip_from ($widget);
32	$TOOLTIP->show;	32	$TOOLTIP->show;
33		33
34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35		35
36	if ($x + $TOOLTIP->{w} > $::WIDTH) {
37	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38	}	37	if $x + $TOOLTIP->{w} > $::WIDTH;
39		38
40	$TOOLTIP->move ($x, $y);	39	$TOOLTIP->move ($x, $y);
41	$TOOLTIP->check_size;	40	$TOOLTIP->check_size;
42	$TOOLTIP->update;	41	$TOOLTIP->update;
43	}	42	}
…		…
199	sub show {	198	sub show {
200	my ($self) = @_;	199	my ($self) = @_;
201		200
202	return if $self->{parent};	201	return if $self->{parent};
203		202
204	$self->{toplevel} = 1;
205	$CFClient::UI::ROOT->add ($self);	203	$CFClient::UI::ROOT->add ($self);
206	}	204	}
207		205
208	sub hide {	206	sub hide {
209	my ($self) = @_;	207	my ($self) = @_;
…		…
377	glVertex $self->{w}, 0;	375	glVertex $self->{w}, 0;
378	glVertex $self->{w}, $self->{h};	376	glVertex $self->{w}, $self->{h};
379	glVertex 0 , $self->{h};	377	glVertex 0 , $self->{h};
380	glEnd;	378	glEnd;
381	glPopMatrix;	379	glPopMatrix;
382	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	380	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
383	}	381	}
384	}	382	}
385		383
386	sub _draw {	384	sub _draw {
387	my ($self) = @_;	385	my ($self) = @_;
…		…
2012	qw(s1_slider.png s1_slider_bg.png);	2010	qw(s1_slider.png s1_slider_bg.png);
2013		2011
2014	sub new {	2012	sub new {
2015	my $class = shift;	2013	my $class = shift;
2016		2014
2017	# range [value, low, high, page]	2015	# range [value, low, high, page, unit]
2018		2016
2019	# TODO: 0-width page	2017	# TODO: 0-width page
2020	# TODO: req_w/h are wrong with vertical	2018	# TODO: req_w/h are wrong with vertical
2021	# TODO: calculations are off	2019	# TODO: calculations are off
2022	my $self = $class->SUPER::new (	2020	my $self = $class->SUPER::new (
…		…
2025	range => [0, 0, 100, 10],	2023	range => [0, 0, 100, 10],
2026	req_w => $::WIDTH / 80,	2024	req_w => $::WIDTH / 80,
2027	req_h => $::WIDTH / 80,	2025	req_h => $::WIDTH / 80,
2028	vertical => 0,	2026	vertical => 0,
2029	can_hover => 1,	2027	can_hover => 1,
2030	inner_pad => 5,	2028	inner_pad => .05,
2031	@_	2029	@_
2032	);	2030	);
2033		2031
		2032	$self->set_value ($self->{range}[0]);
		2033	$self->update;
		2034
2034	$self	2035	$self
		2036	}
		2037
		2038	sub set_value {
		2039	my ($self, $value) = @_;
		2040
		2041	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2042
		2043	$hi = $lo + 1 if $hi <= $lo;
		2044
		2045	$value = $lo if $value < $lo;
		2046	$value = $hi if $value > $hi;
		2047
		2048	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2049	if $unit;
		2050
		2051	$page = $hi - $lo if $page > $hi - $lo;
		2052
		2053	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2054
		2055	if ($value != $old_value) {
		2056	$self->emit (changed => $value);
		2057	$self->update;
		2058	}
2035	}	2059	}
2036		2060
2037	sub size_request {	2061	sub size_request {
2038	my ($self) = @_;	2062	my ($self) = @_;
2039		2063
…		…
2052		2076
2053	sub mouse_motion {	2077	sub mouse_motion {
2054	my ($self, $ev, $x, $y) = @_;	2078	my ($self, $ev, $x, $y) = @_;
2055		2079
2056	if ($GRAB == $self) {	2080	if ($GRAB == $self) {
		2081	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2082
		2083	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2084
		2085	$x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
		2086
		2087	$self->set_value ($x * ($hi - $lo) + $lo);
		2088	}
		2089	}
		2090
		2091	sub update {
		2092	my ($self) = @_;
		2093
		2094	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2095	$self->set_value ($self->{range}[0]);
		2096
2057	my ($value, $lo, $hi, $page) = @{$self->{range}};	2097	my ($value, $lo, $hi, $page) = @{$self->{range}};
2058		2098
2059	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2099	my $inner_w = 1 - 2 * $self->{inner_pad};
2060		2100
2061	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2101	$self->{scale} = ($inner_w / ($hi - $lo)) \|\| 1;
2062	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2063		2102
2064	$x -= $inner_pad_px; # substract the padding	2103	$page = $self->{scale} * $page \|\| 10 / ($self->{w} \|\| 1);
2065	$x = $x * ($hi - $lo) / $inner_w + $lo;	2104	$value = $self->{scale} * ($value - $lo);
2066	$x = $lo if $x < $lo;
2067	$x = $hi - $page if $x > $hi - $page;
2068	$self->{range}[0] = $x;
2069		2105
2070	$self->emit (changed => $x);	2106	$value = $self->{inner_pad} + ($value - $page * 0.5);
2071	$self->update;	2107
		2108	$value = 0 if $value < 0;
		2109	$page = 1 - $value if $value + $page > 1;
		2110
		2111	$self->{knob_x} = $value;
		2112	$self->{knob_w} = $page;
2072	}	2113	});
2073	}
2074		2114
2075	# the inner_* stuff is for generating a padding for the slider handle,	2115	$self->SUPER::update;
2076	# so that the handle doesn't leave the texture. This calculation isn't 100%
2077	# correct propably, but it does the job for now
2078	sub _calc_inner_pad_px {
2079	my ($self, $w) = @_;
2080	($w / 100) * $self->{inner_pad} # % to pixels
2081	}	2116	}
2082		2117
2083	sub _draw {	2118	sub _draw {
2084	my ($self) = @_;	2119	my ($self) = @_;
2085		2120
2086	$self->SUPER::_draw ();	2121	$self->SUPER::_draw ();
2087		2122
2088	my ($w, $h) = @$self{qw(w h)};	2123	glScale $self->{w}, $self->{h};
2089		2124
2090	if ($self->{vertical}) {	2125	if ($self->{vertical}) {
2091	# draw a vertical slider like a rotated horizontal slider	2126	# draw a vertical slider like a rotated horizontal slider
2092		2127
2093	glRotate 90, 0, 0, 1;	2128	glRotate 90, 0, 0, 1;
2094	glTranslate 0, -$self->{w}, 0;	2129	glTranslate 0, 1, 0;
2095
2096	($w, $h) = ($h, $w);
2097	}	2130	}
2098		2131
2099	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2132	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2100	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2133	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2101		2134
2102	my ($value, $lo, $hi, $page) = @{$self->{range}};
2103
2104	$hi = $value + 1 if $lo == $hi;
2105
2106	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2107	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2108
2109	$page = int $page * $inner_w / ($hi - $lo);
2110	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2111
2112	$w -= $page;
2113	$page &= ~1;
2114	glTranslate $page * 0.5, 0, 0;
2115	$page \|\|= 2;
2116
2117	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2118	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2119
2120	glEnable GL_TEXTURE_2D;	2135	glEnable GL_TEXTURE_2D;
2121	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2136	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2122		2137
2123	# draw background	2138	# draw background
2124	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2139	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2125		2140
2126	# draw handle	2141	# draw handle
2127	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	2142	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2128		2143
2129	glDisable GL_TEXTURE_2D;	2144	glDisable GL_TEXTURE_2D;
2130	}	2145	}
2131		2146
2132	#############################################################################	2147	#############################################################################
…		…
2691	? "<b>$item->{count} ×</b> $item->{text}"	2706	? "<b>$item->{count} ×</b> $item->{text}"
2692	: $item->{text};	2707	: $item->{text};
2693		2708
2694	for ($short) {	2709	for ($short) {
2695	s/^\s+//;	2710	s/^\s+//;
2696	s/\012.*/…/s;	2711	s/\s+/ /g;
2697	my $len = int 40 / $item->{fontsize};	2712	my $len = int 40 / $item->{fontsize};
2698	substr $_, $len, length, "…" if $len < length;	2713	substr $_, $len, length, "…" if $len < length;
2699	}	2714	}
2700		2715
2701	new CFClient::UI::Label	2716	new CFClient::UI::Label
2702	markup => $short,	2717	markup => $short,
2703	tooltip => $item->{tooltip},	2718	tooltip => $item->{tooltip},
2704	tooltip_font => $::FONT_PROP,	2719	tooltip_font => $::FONT_PROP,
2705	tooltip_width => 0.67,	2720	tooltip_width => 0.67,
2706	fontsize => $item->{fontsize},	2721	fontsize => $item->{fontsize},
2707	color => $item->{color},	2722	fg => $item->{fg},
2708	can_events => 1,	2723	can_events => 1,
2709	can_hover => 1	2724	can_hover => 1
2710	};	2725	};
2711	}	2726	}
2712		2727
…		…
2739	id => ++$self->{id},	2754	id => ++$self->{id},
2740	text => $text,	2755	text => $text,
2741	timeout => $timeout,	2756	timeout => $timeout,
2742	tooltip => $text,	2757	tooltip => $text,
2743	fontsize => 0.8,	2758	fontsize => 0.8,
2744	color => [0.8, 0.8, 0.8, 0.8],	2759	fg => [0.8, 0.8, 0.8, 0.8],
2745	pri => 0,	2760	pri => 0,
2746	count => 1,	2761	count => 1,
2747	%arg,	2762	%arg,
2748	};	2763	};
2749	}	2764	}
…		…
2797	if $old_w && $old_h && ($old_w != $w \|\| $old_h != $h);	2812	if $old_w && $old_h && ($old_w != $w \|\| $old_h != $h);
2798		2813
2799	for my $child ($self->children) {	2814	for my $child ($self->children) {
2800	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2815	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2801		2816
		2817	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2818	if exists $child->{req_x};
		2819
		2820	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		2821	if exists $child->{req_y};
		2822
2802	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2823	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2803	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2824	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		2825
2804	$child->configure ($X, $Y, $W, $H);	2826	$child->configure ($X, $Y, $W, $H);
2805	}	2827	}
2806	}	2828	}
2807		2829
2808	sub coord2local {	2830	sub coord2local {
…		…
2823	$self->check_size;	2845	$self->check_size;
2824	$::WANT_REFRESH++;	2846	$::WANT_REFRESH++;
2825	}	2847	}
2826		2848
2827	sub add {	2849	sub add {
2828	my ($self, $child) = @_;	2850	my ($self, @children) = @_;
2829		2851
		2852	for my $child (@children) {
		2853	$child->{toplevel} = 1;
		2854
2830	# integerise window positions	2855	# integerise window positions
2831	$child->{x} = int $child->{x};	2856	$child->{x} = int $child->{x};
2832	$child->{y} = int $child->{y};	2857	$child->{y} = int $child->{y};
		2858	}
2833		2859
2834	$self->SUPER::add ($child);	2860	$self->SUPER::add (@children);
2835	}	2861	}
2836		2862
2837	sub on_refresh {	2863	sub on_refresh {
2838	my ($self, $id, $cb) = @_;	2864	my ($self, $id, $cb) = @_;
2839		2865

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.202 by root, Sun May 14 20:51:19 2006 UTC vs. Revision 1.206 by root, Mon May 15 17:45:29 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.202 by root, Sun May 14 20:51:19 2006 UTC vs.
Revision 1.206 by root, Mon May 15 17:45:29 2006 UTC