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.291 by root, Tue Jun 6 02:55:50 2006 UTC vs.
Revision 1.293 by root, Tue Jun 6 03:05:16 2006 UTC

2474 my $class = shift; 2474 my $class = shift;
2475 2475
2476 my $self = $class->SUPER::new ( 2476 my $self = $class->SUPER::new (
2477 fontsize => 1, 2477 fontsize => 1,
2478 can_events => 0, 2478 can_events => 0,
2479 indent => 0,
2479 #font => default_font 2480 #font => default_font
2480 @_, 2481 @_,
2481 2482
2482 layout => (new CFClient::Layout 1), 2483 layout => (new CFClient::Layout 1),
2483 par => [], 2484 par => [],
2506 $self->SUPER::size_allocate ($w, $h); 2507 $self->SUPER::size_allocate ($w, $h);
2507 2508
2508 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2509 $self->{layout}->set_font ($self->{font}) if $self->{font};
2509 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2510 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2510 $self->{layout}->set_width ($self->{children}[0]{w}); 2511 $self->{layout}->set_width ($self->{children}[0]{w});
2512 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2511 2513
2512 $self->reflow; 2514 $self->reflow;
2513} 2515}
2514 2516
2515sub text_size { 2517sub text_size {
2517 2519
2518 my $layout = $self->{layout}; 2520 my $layout = $self->{layout};
2519 2521
2520 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2522 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2521 $layout->set_width ($self->{children}[0]{w} - $indent); 2523 $layout->set_width ($self->{children}[0]{w} - $indent);
2524 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2522 $layout->set_markup ($text); 2525 $layout->set_markup ($text);
2523 2526
2524 $layout->size 2527 $layout->size
2525} 2528}
2526 2529
2578 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2581 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2579 2582
2580 for (@{$self->{par}}) { 2583 for (@{$self->{par}}) {
2581 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2584 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2582 $layout->set_width ($W - $_->[3]); 2585 $layout->set_width ($W - $_->[3]);
2586 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2583 $layout->set_markup ($_->[4]); 2587 $layout->set_markup ($_->[4]);
2584 my ($w, $h) = $layout->size; 2588 my ($w, $h) = $layout->size;
2585 $_->[0] = $w + $_->[3]; 2589 $_->[0] = $w + $_->[3];
2586 $_->[1] = $h; 2590 $_->[1] = $h;
2587 } 2591 }
2619 my $h = $par->[1]; 2623 my $h = $par->[1];
2620 2624
2621 if ($y0 < $y + $h && $y < $y1) { 2625 if ($y0 < $y + $h && $y < $y1) {
2622 $layout->set_foreground (@{ $par->[2] }); 2626 $layout->set_foreground (@{ $par->[2] });
2623 $layout->set_width ($W - $par->[3]); 2627 $layout->set_width ($W - $par->[3]);
2628 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2624 $layout->set_markup ($par->[4]); 2629 $layout->set_markup ($par->[4]);
2625 2630
2626 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2631 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2627 2632
2628 glRasterPos $par->[3], $y - $y0; 2633 glRasterPos $par->[3], $y - $y0;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines