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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.278 by root, Sun Jun 4 23:05:06 2006 UTC vs.
Revision 1.285 by root, Mon Jun 5 03:07:01 2006 UTC

…		…
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
		8	use Event;
8		9
9	use CFClient;	10	use CFClient;
10	use CFClient::Texture;	11	use CFClient::Texture;
11		12
12	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
…		…
15	our $ROOT;	16	our $ROOT;
16	our $TOOLTIP;	17	our $TOOLTIP;
17	our $BUTTON_STATE;	18	our $BUTTON_STATE;
18		19
19	our %WIDGET; # all widgets, weak-referenced	20	our %WIDGET; # all widgets, weak-referenced
		21
		22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
		23	if (!$GRAB) {
		24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
		25	if (length $widget->{tooltip}) {
		26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->hide;
		28
		29	$TOOLTIP->{owner} = $widget;
		30
		31	return if $ENV{CFPLUS_DEBUG} & 8;
		32
		33	my $tip = $widget->{tooltip};
		34
		35	$tip = $tip->($widget) if CODE:: eq ref $tip;
		36
		37	$TOOLTIP->set_tooltip_from ($widget);
		38	$TOOLTIP->show;
		39	}
		40
		41	return;
		42	}
		43	}
		44	}
		45
		46	$TOOLTIP->hide;
		47	delete $TOOLTIP->{owner};
		48	});
20		49
21	sub get_layout {	50	sub get_layout {
22	my $layout;	51	my $layout;
23		52
24	for (grep { $_->{name} } values %WIDGET) {	53	for (grep { $_->{name} } values %WIDGET) {
…		…
39	my ($layout) = @_;	68	my ($layout) = @_;
40		69
41	$LAYOUT = $layout;	70	$LAYOUT = $layout;
42	}	71	}
43		72
44	sub check_tooltip {
45	return if $ENV{CFPLUS_DEBUG} & 8;
46
47	if (!$GRAB) {
48	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
49	if (length $widget->{tooltip}) {
50	if ($TOOLTIP->{owner} != $widget) {
51	$TOOLTIP->hide;
52
53	$TOOLTIP->{owner} = $widget;
54
55	my $tip = $widget->{tooltip};
56
57	$tip = $tip->($widget) if CODE:: eq ref $tip;
58
59	$TOOLTIP->set_tooltip_from ($widget);
60	$TOOLTIP->show;
61	}
62
63	return;
64	}
65	}
66	}
67
68	$TOOLTIP->hide;
69	delete $TOOLTIP->{owner};
70	}
71
72	# class methods for events	73	# class methods for events
73	sub feed_sdl_key_down_event {	74	sub feed_sdl_key_down_event {
74	$FOCUS->emit (key_down => $_[0])	75	$FOCUS->emit (key_down => $_[0])
75	if $FOCUS;	76	if $FOCUS;
76	}	77	}
…		…
88	my $widget = $ROOT->find_widget ($x, $y);	89	my $widget = $ROOT->find_widget ($x, $y);
89		90
90	$GRAB = $widget;	91	$GRAB = $widget;
91	$GRAB->update if $GRAB;	92	$GRAB->update if $GRAB;
92		93
93	check_tooltip;	94	$TOOLTIP_WATCHER->cb->();
94	}	95	}
95		96
96	$BUTTON_STATE \|= 1 << ($ev->{button} - 1);	97	$BUTTON_STATE \|= 1 << ($ev->{button} - 1);
97		98
98	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))	99	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
…		…
113	if (!$BUTTON_STATE) {	114	if (!$BUTTON_STATE) {
114	my $grab = $GRAB; undef $GRAB;	115	my $grab = $GRAB; undef $GRAB;
115	$grab->update if $grab;	116	$grab->update if $grab;
116	$GRAB->update if $GRAB;	117	$GRAB->update if $GRAB;
117		118
118	check_tooltip;	119	$TOOLTIP_WATCHER->cb->();
119	}	120	}
120	}	121	}
121		122
122	sub feed_sdl_motion_event {	123	sub feed_sdl_motion_event {
123	my ($ev) = @_;	124	my ($ev) = @_;
…		…
129	my $hover = $HOVER; $HOVER = $widget;	130	my $hover = $HOVER; $HOVER = $widget;
130		131
131	$hover->update if $hover && $hover->{can_hover};	132	$hover->update if $hover && $hover->{can_hover};
132	$HOVER->update if $HOVER && $HOVER->{can_hover};	133	$HOVER->update if $HOVER && $HOVER->{can_hover};
133		134
134	check_tooltip;	135	$TOOLTIP_WATCHER->start;
135	}	136	}
136		137
137	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))	138	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
138	if $HOVER;	139	if $HOVER;
139	}	140	}
…		…
277	delete $self->{visible};	278	delete $self->{visible};
278		279
279	undef $GRAB if $GRAB == $self;	280	undef $GRAB if $GRAB == $self;
280	undef $HOVER if $HOVER == $self;	281	undef $HOVER if $HOVER == $self;
281		282
282	CFClient::UI::check_tooltip	283	$CFClient::UI::TOOLTIP_WATCHER->cb->()
283	if $TOOLTIP->{owner} == $self;	284	if $TOOLTIP->{owner} == $self;
284		285
285	$self->focus_out;	286	$self->focus_out;
286		287
287	$self->emit (visibility_change => 0);	288	$self->emit (visibility_change => 0);
…		…
381	}	382	}
382		383
383	sub set_max_size {	384	sub set_max_size {
384	my ($self, $w, $h) = @_;	385	my ($self, $w, $h) = @_;
385		386
386	delete $self->{max_w}; $self->{max_w} = $w if $w;	387	$self->{max_w} = int $w if defined $w;
387	delete $self->{max_h}; $self->{max_h} = $h if $h;	388	$self->{max_h} = int $h if defined $h;
		389
		390	$self->realloc;
388	}	391	}
389		392
390	sub set_tooltip {	393	sub set_tooltip {
391	my ($self, $tooltip) = @_;	394	my ($self, $tooltip) = @_;
392		395
…		…
397		400
398	$self->{tooltip} = $tooltip;	401	$self->{tooltip} = $tooltip;
399		402
400	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	403	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401	delete $CFClient::UI::TOOLTIP->{owner};	404	delete $CFClient::UI::TOOLTIP->{owner};
402	CFClient::UI::check_tooltip;	405	$CFClient::UI::TOOLTIP_WATCHER->cb->();
403	}	406	}
404	}	407	}
405		408
406	# translate global coordinates to local coordinate system	409	# translate global coordinates to local coordinate system
407	sub coord2local {	410	sub coord2local {
…		…
855	my $tex = $self->{texture}	858	my $tex = $self->{texture}
856	or return;	859	or return;
857		860
858	glEnable GL_TEXTURE_2D;	861	glEnable GL_TEXTURE_2D;
859	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	862	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860	glEnable GL_BLEND;
861	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
862	glColor 0, 0, 0, 1;	863	glColor 0, 0, 0, 1;
863		864
864	$tex->draw_quad (0, 0, $w, $h);	865	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
865		866
866	glDisable GL_BLEND;
867	glDisable GL_TEXTURE_2D;	867	glDisable GL_TEXTURE_2D;
868	}	868	}
869		869
870	#############################################################################	870	#############################################################################
871		871
…		…
1539		1539
1540	delete $self->{texture};	1540	delete $self->{texture};
1541	$self->SUPER::update;	1541	$self->SUPER::update;
1542	}	1542	}
1543		1543
		1544	sub realloc {
		1545	my ($self) = @_;
		1546
		1547	delete $self->{ox};
		1548	$self->SUPER::realloc;
		1549	}
		1550
1544	sub set_text {	1551	sub set_text {
1545	my ($self, $text) = @_;	1552	my ($self, $text) = @_;
1546		1553
1547	return if $self->{text} eq "T$text";	1554	return if $self->{text} eq "T$text";
1548	$self->{text} = "T$text";	1555	$self->{text} = "T$text";
1549		1556
1550	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;	1557	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1551	$self->{layout}->set_text ($text);	1558	$self->{layout}->set_text ($text);
		1559	delete $self->{req_h};
1552		1560
1553	$self->realloc;	1561	$self->realloc;
1554	$self->update;	1562	$self->update;
1555	}	1563	}
1556		1564
…		…
1562		1570
1563	my $rgba = $markup =~ /span.*(?:foreground\|background)/;	1571	my $rgba = $markup =~ /span.*(?:foreground\|background)/;
1564		1572
1565	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;	1573	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1566	$self->{layout}->set_markup ($markup);	1574	$self->{layout}->set_markup ($markup);
		1575	delete $self->{req_h};
1567		1576
1568	$self->realloc;	1577	$self->realloc;
1569	$self->update;	1578	$self->update;
1570	}	1579	}
1571		1580
1572	sub size_request {	1581	sub size_request {
1573	my ($self) = @_;	1582	my ($self) = @_;
1574		1583
		1584	if (exists $self->{req_h}) {
		1585	@$self{qw(req_w req_h)}
		1586	} else {
1575	$self->{layout}->set_font ($self->{font}) if $self->{font};	1587	$self->{layout}->set_font ($self->{font}) if $self->{font};
1576	$self->{layout}->set_width ($self->{max_w} \|\| -1);	1588	$self->{layout}->set_width ($self->{max_w} \|\| -1);
1577	$self->{layout}->set_ellipsise ($self->{ellipsise});	1589	$self->{layout}->set_ellipsise ($self->{ellipsise});
1578	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1590	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1579	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1591	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1580		1592
1581	my ($w, $h) = $self->{layout}->size;	1593	my ($w, $h) = $self->{layout}->size;
1582		1594
1583	if (exists $self->{template}) {	1595	if (exists $self->{template}) {
1584	$self->{template}->set_font ($self->{font}) if $self->{font};	1596	$self->{template}->set_font ($self->{font}) if $self->{font};
1585	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1597	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1586		1598
1587	my ($w2, $h2) = $self->{template}->size;	1599	my ($w2, $h2) = $self->{template}->size;
1588		1600
1589	$w = List::Util::max $w, $w2;	1601	$w = List::Util::max $w, $w2;
1590	$h = List::Util::max $h, $h2;	1602	$h = List::Util::max $h, $h2;
1591	}	1603	}
1592		1604
1593	($w, $h)	1605	($w, $h)
		1606	}
1594	}	1607	}
1595		1608
1596	sub size_allocate {	1609	sub size_allocate {
1597	my ($self, $w, $h) = @_;	1610	my ($self, $w, $h) = @_;
1598		1611
…		…
1638	};	1651	};
1639		1652
1640	glEnable GL_TEXTURE_2D;	1653	glEnable GL_TEXTURE_2D;
1641	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1654	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1642		1655
		1656	glColor_premultiply @{$self->{fg}}
1643	if ($tex->{format} == GL_ALPHA) {	1657	if $tex->{format} == GL_ALPHA;
1644	glColor @{$self->{fg}};	1658
1645	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1646	} else {
1647	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1659	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1648	}
1649		1660
1650	glDisable GL_TEXTURE_2D;	1661	glDisable GL_TEXTURE_2D;
1651	}	1662	}
1652		1663
1653	#############################################################################	1664	#############################################################################
…		…
1685	$self->{last_activity} = $::NOW;	1696	$self->{last_activity} = $::NOW;
1686	$self->{text} = $text;	1697	$self->{text} = $text;
1687		1698
1688	$text =~ s/./*/g if $self->{hidden};	1699	$text =~ s/./*/g if $self->{hidden};
1689	$self->{layout}->set_text ("$text ");	1700	$self->{layout}->set_text ("$text ");
		1701	delete $self->{req_h};
1690		1702
1691	$self->_emit (changed => $self->{text});	1703	$self->_emit (changed => $self->{text});
		1704
		1705	$self->realloc;
1692	$self->update;	1706	$self->update;
1693	}	1707	}
1694		1708
1695	sub set_text {	1709	sub set_text {
1696	my ($self, $text) = @_;	1710	my ($self, $text) = @_;
1697		1711
1698	$self->{cursor} = length $text;	1712	$self->{cursor} = length $text;
1699	$self->_set_text ($text);	1713	$self->_set_text ($text);
1700
1701	$self->realloc;
1702	}	1714	}
1703		1715
1704	sub get_text {	1716	sub get_text {
1705	$_[0]{text}	1717	$_[0]{text}
1706	}	1718	}
…		…
1913	}	1925	}
1914		1926
1915	sub _draw {	1927	sub _draw {
1916	my ($self) = @_;	1928	my ($self) = @_;
1917		1929
1918	local $self->{fg} = $self->{fg};	1930	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1919
1920	if ($GRAB == $self) {
1921	$self->{fg} = $self->{active_fg};
1922	}
1923		1931
1924	glEnable GL_TEXTURE_2D;	1932	glEnable GL_TEXTURE_2D;
1925	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1933	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1926	glColor 0, 0, 0, 1;	1934	glColor 0, 0, 0, 1;
1927		1935
…		…
2575		2583
2576	delete $self->{texture};	2584	delete $self->{texture};
2577	}	2585	}
2578		2586
2579	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {	2587	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {
2580	glClearColor 0.5, 0.5, 0.5, 0;	2588	glClearColor 0, 0, 0, 0;
2581	glClear GL_COLOR_BUFFER_BIT;	2589	glClear GL_COLOR_BUFFER_BIT;
2582		2590
2583	my $top = int $self->{children}[1]{range}[0];	2591	my $top = int $self->{children}[1]{range}[0];
2584		2592
2585	my $y0 = $top;	2593	my $y0 = $top;
…		…
2620	sub _draw {	2628	sub _draw {
2621	my ($self) = @_;	2629	my ($self) = @_;
2622		2630
2623	glEnable GL_TEXTURE_2D;	2631	glEnable GL_TEXTURE_2D;
2624	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2632	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2625	glColor 1, 1, 1, 1;	2633	glColor 0, 0, 0, 1;
2626	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2634	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2627	glDisable GL_TEXTURE_2D;	2635	glDisable GL_TEXTURE_2D;
2628		2636
2629	$self->{children}[1]->draw;	2637	$self->{children}[1]->draw;
2630		2638
2631	}	2639	}
…		…
2858	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];	2866	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];
2859		2867
2860	if ($tex) {	2868	if ($tex) {
2861	glEnable GL_TEXTURE_2D;	2869	glEnable GL_TEXTURE_2D;
2862	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2870	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2863	glColor 1, 1, 1, 1;	2871	glColor 0, 0, 0, 1;
2864	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2872	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2865	glDisable GL_TEXTURE_2D;	2873	glDisable GL_TEXTURE_2D;
2866	}	2874	}
2867	}	2875	}
2868		2876
…		…
3076	our @ISA = CFClient::UI::VBox::;	3084	our @ISA = CFClient::UI::VBox::;
3077		3085
3078	sub new {	3086	sub new {
3079	my $class = shift;	3087	my $class = shift;
3080		3088
3081	$class->SUPER::new (	3089	my $self = $class->SUPER::new (
3082	fontsize => 0.8,	3090	fontsize => 0.8,
3083	@_,	3091	@_,
3084	)	3092	);
		3093
		3094	Scalar::Util::weaken (my $this = $self);
		3095
		3096	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3097
		3098	$self
3085	}	3099	}
3086		3100
3087	sub reorder {	3101	sub reorder {
3088	my ($self) = @_;	3102	my ($self) = @_;
3089	my $NOW = time;	3103	my $NOW = Time::HiRes::time;
		3104
		3105	# freeze display when hovering over any label
		3106	return if $CFClient::UI::TOOLTIP->{owner}
		3107	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
		3108	values %{ $self->{item} };
3090		3109
3091	while (my ($k, $v) = each %{ $self->{item} }) {	3110	while (my ($k, $v) = each %{ $self->{item} }) {
3092	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3111	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3093	}	3112	}
3094		3113
…		…
3097	my @items = sort {	3116	my @items = sort {
3098	$a->{pri} <=> $b->{pri}	3117	$a->{pri} <=> $b->{pri}
3099	or $b->{id} <=> $a->{id}	3118	or $b->{id} <=> $a->{id}
3100	} values %{ $self->{item} };	3119	} values %{ $self->{item} };
3101		3120
		3121	$self->{timer}->interval (1);
		3122
3102	my $count = 10 + 1;	3123	my $count = 10 + 1;
3103	for my $item (@items) {	3124	for my $item (@items) {
3104	last unless --$count;	3125	last unless --$count;
3105		3126
3106	push @widgets, $item->{label} \|\|= do {	3127	my $label = $item->{label} \|\|= do {
3107	# TODO: doesn't handle markup well (read as: at all)	3128	# TODO: doesn't handle markup well (read as: at all)
3108	my $short = $item->{count} > 1	3129	my $short = $item->{count} > 1
3109	? "<b>$item->{count} ×</b> $item->{text}"	3130	? "<b>$item->{count} ×</b> $item->{text}"
3110	: $item->{text};	3131	: $item->{text};
3111		3132
…		…
3119	tooltip => $item->{tooltip},	3140	tooltip => $item->{tooltip},
3120	tooltip_font => $::FONT_PROP,	3141	tooltip_font => $::FONT_PROP,
3121	tooltip_width => 0.67,	3142	tooltip_width => 0.67,
3122	fontsize => $item->{fontsize} \|\| $self->{fontsize},	3143	fontsize => $item->{fontsize} \|\| $self->{fontsize},
3123	max_w => $::WIDTH * 0.44,	3144	max_w => $::WIDTH * 0.44,
3124	fg => $item->{fg},	3145	fg => [@{ $item->{fg} }],
3125	can_events => 1,	3146	can_events => 1,
3126	can_hover => 1	3147	can_hover => 1
3127	};	3148	};
		3149
		3150	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3151	$label->{fg}[3] = ($item->{fg}[3] \|\| 1) * $diff / 2;
		3152	$label->update;
		3153	$label->set_max_size (undef, $label->{req_h} * $diff)
		3154	if $diff < 1;
		3155	$self->{timer}->interval (1/30);
		3156	} else {
		3157	$label->{fg}[3] = $item->{fg}[3] \|\| 1;
		3158	}
		3159
		3160	push @widgets, $label;
3128	}	3161	}
3129		3162
3130	$self->clear;	3163	$self->clear;
3131	$self->SUPER::add (reverse @widgets);	3164	$self->SUPER::add (reverse @widgets);
3132	}	3165	}
…		…
3137	$text =~ s/^\s+//;	3170	$text =~ s/^\s+//;
3138	$text =~ s/\s+$//;	3171	$text =~ s/\s+$//;
3139		3172
3140	return unless $text;	3173	return unless $text;
3141		3174
3142	my $timeout = time + ((delete $arg{timeout}) \|\| 60);	3175	my $timeout = (int time) + ((delete $arg{timeout}) \|\| 60);
3143		3176
3144	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3177	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3145		3178
3146	if (my $item = $self->{item}{$group}) {	3179	if (my $item = $self->{item}{$group}) {
3147	if ($item->{text} eq $text) {	3180	if ($item->{text} eq $text) {
…		…
3177		3210
3178	$self->reorder;	3211	$self->reorder;
3179	$self->SUPER::reconfigure;	3212	$self->SUPER::reconfigure;
3180	}	3213	}
3181		3214
		3215	sub DESTROY {
		3216	my ($self) = @_;
		3217
		3218	$self->{timer}->cancel;
		3219
		3220	$self->SUPER::DESTROY;
		3221	}
		3222
3182	#############################################################################	3223	#############################################################################
3183		3224
3184	package CFClient::UI::Inventory;	3225	package CFClient::UI::Inventory;
3185		3226
3186	our @ISA = CFClient::UI::ScrolledWindow::;	3227	our @ISA = CFClient::UI::ScrolledWindow::;
…		…
3478		3519
3479	package CFClient::UI::Root;	3520	package CFClient::UI::Root;
3480		3521
3481	our @ISA = CFClient::UI::Container::;	3522	our @ISA = CFClient::UI::Container::;
3482		3523
		3524	use List::Util qw(min max);
		3525
3483	use CFClient::OpenGL;	3526	use CFClient::OpenGL;
3484		3527
3485	sub new {	3528	sub new {
3486	my $class = shift;	3529	my $class = shift;
3487		3530
…		…
3621		3664
3622	delete $queue{$widget+0};	3665	delete $queue{$widget+0};
3623		3666
3624	my ($w, $h) = $widget->size_request;	3667	my ($w, $h) = $widget->size_request;
3625		3668
3626	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3669	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3627	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	3670	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3671
		3672	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3673	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3628		3674
3629	$w = $widget->{force_w} if exists $widget->{force_w};	3675	$w = $widget->{force_w} if exists $widget->{force_w};
3630	$h = $widget->{force_h} if exists $widget->{force_h};	3676	$h = $widget->{force_h} if exists $widget->{force_h};
3631		3677
3632	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h	3678	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.278 by root, Sun Jun 4 23:05:06 2006 UTC vs. Revision 1.285 by root, Mon Jun 5 03:07:01 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.278 by root, Sun Jun 4 23:05:06 2006 UTC vs.
Revision 1.285 by root, Mon Jun 5 03:07:01 2006 UTC