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.322 by root, Wed Jul 5 01:53:24 2006 UTC vs.
Revision 1.323 by root, Wed Jul 5 03:01:01 2006 UTC

1536 #font => default_font 1536 #font => default_font
1537 #text => initial text 1537 #text => initial text
1538 #markup => initial narkup 1538 #markup => initial narkup
1539 #max_w => maximum pixel width 1539 #max_w => maximum pixel width
1540 ellipsise => 3, # end 1540 ellipsise => 3, # end
1541 layout => (new CFClient::Layout 2), 1541 layout => (new CFClient::Layout),
1542 fontsize => 1, 1542 fontsize => 1,
1543 align => -1, 1543 align => -1,
1544 valign => -1, 1544 valign => -1,
1545 padding_x => 2, 1545 padding_x => 2,
1546 padding_y => 2, 1546 padding_y => 2,
1547 can_events => 0, 1547 can_events => 0,
1548 %arg 1548 %arg
1549 ); 1549 );
1550 1550
1551 if (exists $self->{template}) { 1551 if (exists $self->{template}) {
1552 my $layout = new CFClient::Layout 2; 1552 my $layout = new CFClient::Layout;
1553 $layout->set_text (delete $self->{template}); 1553 $layout->set_text (delete $self->{template});
1554 $self->{template} = $layout; 1554 $self->{template} = $layout;
1555 } 1555 }
1556 1556
1557 if (exists $self->{markup}) { 1557 if (exists $self->{markup}) {
1627 1627
1628 my ($w, $h) = $self->{layout}->size; 1628 my ($w, $h) = $self->{layout}->size;
1629 1629
1630 if (exists $self->{template}) { 1630 if (exists $self->{template}) {
1631 $self->{template}->set_font ($self->{font}) if $self->{font}; 1631 $self->{template}->set_font ($self->{font}) if $self->{font};
1632 $self->{template}->set_width ($self->{max_w} || -1);
1632 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1633 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1633 1634
1634 my ($w2, $h2) = $self->{template}->size; 1635 my ($w2, $h2) = $self->{template}->size;
1635 1636
1636 $w = List::Util::max $w, $w2; 1637 $w = List::Util::max $w, $w2;
1688 $self->{layout}->set_width ($self->{w}); 1689 $self->{layout}->set_width ($self->{w});
1689 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1690 $self->{layout}->set_ellipsise ($self->{ellipsise});
1690 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1691 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1691 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1692 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1692 1693
1693 $self->{size_req} 1694 [$self->{layout}->size]
1694 }; 1695 };
1695 1696
1696 unless (exists $self->{ox}) { 1697 unless (exists $self->{ox}) {
1697 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1698 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1698 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 1699 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
2561 can_events => 0, 2562 can_events => 0,
2562 indent => 0, 2563 indent => 0,
2563 #font => default_font 2564 #font => default_font
2564 @_, 2565 @_,
2565 2566
2566 layout => (new CFClient::Layout 2), 2567 layout => (new CFClient::Layout),
2567 par => [], 2568 par => [],
2568 height => 0, 2569 height => 0,
2569 children => [ 2570 children => [
2570 (new CFClient::UI::Empty expand => 1), 2571 (new CFClient::UI::Empty expand => 1),
2571 (new CFClient::UI::Slider vertical => 1), 2572 (new CFClient::UI::Slider vertical => 1),

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines