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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.208 by root, Mon May 15 22:52:17 2006 UTC vs.
Revision 1.216 by root, Fri May 19 16:43:57 2006 UTC

…		…
140		140
141	# call when resolution changes etc.	141	# call when resolution changes etc.
142	sub rescale_widgets {	142	sub rescale_widgets {
143	my ($sx, $sy) = @_;	143	my ($sx, $sy) = @_;
144		144
		145	# make a copy, otherwise for complains about freed values.
145	for my $widget (values %WIDGET) {	146	my @widgets = values %WIDGET;
		147
		148	for my $widget (@widgets) {
146	if ($widget->{toplevel}) {	149	if ($widget->{toplevel}) {
147	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};	150	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
148	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	151	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
149	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};	152	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
150	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};	153	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
…		…
280	sub set_max_size {	283	sub set_max_size {
281	my ($self, $w, $h) = @_;	284	my ($self, $w, $h) = @_;
282		285
283	delete $self->{max_w}; $self->{max_w} = $w if $w;	286	delete $self->{max_w}; $self->{max_w} = $w if $w;
284	delete $self->{max_h}; $self->{max_h} = $h if $h;	287	delete $self->{max_h}; $self->{max_h} = $h if $h;
		288	}
		289
		290	sub set_tooltip {
		291	my ($self, $tooltip) = @_;
		292
		293	$self->{tooltip} = $tooltip;
		294
		295	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		296	delete $CFClient::UI::TOOLTIP->{owner};
		297	CFClient::UI::check_tooltip;
		298	}
285	}	299	}
286		300
287	# translate global coordinates to local coordinate system	301	# translate global coordinates to local coordinate system
288	sub coord2local {	302	sub coord2local {
289	my ($self, $x, $y) = @_;	303	my ($self, $x, $y) = @_;
…		…
455	my $class = shift;	469	my $class = shift;
456		470
457	# range [value, low, high, page]	471	# range [value, low, high, page]
458		472
459	$class->SUPER::new (	473	$class->SUPER::new (
460	bg => [0, 0, 0, 0.2],	474	#bg => [0, 0, 0, 0.2],
461	active_bg => [1, 1, 1, 0.5],	475	#active_bg => [1, 1, 1, 0.5],
462	@_	476	@_
463	)	477	)
464	}	478	}
465		479
466	sub _draw {	480	sub _draw {
467	my ($self) = @_;	481	my ($self) = @_;
468		482
		483	my $color = $FOCUS == $self && $self->{active_bg}
		484	? $self->{active_bg}
		485	: $self->{bg};
		486
		487	if ($color && (@$color < 4 \|\| $color->[3])) {
469	my ($w, $h) = @$self{qw(w h)};	488	my ($w, $h) = @$self{qw(w h)};
470		489
471	glEnable GL_BLEND;	490	glEnable GL_BLEND;
472	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	491	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
473	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	492	glColor @$color;
474		493
475	glBegin GL_QUADS;	494	glBegin GL_QUADS;
476	glVertex 0 , 0;	495	glVertex 0 , 0;
477	glVertex 0 , $h;	496	glVertex 0 , $h;
478	glVertex $w, $h;	497	glVertex $w, $h;
479	glVertex $w, 0;	498	glVertex $w, 0;
480	glEnd;	499	glEnd;
481		500
482	glDisable GL_BLEND;	501	glDisable GL_BLEND;
		502	}
483	}	503	}
484		504
485	#############################################################################	505	#############################################################################
486		506
487	package CFClient::UI::Empty;	507	package CFClient::UI::Empty;
…		…
671	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	691	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
672	glClearColor 0, 0, 0, 0;	692	glClearColor 0, 0, 0, 0;
673	glClear GL_COLOR_BUFFER_BIT;	693	glClear GL_COLOR_BUFFER_BIT;
674		694
675	$self->_render;	695	$self->_render;
676	# glColorMask 1, 1, 1, 0;
677	# glEnable GL_BLEND;
678	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
679	# glRasterPos 0, 0;
680	# glCopyPixels 0, 0, $self->{w}, $self->{h};
681	# glDisable GL_BLEND;
682	# glColorMask 1, 1, 1, 1;
683	};	696	};
684	}	697	}
685		698
686	sub _draw {	699	sub _draw {
687	my ($self) = @_;	700	my ($self) = @_;
…		…
691	my $tex = $self->{texture}	704	my $tex = $self->{texture}
692	or return;	705	or return;
693		706
694	glEnable GL_TEXTURE_2D;	707	glEnable GL_TEXTURE_2D;
695	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	708	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696	glColor 0, 0, 0, 1;	709	glColor 1, 1, 1, 1;
697		710
698	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	711	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699		712
700	glDisable GL_TEXTURE_2D;	713	glDisable GL_TEXTURE_2D;
701	}	714	}
…		…
1266		1279
1267	#############################################################################	1280	#############################################################################
1268		1281
1269	package CFClient::UI::Label;	1282	package CFClient::UI::Label;
1270		1283
1271	our @ISA = CFClient::UI::Base::;	1284	our @ISA = CFClient::UI::DrawBG::;
1272		1285
1273	use CFClient::OpenGL;	1286	use CFClient::OpenGL;
1274		1287
1275	sub new {	1288	sub new {
1276	my ($class, %arg) = @_;	1289	my ($class, %arg) = @_;
1277		1290
1278	my $self = $class->SUPER::new (	1291	my $self = $class->SUPER::new (
1279	fg => [1, 1, 1],	1292	fg => [1, 1, 1],
		1293	#bg => none
		1294	#active_bg => none
1280	#font => default_font	1295	#font => default_font
1281	#text => initial text	1296	#text => initial text
1282	#markup => initial narkup	1297	#markup => initial narkup
		1298	#max_w => maximum pixel width
		1299	ellipsise => 3, # end
1283	layout => (new CFClient::Layout),	1300	layout => (new CFClient::Layout),
1284	fontsize => 1,	1301	fontsize => 1,
1285	align => -1,	1302	align => -1,
1286	valign => -1,	1303	valign => -1,
1287	padding => 2,	1304	padding => 2,
…		…
1302	}	1319	}
1303		1320
1304	$self	1321	$self
1305	}	1322	}
1306		1323
1307	sub escape {	1324	sub escape($) {
1308	local $_ = $_[1];	1325	local $_ = $_[0];
1309		1326
1310	s/&/&/g;	1327	s/&/&/g;
1311	s/>/>/g;	1328	s/>/>/g;
1312	s/</</g;	1329	s/</</g;
1313		1330
1314	$_[1]	1331	$_
1315	}	1332	}
1316		1333
1317	sub update {	1334	sub update {
1318	my ($self) = @_;	1335	my ($self) = @_;
1319		1336
…		…
1352	sub size_request {	1369	sub size_request {
1353	my ($self) = @_;	1370	my ($self) = @_;
1354		1371
1355	$self->{layout}->set_font ($self->{font}) if $self->{font};	1372	$self->{layout}->set_font ($self->{font}) if $self->{font};
1356	$self->{layout}->set_width ($self->{max_w} \|\| -1);	1373	$self->{layout}->set_width ($self->{max_w} \|\| -1);
		1374	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1375	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1357	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1376	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1358		1377
1359	my ($w, $h) = $self->{layout}->size;	1378	my ($w, $h) = $self->{layout}->size;
1360		1379
1361	if (exists $self->{template}) {	1380	if (exists $self->{template}) {
…		…
1391	}	1410	}
1392		1411
1393	sub _draw {	1412	sub _draw {
1394	my ($self) = @_;	1413	my ($self) = @_;
1395		1414
		1415	$self->SUPER::_draw; # draw background, if applicable
		1416
1396	my $tex = $self->{texture} \|\|= do {	1417	my $tex = $self->{texture} \|\|= do {
1397	$self->{layout}->set_foreground (@{$self->{fg}});	1418	$self->{layout}->set_foreground (@{$self->{fg}});
1398	$self->{layout}->set_font ($self->{font}) if $self->{font};	1419	$self->{layout}->set_font ($self->{font}) if $self->{font};
1399	$self->{layout}->set_width ($self->{w});	1420	$self->{layout}->set_width ($self->{w});
		1421	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1422	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1400	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1423	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401		1424
1402	my $tex = new_from_layout CFClient::Texture $self->{layout};	1425	my $tex = new_from_layout CFClient::Texture $self->{layout};
1403		1426
1404	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}	1427	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1405	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1428	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
…		…
1660	my $class = shift;	1683	my $class = shift;
1661		1684
1662	$class->SUPER::new (	1685	$class->SUPER::new (
1663	padding => 4,	1686	padding => 4,
1664	fg => [1, 1, 1],	1687	fg => [1, 1, 1],
1665	bg => [1, 1, 1, 0.2],
1666	active_fg => [0, 0, 1],	1688	active_fg => [0, 0, 1],
1667	can_hover => 1,	1689	can_hover => 1,
1668	align => 0,	1690	align => 0,
1669	valign => 0,	1691	valign => 0,
1670	can_events => 1,	1692	can_events => 1,
…		…
1718		1740
1719	$class->SUPER::new (	1741	$class->SUPER::new (
1720	padding => 2,	1742	padding => 2,
1721	fg => [1, 1, 1],	1743	fg => [1, 1, 1],
1722	active_fg => [1, 1, 0],	1744	active_fg => [1, 1, 0],
		1745	bg => [0, 0, 0, 0.2],
		1746	active_bg => [1, 1, 1, 0.5],
1723	state => 0,	1747	state => 0,
1724	can_hover => 1,	1748	can_hover => 1,
1725	@_	1749	@_
1726	)	1750	)
1727	}	1751	}
…		…
2019	# TODO: req_w/h are wrong with vertical	2043	# TODO: req_w/h are wrong with vertical
2020	# TODO: calculations are off	2044	# TODO: calculations are off
2021	my $self = $class->SUPER::new (	2045	my $self = $class->SUPER::new (
2022	fg => [1, 1, 1],	2046	fg => [1, 1, 1],
2023	active_fg => [0, 0, 0],	2047	active_fg => [0, 0, 0],
		2048	bg => [0, 0, 0, 0.2],
		2049	active_bg => [1, 1, 1, 0.5],
2024	range => [0, 0, 100, 10],	2050	range => [0, 0, 100, 10],
2025	req_w => $::WIDTH / 80,	2051	req_w => $::WIDTH / 80,
2026	req_h => $::WIDTH / 80,	2052	req_h => $::WIDTH / 80,
2027	vertical => 0,	2053	vertical => 0,
2028	can_hover => 1,	2054	can_hover => 1,
…		…
2124	glScale $self->{w}, $self->{h};	2150	glScale $self->{w}, $self->{h};
2125		2151
2126	if ($self->{vertical}) {	2152	if ($self->{vertical}) {
2127	# draw a vertical slider like a rotated horizontal slider	2153	# draw a vertical slider like a rotated horizontal slider
2128		2154
		2155	glTranslate 1, 0, 0;
2129	glRotate 90, 0, 0, 1;	2156	glRotate 90, 0, 0, 1;
2130	glTranslate 0, 1, 0;
2131	}	2157	}
2132		2158
2133	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2159	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2134	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2160	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2135		2161
…		…
2251		2277
2252	delete $self->{texture};	2278	delete $self->{texture};
2253	}	2279	}
2254		2280
2255	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2281	$self->{texture} \|\|= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2256	glClearColor 0, 0, 0, 0;	2282	glClearColor 0.5, 0.5, 0.5, 0;
2257	glClear GL_COLOR_BUFFER_BIT;	2283	glClear GL_COLOR_BUFFER_BIT;
2258		2284
2259	glEnable GL_TEXTURE_2D;	2285	glEnable GL_TEXTURE_2D;
2260	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2286	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2261		2287
…		…
2293	my ($self) = @_;	2319	my ($self) = @_;
2294		2320
2295	glEnable GL_TEXTURE_2D;	2321	glEnable GL_TEXTURE_2D;
2296	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2322	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2297	glColor 1, 1, 1, 1;	2323	glColor 1, 1, 1, 1;
2298	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2324	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2299	glDisable GL_TEXTURE_2D;	2325	glDisable GL_TEXTURE_2D;
2300		2326
2301	$self->{children}[1]->draw;	2327	$self->{children}[1]->draw;
2302		2328
2303	}	2329	}
…		…
2402		2428
2403	sub set_tooltip_from {	2429	sub set_tooltip_from {
2404	my ($self, $widget) = @_;	2430	my ($self, $widget) = @_;
2405		2431
2406	$self->add (new CFClient::UI::Label	2432	$self->add (new CFClient::UI::Label
2407	markup => $widget->{tooltip},	2433	markup => $widget->{tooltip},
2408	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,	2434	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,
2409	fontsize => 0.8,	2435	fontsize => 0.8,
2410	fg => [0, 0, 0, 1],	2436	fg => [0, 0, 0, 1],
		2437	ellipsise => 0,
2411	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),	2438	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),
2412	);	2439	);
2413	}	2440	}
2414		2441
2415	sub size_request {	2442	sub size_request {
2416	my ($self) = @_;	2443	my ($self) = @_;
…		…
2494		2521
2495	package CFClient::UI::InventoryItem;	2522	package CFClient::UI::InventoryItem;
2496		2523
2497	our @ISA = CFClient::UI::HBox::;	2524	our @ISA = CFClient::UI::HBox::;
2498		2525
2499	sub new {	2526	sub _item_to_desc {
2500	my $class = shift;	2527	my ($item) = @_;
2501		2528
2502	my %args = @_;	2529	my $desc =
2503
2504	my $item = delete $args{item};
2505
2506	my $desc = $item->{nrof} < 2	2530	$item->{nrof} < 2
2507	? $item->{name}	2531	? $item->{name}
2508	: "$item->{nrof} $item->{name_pl}";	2532	: "$item->{nrof} $item->{name_pl}";
2509		2533
2510	$item->{flags} & Crossfire::Protocol::F_OPEN	2534	$item->{flags} & Crossfire::Protocol::F_OPEN
2511	and $desc .= " (open)";	2535	and $desc .= " (open)";
2512	$item->{flags} & Crossfire::Protocol::F_APPLIED	2536	$item->{flags} & Crossfire::Protocol::F_APPLIED
2513	and $desc .= " (applied)";	2537	and $desc .= " (applied)";
…		…
2520	$item->{flags} & Crossfire::Protocol::F_DAMNED	2544	$item->{flags} & Crossfire::Protocol::F_DAMNED
2521	and $desc .= " (damned)";	2545	and $desc .= " (damned)";
2522	$item->{flags} & Crossfire::Protocol::F_LOCKED	2546	$item->{flags} & Crossfire::Protocol::F_LOCKED
2523	and $desc .= " *";	2547	and $desc .= " *";
2524		2548
		2549	$desc
		2550	}
		2551
		2552	sub new {
		2553	my $class = shift;
		2554
		2555	my %args = @_;
		2556
		2557	my $item = delete $args{item};
		2558
		2559	my $desc = _item_to_desc ($item);
		2560
2525	my $self = $class->SUPER::new (	2561	my $self = $class->SUPER::new (
2526	can_hover => 1,	2562	can_hover => 1,
2527	can_events => 1,	2563	can_events => 1,
2528	tooltip => (CFClient::UI::Label->escape ($desc)	2564	tooltip => ((CFClient::UI::Label::escape $desc)
2529	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),	2565	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2530	connect_button_down => sub {	2566	connect_button_down => sub {
2531	my ($self, $ev, $x, $y) = @_;	2567	my ($self, $ev, $x, $y) = @_;
2532		2568
2533	# todo: maybe put examine on 1? but should just be a tooltip :(	2569	# todo: maybe put examine on 1? but should just be a tooltip :(
2534	if ($ev->{button} == 1) {	2570	if ($ev->{button} == 1) {
		2571	my $targ = $::CONN->{player}{tag};
		2572
		2573	if ($item->{container} == $::CONN->{player}{tag}) {
		2574	$targ = $main::OPENCONT;
		2575	}
		2576
2535	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");	2577	$::CONN->send ("move $targ $item->{tag} 0");
2536	} elsif ($ev->{button} == 2) {	2578	} elsif ($ev->{button} == 2) {
2537	$::CONN->send ("apply $item->{tag}");	2579	$::CONN->send ("apply $item->{tag}");
2538	} elsif ($ev->{button} == 3) {	2580	} elsif ($ev->{button} == 3) {
2539	my @menu_items = (	2581	my @menu_items = (
2540	["examine", sub { $::CONN->send ("examine $item->{tag}") }],	2582	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2541	["mark", sub { $::CONN->send ("mark $item->{tag}") }],	2583	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2542	["apply", sub { $::CONN->send ("apply $item->{tag}") }],	2584	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2543	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],	2585	["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2544	[	2586	[
2545	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",	2587	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2546	sub { $::CONN->send ("lock ". () ."$item->{tag}") },	2588	sub { $::CONN->send ("lock $item->{tag}") },
2547	],	2589	],
2548	);	2590	);
2549		2591
2550	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	2592	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2551	}	2593	}
2552		2594
2553	1	2595	1
2554	},	2596	},
2555	%args	2597	%args
2556	);	2598	);
		2599
2557		2600
2558	$self->add (new CFClient::UI::Face	2601	$self->add (new CFClient::UI::Face
2559	can_events => 0,	2602	can_events => 0,
2560	face => $item->{face},	2603	face => $item->{face},
2561	anim => $item->{anim},	2604	anim => $item->{anim},
2562	animspeed => $item->{animspeed},	2605	animspeed => $item->{animspeed},
2563	);	2606	);
2564		2607
2565	$self->add (new CFClient::UI::Label	2608	$self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2566	can_events => 0,	2609
2567	text => $desc,	2610	$self->{item} = $item;
2568	);	2611
		2612	$self->update_item;
2569		2613
2570	$self	2614	$self
		2615	}
		2616
		2617	sub update_item {
		2618	my ($self) = @_;
		2619
		2620	my $desc = _item_to_desc ($self->{item});
		2621
		2622	$self->{name_lbl}->set_text ($desc);
2571	}	2623	}
2572		2624
2573	#############################################################################	2625	#############################################################################
2574		2626
2575	package CFClient::UI::Inventory;	2627	package CFClient::UI::Inventory;
…		…
2599	} @$items;	2651	} @$items;
2600		2652
2601	$self->{real_items} = \@items;	2653	$self->{real_items} = \@items;
2602		2654
2603	for my $item (@items) {	2655	for my $item (@items) {
2604	my $desc = $item->{nrof} < 2
2605	? $item->{name}
2606	: "$item->{nrof} $item->{name_pl}";
2607
2608	$item = $item->{widget} \|\|= new CFClient::UI::InventoryItem item => $item;	2656	$item = $item->{widget} \|\|= new CFClient::UI::InventoryItem item => $item;
		2657	$item->update_item ();
2609	}	2658	}
2610		2659
2611	$self->{scrolled}->add (@items);	2660	$self->{scrolled}->add (@items);
2612		2661
2613	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2662	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
…		…
2694		2743
2695	package CFClient::UI::Statusbox;	2744	package CFClient::UI::Statusbox;
2696		2745
2697	our @ISA = CFClient::UI::VBox::;	2746	our @ISA = CFClient::UI::VBox::;
2698		2747
		2748	sub new {
		2749	my $class = shift;
		2750
		2751	$class->SUPER::new (
		2752	fontsize => 0.8,
		2753	@_,
		2754	)
		2755	}
		2756
2699	sub reorder {	2757	sub reorder {
2700	my ($self) = @_;	2758	my ($self) = @_;
2701	my $NOW = time;	2759	my $NOW = time;
2702		2760
2703	while (my ($k, $v) = each %{ $self->{item} }) {	2761	while (my ($k, $v) = each %{ $self->{item} }) {
…		…
2722	: $item->{text};	2780	: $item->{text};
2723		2781
2724	for ($short) {	2782	for ($short) {
2725	s/^\s+//;	2783	s/^\s+//;
2726	s/\s+/ /g;	2784	s/\s+/ /g;
2727	my $len = int 40 / $item->{fontsize};
2728	substr $_, $len, length, "…" if $len < length;
2729	}	2785	}
2730		2786
2731	new CFClient::UI::Label	2787	new CFClient::UI::Label
2732	markup => $short,	2788	markup => $short,
2733	tooltip => $item->{tooltip},	2789	tooltip => $item->{tooltip},
2734	tooltip_font => $::FONT_PROP,	2790	tooltip_font => $::FONT_PROP,
2735	tooltip_width => 0.67,	2791	tooltip_width => 0.67,
2736	fontsize => $item->{fontsize},	2792	fontsize => $item->{fontsize} \|\| $self->{fontsize},
		2793	max_w => $::WIDTH * 0.44,
2737	fg => $item->{fg},	2794	fg => $item->{fg},
2738	can_events => 1,	2795	can_events => 1,
2739	can_hover => 1	2796	can_hover => 1
2740	};	2797	};
2741	}	2798	}
…		…
2768	$self->{item}{$group} = {	2825	$self->{item}{$group} = {
2769	id => ++$self->{id},	2826	id => ++$self->{id},
2770	text => $text,	2827	text => $text,
2771	timeout => $timeout,	2828	timeout => $timeout,
2772	tooltip => $text,	2829	tooltip => $text,
2773	fontsize => 0.8,
2774	fg => [0.8, 0.8, 0.8, 0.8],	2830	fg => [0.8, 0.8, 0.8, 0.8],
2775	pri => 0,	2831	pri => 0,
2776	count => 1,	2832	count => 1,
2777	%arg,	2833	%arg,
2778	};	2834	};
2779	}	2835	}
2780		2836
2781	$self->reorder;	2837	$self->reorder;
		2838	}
		2839
		2840	sub reconfigure {
		2841	my ($self) = @_;
		2842
		2843	delete $_->{label}
		2844	for values %{ $self->{item} \|\| {} };
		2845
		2846	$self->reorder;
		2847	$self->SUPER::reconfigure;
2782	}	2848	}
2783		2849
2784	#############################################################################	2850	#############################################################################
2785		2851
2786	package CFClient::UI::Root;	2852	package CFClient::UI::Root;
…		…
2961	#############################################################################	3027	#############################################################################
2962		3028
2963	package CFClient::UI;	3029	package CFClient::UI;
2964		3030
2965	$ROOT = new CFClient::UI::Root;	3031	$ROOT = new CFClient::UI::Root;
2966	$TOOLTIP = new CFClient::UI::Tooltip;	3032	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2967		3033
2968	1	3034	1
2969		3035

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.208 by root, Mon May 15 22:52:17 2006 UTC vs. Revision 1.216 by root, Fri May 19 16:43:57 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.208 by root, Mon May 15 22:52:17 2006 UTC vs.
Revision 1.216 by root, Fri May 19 16:43:57 2006 UTC