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.288 by root, Mon Jun 5 21:14:40 2006 UTC vs.
Revision 1.289 by root, Mon Jun 5 21:43:56 2006 UTC

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

Diff Legend

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