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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.275 by root, Sat Jun 3 22:50:48 2006 UTC vs.
Revision 1.282 by root, Mon Jun 5 02:25:10 2006 UTC

…		…
381	}	381	}
382		382
383	sub set_max_size {	383	sub set_max_size {
384	my ($self, $w, $h) = @_;	384	my ($self, $w, $h) = @_;
385		385
386	delete $self->{max_w}; $self->{max_w} = $w if $w;	386	$self->{max_w} = int $w if defined $w;
387	delete $self->{max_h}; $self->{max_h} = $h if $h;	387	$self->{max_h} = int $h if defined $h;
		388
		389	$self->realloc;
388	}	390	}
389		391
390	sub set_tooltip {	392	sub set_tooltip {
391	my ($self, $tooltip) = @_;	393	my ($self, $tooltip) = @_;
392		394
…		…
548	return if ($draw_x + $self->{w} < 0) \|\| ($draw_x >= $draw_w)	550	return if ($draw_x + $self->{w} < 0) \|\| ($draw_x >= $draw_w)
549	\|\| ($draw_y + $self->{h} < 0) \|\| ($draw_y >= $draw_h);	551	\|\| ($draw_y + $self->{h} < 0) \|\| ($draw_y >= $draw_h);
550		552
551	glPushMatrix;	553	glPushMatrix;
552	glTranslate $self->{x}, $self->{y}, 0;	554	glTranslate $self->{x}, $self->{y}, 0;
553	$self->_draw;
554	glPopMatrix;
555		555
556	if ($self == $HOVER && $self->{can_hover}) {	556	if ($self == $HOVER && $self->{can_hover}) {
557	my ($x, $y) = @$self{qw(x y)};
558
559	glColor 1, 0.8, 0.5, 0.2;	557	glColor 10.2, 0.80.2, 0.5*0.2, 0.2;
560	glEnable GL_BLEND;	558	glEnable GL_BLEND;
561	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	559	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
562	glBegin GL_QUADS;	560	glBegin GL_QUADS;
563	glVertex $x , $y;	561	glVertex 0 , 0;
564	glVertex $x + $self->{w}, $y;	562	glVertex $self->{w}, 0;
565	glVertex $x + $self->{w}, $y + $self->{h};	563	glVertex $self->{w}, $self->{h};
566	glVertex $x , $y + $self->{h};	564	glVertex 0 , $self->{h};
567	glEnd;	565	glEnd;
568	glDisable GL_BLEND;	566	glDisable GL_BLEND;
569	}	567	}
570		568
571	if ($ENV{CFPLUS_DEBUG} & 1) {	569	if ($ENV{CFPLUS_DEBUG} & 1) {
572	glPushMatrix;	570	glPushMatrix;
573	glColor 1, 1, 0, 1;	571	glColor 1, 1, 0, 1;
574	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	572	glTranslate 0.375, 0.375;
575	glBegin GL_LINE_LOOP;	573	glBegin GL_LINE_LOOP;
576	glVertex 0 , 0;	574	glVertex 0 , 0;
577	glVertex $self->{w} - 1, 0;	575	glVertex $self->{w} - 1, 0;
578	glVertex $self->{w} - 1, $self->{h} - 1;	576	glVertex $self->{w} - 1, $self->{h} - 1;
579	glVertex 0 , $self->{h} - 1;	577	glVertex 0 , $self->{h} - 1;
580	glEnd;	578	glEnd;
581	glPopMatrix;	579	glPopMatrix;
582	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	580	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
583	}	581	}
		582
		583	$self->_draw;
		584	glPopMatrix;
584	}	585	}
585		586
586	sub _draw {	587	sub _draw {
587	my ($self) = @_;	588	my ($self) = @_;
588		589
…		…
626		627
627	if ($color && (@$color < 4 \|\| $color->[3])) {	628	if ($color && (@$color < 4 \|\| $color->[3])) {
628	my ($w, $h) = @$self{qw(w h)};	629	my ($w, $h) = @$self{qw(w h)};
629		630
630	glEnable GL_BLEND;	631	glEnable GL_BLEND;
631	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	632	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
632	glColor @$color;	633	glColor_premultiply @$color;
633		634
634	glBegin GL_QUADS;	635	glBegin GL_QUADS;
635	glVertex 0 , 0;	636	glVertex 0 , 0;
636	glVertex 0 , $h;	637	glVertex 0 , $h;
637	glVertex $w, $h;	638	glVertex $w, $h;
…		…
856	my $tex = $self->{texture}	857	my $tex = $self->{texture}
857	or return;	858	or return;
858		859
859	glEnable GL_TEXTURE_2D;	860	glEnable GL_TEXTURE_2D;
860	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	861	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
861	glColor 1, 1, 1, 1;	862	glColor 0, 0, 0, 1;
862		863
863	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	864	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
864		865
865	glDisable GL_TEXTURE_2D;	866	glDisable GL_TEXTURE_2D;
866	}	867	}
…		…
1035		1036
1036	if ($self->{bg}) {	1037	if ($self->{bg}) {
1037	my ($w, $h) = @$self{qw(w h)};	1038	my ($w, $h) = @$self{qw(w h)};
1038		1039
1039	glEnable GL_BLEND;	1040	glEnable GL_BLEND;
1040	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1041	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1041	glColor @{ $self->{bg} };	1042	glColor_premultiply @{ $self->{bg} };
1042		1043
1043	glBegin GL_QUADS;	1044	glBegin GL_QUADS;
1044	glVertex 0 , 0;	1045	glVertex 0 , 0;
1045	glVertex 0 , $h;	1046	glVertex 0 , $h;
1046	glVertex $w, $h;	1047	glVertex $w, $h;
…		…
1160	my $dy = $ev->{y} - $oy;	1161	my $dy = $ev->{y} - $oy;
1161		1162
1162	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1163	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1163	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1164	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1164		1165
		1166	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1165	$self->realloc;	1167	$self->realloc;
1166	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1167	};	1168	};
1168		1169
1169	} elsif ($lr ^ $td) {	1170	} elsif ($lr ^ $td) {
1170	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1171	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1171	my ($bx, $by) = ($self->{x}, $self->{y});	1172	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1174	my ($ev, $x, $y) = @_;	1175	my ($ev, $x, $y) = @_;
1175		1176
1176	($x, $y) = ($ev->{x}, $ev->{y});	1177	($x, $y) = ($ev->{x}, $ev->{y});
1177		1178
1178	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1179	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
		1180	# HACK: the next line is required to enforce placement
		1181	$self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1179	};	1182	};
