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.287 by root, Mon Jun 5 05:31:13 2006 UTC vs.
Revision 1.289 by root, Mon Jun 5 21:43:56 2006 UTC

… …
1554 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1555 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1556 1556
1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1558 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1559
1559 delete $self->{req_h}; 1560 delete $self->{size_req};
1560
1561 $self->realloc; 1561 $self->realloc;
1562 $self->update; 1562 $self->update;
1563} 1563}
1564 1564
1565sub set_markup { 1565sub set_markup {
… …
1570 1570
1571 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1572 1572
1573 $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;
1574 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1575
1575 delete $self->{req_h}; 1576 delete $self->{size_req};
1576
1577 $self->realloc; 1577 $self->realloc;
1578 $self->update; 1578 $self->update;
1579} 1579}
1580 1580
1581sub size_request { 1581sub size_request {
1582 my ($self) = @_; 1582 my ($self) = @_;
1583 1583
1584 if (exists $self->{req_h}) { 1584 $self->{size_req} ||= do {
1585 @$self{qw(req_w req_h)}
1586 } else {
1587 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1588 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1589 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
… …
1600 1598
1601 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1602 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1603 } 1601 }
1604 1602
1605 ($w, $h) 1603 [$w, $h]
1606 } 1604 };
1605
1606 @{ $self->{size_req} }
1607} 1607}
1608 1608
1609sub size_allocate { 1609sub size_allocate {
1610 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1611 1611
… …
1620 1620
1621 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1622 delete $self->{texture}; 1622 delete $self->{texture};
1623 1623
1624 $self->realloc; 1624 $self->realloc;
1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1625} 1633}
1626 1634
1627sub _draw { 1635sub _draw {
1628 my ($self) = @_; 1636 my ($self) = @_;
1629 1637
… …
1699 $self->{last_activity} = $::NOW; 1707 $self->{last_activity} = $::NOW;
1700 $self->{text} = $text; 1708 $self->{text} = $text;
1701 1709
1702 $text =~ s/./*/g if $self->{hidden}; 1710 $text =~ s/./*/g if $self->{hidden};
1703 $self->{layout}->set_text ("$text "); 1711 $self->{layout}->set_text ("$text ");
1704 delete $self->{req_h}; 1712 delete $self->{size_req};
1705 1713
1706 $self->_emit (changed => $self->{text}); 1714 $self->_emit (changed => $self->{text});
1707 1715
1708 $self->realloc; 1716 $self->realloc;
1709 $self->update; 1717 $self->update;

Diff Legend

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