1180	} else {	1183	} else {
1181	return 0;	1184	return 0;
1182	}	1185	}
1183		1186
…		…
1535		1538
1536	delete $self->{texture};	1539	delete $self->{texture};
1537	$self->SUPER::update;	1540	$self->SUPER::update;
1538	}	1541	}
1539		1542
		1543	sub realloc {
		1544	my ($self) = @_;
		1545
		1546	delete $self->{ox};
		1547	delete $self->{req_h};
		1548	$self->SUPER::realloc;
		1549	}
		1550
1540	sub set_text {	1551	sub set_text {
1541	my ($self, $text) = @_;	1552	my ($self, $text) = @_;
1542		1553
1543	return if $self->{text} eq "T$text";	1554	return if $self->{text} eq "T$text";
1544	$self->{text} = "T$text";	1555	$self->{text} = "T$text";
…		…
1566	}	1577	}
1567		1578
1568	sub size_request {	1579	sub size_request {
1569	my ($self) = @_;	1580	my ($self) = @_;
1570		1581
		1582	if (exists $self->{req_h}) {
		1583	@$self{qw(req_w req_h)}
		1584	} else {
1571	$self->{layout}->set_font ($self->{font}) if $self->{font};	1585	$self->{layout}->set_font ($self->{font}) if $self->{font};
1572	$self->{layout}->set_width ($self->{max_w} \|\| -1);	1586	$self->{layout}->set_width ($self->{max_w} \|\| -1);
1573	$self->{layout}->set_ellipsise ($self->{ellipsise});	1587	$self->{layout}->set_ellipsise ($self->{ellipsise});
1574	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1588	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1575	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1589	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1576		1590
1577	my ($w, $h) = $self->{layout}->size;	1591	my ($w, $h) = $self->{layout}->size;
1578		1592
1579	if (exists $self->{template}) {	1593	if (exists $self->{template}) {
1580	$self->{template}->set_font ($self->{font}) if $self->{font};	1594	$self->{template}->set_font ($self->{font}) if $self->{font};
1581	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1595	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1582		1596
1583	my ($w2, $h2) = $self->{template}->size;	1597	my ($w2, $h2) = $self->{template}->size;
1584		1598
1585	$w = List::Util::max $w, $w2;	1599	$w = List::Util::max $w, $w2;
1586	$h = List::Util::max $h, $h2;	1600	$h = List::Util::max $h, $h2;
1587	}	1601	}
1588		1602
1589	($w, $h)	1603	($w, $h)
		1604	}
1590	}	1605	}
1591		1606
1592	sub size_allocate {	1607	sub size_allocate {
1593	my ($self, $w, $h) = @_;	1608	my ($self, $w, $h) = @_;
1594		1609
…		…
1634	};	1649	};
1635		1650
1636	glEnable GL_TEXTURE_2D;	1651	glEnable GL_TEXTURE_2D;
1637	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1652	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1638		1653
		1654	glColor_premultiply @{$self->{fg}}
1639	if ($tex->{format} == GL_ALPHA) {	1655	if $tex->{format} == GL_ALPHA;
1640	glColor @{$self->{fg}};	1656
1641	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1642	} else {
1643	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});	1657	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1644	}
1645		1658
1646	glDisable GL_TEXTURE_2D;	1659	glDisable GL_TEXTURE_2D;
1647	}	1660	}
1648		1661
1649	#############################################################################	1662	#############################################################################
…		…
1676		1689
1677	delete $self->{cur_h};	1690	delete $self->{cur_h};
1678		1691
1679	return if $self->{text} eq $text;	1692	return if $self->{text} eq $text;
1680		1693
1681	delete $self->{texture};
1682
1683	$self->{last_activity} = $::NOW;	1694	$self->{last_activity} = $::NOW;
1684	$self->{text} = $text;	1695	$self->{text} = $text;
1685		1696
1686	$text =~ s/./*/g if $self->{hidden};	1697	$text =~ s/./*/g if $self->{hidden};
1687	$self->{layout}->set_text ("$text ");	1698	$self->{layout}->set_text ("$text ");
1688		1699
1689	$self->_emit (changed => $self->{text});	1700	$self->_emit (changed => $self->{text});
		1701	$self->update;
1690	}	1702	}
1691		1703
1692	sub set_text {	1704	sub set_text {
1693	my ($self, $text) = @_;	1705	my ($self, $text) = @_;
1694		1706
…		…
1783	my ($self) = @_;	1795	my ($self) = @_;
1784		1796
1785	local $self->{fg} = $self->{fg};	1797	local $self->{fg} = $self->{fg};
1786		1798
1787	if ($FOCUS == $self) {	1799	if ($FOCUS == $self) {
1788	glColor @{$self->{active_bg}};	1800	glColor_premultiply @{$self->{active_bg}};
1789	$self->{fg} = $self->{active_fg};	1801	$self->{fg} = $self->{active_fg};
1790	} else {	1802	} else {
1791	glColor @{$self->{bg}};	1803	glColor_premultiply @{$self->{bg}};
1792	}	1804	}
1793		1805
1794	glEnable GL_BLEND;	1806	glEnable GL_BLEND;
1795	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1807	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1796	glBegin GL_QUADS;	1808	glBegin GL_QUADS;
1797	glVertex 0 , 0;	1809	glVertex 0 , 0;
1798	glVertex 0 , $self->{h};	1810	glVertex 0 , $self->{h};
1799	glVertex $self->{w}, $self->{h};	1811	glVertex $self->{w}, $self->{h};
1800	glVertex $self->{w}, 0;	1812	glVertex $self->{w}, 0;
…		…
1910	}	1922	}
1911		1923
1912	sub _draw {	1924	sub _draw {
1913	my ($self) = @_;	1925	my ($self) = @_;
1914		1926
1915	local $self->{fg} = $self->{fg};	1927	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1916
1917	if ($GRAB == $self) {
1918	$self->{fg} = $self->{active_fg};
1919	}
1920		1928
1921	glEnable GL_TEXTURE_2D;	1929	glEnable GL_TEXTURE_2D;
1922	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	1930	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1923	glColor 0, 0, 0, 1;	1931	glColor 0, 0, 0, 1;
1924		1932
…		…
2149		2157
2150	my $h1 = $self->{h} * (1 - $ycut1);	2158	my $h1 = $self->{h} * (1 - $ycut1);
2151	my $h2 = $self->{h} * (1 - $ycut2);	2159	my $h2 = $self->{h} * (1 - $ycut2);
2152		2160
2153	glEnable GL_BLEND;	2161	glEnable GL_BLEND;
2154	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2162	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2163	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2155	glEnable GL_TEXTURE_2D;	2164	glEnable GL_TEXTURE_2D;
2156	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2165	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2157		2166
2158	glBindTexture GL_TEXTURE_2D, $t1->{name};	2167	glBindTexture GL_TEXTURE_2D, $t1->{name};
2159	glBegin GL_QUADS;	2168	glBegin GL_QUADS;
…		…
2571		2580
2572	delete $self->{texture};	2581	delete $self->{texture};
2573	}	2582	}
2574		2583
2575	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {	2584	$self->{texture} \|\|= new_from_opengl CFClient::Texture $W, $H, sub {
2576	glClearColor 0.5, 0.5, 0.5, 0;	2585	glClearColor 0, 0, 0, 0;
2577	glClear GL_COLOR_BUFFER_BIT;	2586	glClear GL_COLOR_BUFFER_BIT;
2578		2587
2579	my $top = int $self->{children}[1]{range}[0];	2588	my $top = int $self->{children}[1]{range}[0];
2580		2589
2581	my $y0 = $top;	2590	my $y0 = $top;
…		…
2616	sub _draw {	2625	sub _draw {
2617	my ($self) = @_;	2626	my ($self) = @_;
2618		2627
2619	glEnable GL_TEXTURE_2D;	2628	glEnable GL_TEXTURE_2D;
2620	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2629	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2621	glColor 1, 1, 1, 1;	2630	glColor 0, 0, 0, 1;
2622	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2631	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2623	glDisable GL_TEXTURE_2D;	2632	glDisable GL_TEXTURE_2D;
2624		2633
2625	$self->{children}[1]->draw;	2634	$self->{children}[1]->draw;
2626		2635
2627	}	2636	}
…		…
2854	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];	2863	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];
2855		2864
2856	if ($tex) {	2865	if ($tex) {
2857	glEnable GL_TEXTURE_2D;	2866	glEnable GL_TEXTURE_2D;
2858	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2867	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2859	glColor 1, 1, 1, 1;	2868	glColor 0, 0, 0, 1;
2860	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2869	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2861	glDisable GL_TEXTURE_2D;	2870	glDisable GL_TEXTURE_2D;
2862	}	2871	}
2863	}	2872	}
2864		2873
…		…
3072	our @ISA = CFClient::UI::VBox::;	3081	our @ISA = CFClient::UI::VBox::;
3073		3082
3074	sub new {	3083	sub new {
3075	my $class = shift;	3084	my $class = shift;
3076		3085
3077	$class->SUPER::new (	3086	my $self = $class->SUPER::new (
3078	fontsize => 0.8,	3087	fontsize => 0.8,
3079	@_,	3088	@_,
3080	)	3089	);
		3090
		3091	Scalar::Util::weaken (my $this = $self);
		3092
		3093	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3094
		3095	$self
3081	}	3096	}
3082		3097
3083	sub reorder {	3098	sub reorder {
3084	my ($self) = @_;	3099	my ($self) = @_;
3085	my $NOW = time;	3100	my $NOW = Time::HiRes::time;
		3101
		3102	# freeze display when hovering over any label
		3103	return if $CFClient::UI::TOOLTIP->{owner}
		3104	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
		3105	values %{ $self->{item} };
3086		3106
3087	while (my ($k, $v) = each %{ $self->{item} }) {	3107	while (my ($k, $v) = each %{ $self->{item} }) {
3088	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3108	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3089	}	3109	}
3090		3110
…		…
3093	my @items = sort {	3113	my @items = sort {
3094	$a->{pri} <=> $b->{pri}	3114	$a->{pri} <=> $b->{pri}
3095	or $b->{id} <=> $a->{id}	3115	or $b->{id} <=> $a->{id}
3096	} values %{ $self->{item} };	3116	} values %{ $self->{item} };
3097		3117
		3118	$self->{timer}->interval (1);
		3119
3098	my $count = 10 + 1;	3120	my $count = 10 + 1;
3099	for my $item (@items) {	3121	for my $item (@items) {
3100	last unless --$count;	3122	last unless --$count;
3101		3123
3102	push @widgets, $item->{label} \|\|= do {	3124	my $label = $item->{label} \|\|= do {
3103	# TODO: doesn't handle markup well (read as: at all)	3125	# TODO: doesn't handle markup well (read as: at all)
3104	my $short = $item->{count} > 1	3126	my $short = $item->{count} > 1
3105	? "<b>$item->{count} ×</b> $item->{text}"	3127	? "<b>$item->{count} ×</b> $item->{text}"
3106	: $item->{text};	3128	: $item->{text};
3107		3129
…		…
3115	tooltip => $item->{tooltip},	3137	tooltip => $item->{tooltip},
3116	tooltip_font => $::FONT_PROP,	3138	tooltip_font => $::FONT_PROP,
3117	tooltip_width => 0.67,	3139	tooltip_width => 0.67,
3118	fontsize => $item->{fontsize} \|\| $self->{fontsize},	3140	fontsize => $item->{fontsize} \|\| $self->{fontsize},
3119	max_w => $::WIDTH * 0.44,	3141	max_w => $::WIDTH * 0.44,
3120	fg => $item->{fg},	3142	fg => [@{ $item->{fg} }],
3121	can_events => 1,	3143	can_events => 1,
3122	can_hover => 1	3144	can_hover => 1
3123	};	3145	};
		3146
		3147	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3148	$label->{fg}[3] = ($item->{fg}[3] \|\| 1) * $diff / 2;
		3149	$label->update;
		3150	$label->set_max_size (undef, $label->{req_h} * $diff)
		3151	if $diff < 1;
		3152	$self->{timer}->interval (1/30);
		3153	} else {
		3154	$label->{fg}[3] = $item->{fg}[3] \|\| 1;
		3155	}
		3156
		3157	push @widgets, $label;
3124	}	3158	}
3125		3159
3126	$self->clear;	3160	$self->clear;
3127	$self->SUPER::add (reverse @widgets);	3161	$self->SUPER::add (reverse @widgets);
3128	}	3162	}
…		…
3133	$text =~ s/^\s+//;	3167	$text =~ s/^\s+//;
3134	$text =~ s/\s+$//;	3168	$text =~ s/\s+$//;
3135		3169
3136	return unless $text;	3170	return unless $text;
3137		3171
3138	my $timeout = time + ((delete $arg{timeout}) \|\| 60);	3172	my $timeout = (int time) + ((delete $arg{timeout}) \|\| 60);
3139		3173
3140	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3174	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3141		3175
3142	if (my $item = $self->{item}{$group}) {	3176	if (my $item = $self->{item}{$group}) {
3143	if ($item->{text} eq $text) {	3177	if ($item->{text} eq $text) {
…		…
3173		3207
3174	$self->reorder;	3208	$self->reorder;
3175	$self->SUPER::reconfigure;	3209	$self->SUPER::reconfigure;
3176	}	3210	}
3177		3211
		3212	sub DESTROY {
		3213	my ($self) = @_;
		3214
		3215	$self->{timer}->cancel;
		3216
		3217	$self->SUPER::DESTROY;
		3218	}
		3219
3178	#############################################################################	3220	#############################################################################
3179		3221
3180	package CFClient::UI::Inventory;	3222	package CFClient::UI::Inventory;
3181		3223
3182	our @ISA = CFClient::UI::ScrolledWindow::;	3224	our @ISA = CFClient::UI::ScrolledWindow::;
…		…
3474		3516
3475	package CFClient::UI::Root;	3517	package CFClient::UI::Root;
3476		3518
3477	our @ISA = CFClient::UI::Container::;	3519	our @ISA = CFClient::UI::Container::;
3478		3520
		3521	use List::Util qw(min max);
		3522
3479	use CFClient::OpenGL;	3523	use CFClient::OpenGL;
3480		3524
3481	sub new {	3525	sub new {
3482	my $class = shift;	3526	my $class = shift;
3483		3527
…		…
3617		3661
3618	delete $queue{$widget+0};	3662	delete $queue{$widget+0};
3619		3663
3620	my ($w, $h) = $widget->size_request;	3664	my ($w, $h) = $widget->size_request;
3621		3665
3622	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	3666	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3623	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	3667	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		3668
		3669	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		3670	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3624		3671
3625	$w = $widget->{force_w} if exists $widget->{force_w};	3672	$w = $widget->{force_w} if exists $widget->{force_w};
3626	$h = $widget->{force_h} if exists $widget->{force_h};	3673	$h = $widget->{force_h} if exists $widget->{force_h};
3627		3674
3628	if ($widget->{req_w} != $w \|\| $widget->{req_h} != $h	3675	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.275 by root, Sat Jun 3 22:50:48 2006 UTC vs. Revision 1.282 by root, Mon Jun 5 02:25:10 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.275 by root, Sat Jun 3 22:50:48 2006 UTC vs.
Revision 1.282 by root, Mon Jun 5 02:25:10 2006 UTC