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.319 by root, Sun Jul 2 21:07:26 2006 UTC vs.
Revision 1.331 by root, Sun Jul 23 04:46:02 2006 UTC

… …
79sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
80 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS; 81 if $FOCUS;
82} 82}
83 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->start;
94 }
95}
96
84sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
85 my ($ev) = @_; 98 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
87 100
88 if (!$BUTTON_STATE) { 101 unless ($BUTTON_STATE) {
89 my $widget = $ROOT->find_widget ($x, $y); 102 my $widget = $ROOT->find_widget ($x, $y);
90 103
91 $GRAB = $widget; 104 $GRAB = $widget;
92 $GRAB->update if $GRAB; 105 $GRAB->update if $GRAB;
93 106
94 $TOOLTIP_WATCHER->cb->(); 107 $TOOLTIP_WATCHER->cb->();
95 } 108 }
96 109
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 110 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
98 111
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 112 if ($GRAB) {
100 if $GRAB; 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel
115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9;
117 $GRAB->emit (mouse_wheel => $ev);
118 } else {
119 $GRAB->emit (button_down => $ev)
120 }
121 }
101} 122}
102 123
103sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
104 my ($ev) = @_; 125 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y});
106 126
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
108 128
109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
110 130
111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 131 $GRAB->emit (button_up => $ev)
112 if $GRAB; 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
113 133
114 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 136 $grab->update if $grab;
117 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
118 138
139 check_hover $widget;
119 $TOOLTIP_WATCHER->cb->(); 140 $TOOLTIP_WATCHER->cb->();
120 } 141 }
121} 142}
122 143
123sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
124 my ($ev) = @_; 145 my ($ev) = @_;
125 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
126 147
127 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
128 149
129 if ($widget != $HOVER) { 150 check_hover $widget;
130 my $hover = $HOVER; $HOVER = $widget;
131 151
132 $hover->update if $hover && $hover->{can_hover}; 152 $HOVER->emit (mouse_motion => $ev)
133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134
135 $TOOLTIP_WATCHER->start;
136 }
137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 153 if $HOVER;
140} 154}
141 155
142# convert position array to integers 156# convert position array to integers
143sub harmonize { 157sub harmonize {
… …
189 203
190 } 204 }
191 } 205 }
192 206
193 reconfigure_widgets; 207 reconfigure_widgets;
208}
209
210#############################################################################
211
212package CFClient::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
194} 216}
195 217
196############################################################################# 218#############################################################################
197 219
198package CFClient::UI::Base; 220package CFClient::UI::Base;
… …
407 429
408# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
409sub coord2local { 431sub coord2local {
410 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
411 433
434 Carp::confess unless $self->{parent};#d#
435
412 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
413} 437}
414 438
415# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
416sub coord2global { 440sub coord2global {
… …
452 476
453 $FOCUS->emit ("focus_out") if $FOCUS; 477 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 478 $self->emit ("focus_in");
455} 479}
456 480
457sub invoke_mouse_motion { 1 } 481sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 482sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 483sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 484sub invoke_key_up { 0 }
485sub invoke_mouse_wheel { 0 }
461 486
462sub invoke_button_down { 487sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 488 my ($self, $ev, $x, $y) = @_;
464 489
465 $self->grab_focus; 490 $self->grab_focus;
466 491
467 1 492 0
468} 493}
469 494
470sub connect { 495sub connect {
471 my ($self, $signal, $cb) = @_; 496 my ($self, $signal, $cb) = @_;
472 497
473 push @{ $self->{signal_cb}{$signal} }, $cb; 498 push @{ $self->{signal_cb}{$signal} }, $cb;
474} 499}
475 500
501my %has_coords = (
502 button_down => 1,
503 button_up => 1,
504 mouse_motion => 1,
505 mouse_wheel => 1,
506);
507
476sub emit { 508sub emit {
477 my ($self, $signal, @args) = @_; 509 my ($self, $signal, @args) = @_;
478 510
511 my @append
512 = $has_coords{$signal}
513 ? $args[0]->xy ($self)
514 : ();
515
516 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
517
479 #d##TODO# stop propagating at first true, do not use sum 518 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 519 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 520 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 521 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483} 522}
484 523
485sub find_widget { 524sub find_widget {
486 my ($self, $x, $y) = @_; 525 my ($self, $x, $y) = @_;
487 526
… …
587} 626}
588 627
589sub DESTROY { 628sub DESTROY {
590 my ($self) = @_; 629 my ($self) = @_;
591 630
631 return if CFClient::in_destruct;
632
592 delete $WIDGET{$self+0}; 633 delete $WIDGET{$self+0};
593 634
594 eval { $self->destroy }; 635 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 636 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596} 637}
… …
975 $self->{vp}->set_offset (0, $_[1]); 1016 $self->{vp}->set_offset (0, $_[1]);
976 }, 1017 },
977 ; 1018 ;
978 1019
979 $self = $class->SUPER::new ( 1020 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1021 vp => (new CFClient::UI::ViewPort expand => 1),
1022 can_events => 1,
981 slider => $slider, 1023 slider => $slider,
982 %arg, 1024 %arg,
983 ); 1025 );
984 1026
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1027 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child; 1028 $self->add ($child) if $child;
… …
992 1034
993sub add { 1035sub add {
994 my ($self, $widget) = @_; 1036 my ($self, $widget) = @_;
995 1037
996 $self->{vp}->add ($self->{child} = $widget); 1038 $self->{vp}->add ($self->{child} = $widget);
1039}
1040
1041sub invoke_mouse_wheel {
1042 my ($self, $ev) = @_;
1043
1044 return 0 unless $ev->{dy}; # only vertical movements
1045
1046 $self->{slider}->emit (mouse_wheel => $ev);
1047
1048 1
997} 1049}
998 1050
999sub update_slider { 1051sub update_slider {
1000 my ($self) = @_; 1052 my ($self) = @_;
1001 1053
… …
1080 my $self = $class->SUPER::new ( 1132 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1133 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1134 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1135 border => 0.6,
1084 can_events => 1, 1136 can_events => 1,
1085 min_w => 16, 1137 min_w => 64,
1086 min_h => 16, 1138 min_h => 32,
1087 %arg, 1139 %arg,
1088 ); 1140 );
1089 1141
1090 $self->{title_widget} = new CFClient::UI::Label 1142 $self->{title_widget} = new CFClient::UI::Label
1091 align => 0, 1143 align => 0,
… …
1591 my ($self, $text) = @_; 1643 my ($self, $text) = @_;
1592 1644
1593 return if $self->{text} eq "T$text"; 1645 return if $self->{text} eq "T$text";
1594 $self->{text} = "T$text"; 1646 $self->{text} = "T$text";
1595 1647
1596 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1597 $self->{layout}->set_text ($text); 1648 $self->{layout}->set_text ($text);
1598 1649
1599 delete $self->{size_req}; 1650 delete $self->{size_req};
1600 $self->realloc; 1651 $self->realloc;
1601 $self->update; 1652 $self->update;
… …
1607 return if $self->{text} eq "M$markup"; 1658 return if $self->{text} eq "M$markup";
1608 $self->{text} = "M$markup"; 1659 $self->{text} = "M$markup";
1609 1660
1610 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1661 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1611 1662
1612 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1613 $self->{layout}->set_markup ($markup); 1663 $self->{layout}->set_markup ($markup);
1614 1664
1615 delete $self->{size_req}; 1665 delete $self->{size_req};
1616 $self->realloc; 1666 $self->realloc;
1617 $self->update; 1667 $self->update;
… …
1629 1679
1630 my ($w, $h) = $self->{layout}->size; 1680 my ($w, $h) = $self->{layout}->size;
1631 1681
1632 if (exists $self->{template}) { 1682 if (exists $self->{template}) {
1633 $self->{template}->set_font ($self->{font}) if $self->{font}; 1683 $self->{template}->set_font ($self->{font}) if $self->{font};
1684 $self->{template}->set_width ($self->{max_w} || -1);
1634 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1685 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1635 1686
1636 my ($w2, $h2) = $self->{template}->size; 1687 my ($w2, $h2) = $self->{template}->size;
1637 1688
1638 $w = List::Util::max $w, $w2; 1689 $w = List::Util::max $w, $w2;
… …
1672 1723
1673sub reconfigure { 1724sub reconfigure {
1674 my ($self) = @_; 1725 my ($self) = @_;
1675 1726
1676 delete $self->{size_req}; 1727 delete $self->{size_req};
1728 delete $self->{texture};
1677 1729
1678 $self->SUPER::reconfigure; 1730 $self->SUPER::reconfigure;
1679} 1731}
1680 1732
1681sub _draw { 1733sub _draw {
1682 my ($self) = @_; 1734 my ($self) = @_;
1683 1735
1684 $self->SUPER::_draw; # draw background, if applicable 1736 $self->SUPER::_draw; # draw background, if applicable
1685 1737
1686 my $tex = $self->{texture} ||= do { 1738 my $size = $self->{texture} ||= do {
1687 $self->{layout}->set_foreground (@{$self->{fg}}); 1739 $self->{layout}->set_foreground (@{$self->{fg}});
1688 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1740 $self->{layout}->set_font ($self->{font}) if $self->{font};
1689 $self->{layout}->set_width ($self->{w}); 1741 $self->{layout}->set_width ($self->{w});
1690 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1742 $self->{layout}->set_ellipsise ($self->{ellipsise});
1691 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1743 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1692 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1744 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1693 1745
1694 new_from_layout CFClient::Texture $self->{layout} 1746 [$self->{layout}->size]
1695 }; 1747 };
1696 1748
1697 unless (exists $self->{ox}) { 1749 unless (exists $self->{ox}) {
1698 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1750 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1699 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1751 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1700 : ($self->{w} - $tex->{w}) * 0.5); 1752 : ($self->{w} - $size->[0]) * 0.5);
1701 1753
1702 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1754 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1703 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1755 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1704 : ($self->{h} - $tex->{h}) * 0.5); 1756 : ($self->{h} - $size->[1]) * 0.5);
1705 }; 1757 };
1706 1758
1707 glEnable GL_TEXTURE_2D;
1708
1709 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1759 my $w = List::Util::min $self->{w} + 4, $size->[0];
1710 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1760 my $h = List::Util::min $self->{h} + 2, $size->[1];
1711 1761
1712 if ($tex->{format} == GL_ALPHA) { 1762 $self->{layout}->render ($self->{ox}, $self->{oy});
1713 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1714 glColor @{$self->{fg}};
1715 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1716 } else {
1717 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1718 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1719 }
1720
1721 glDisable GL_TEXTURE_2D;
1722} 1763}
1723 1764
1724############################################################################# 1765#############################################################################
1725 1766
1726package CFClient::UI::EntryBase; 1767package CFClient::UI::EntryBase;
… …
1837 1878
1838 my $idx = $self->{layout}->xy_to_index ($x, $y); 1879 my $idx = $self->{layout}->xy_to_index ($x, $y);
1839 1880
1840 # byte-index to char-index 1881 # byte-index to char-index
1841 my $text = $self->{text}; 1882 my $text = $self->{text};
1842 utf8::encode $text; 1883 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1843 $self->{cursor} = length substr $text, 0, $idx; 1884 $self->{cursor} = length $text;
1844 1885
1845 $self->_set_text ($self->{text}); 1886 $self->_set_text ($self->{text});
1846 $self->update; 1887 $self->update;
1847 1888
1848 1 1889 1
… …
2127 my $self = $class->SUPER::new ( 2168 my $self = $class->SUPER::new (
2128 can_events => 0, 2169 can_events => 0,
2129 @_, 2170 @_,
2130 ); 2171 );
2131 2172
2132 $self->{path} 2173 $self->{path} || $self->{tex}
2133 or Carp::croak "required attribute 'path' not set"; 2174 or Carp::croak "'path' or 'tex' attributes required";
2134 2175
2135 $self->{tex} = $texture_cache{$self->{path}} ||= 2176 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2136 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2177 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2137 2178
2138 Scalar::Util::weaken $texture_cache{$self->{path}}; 2179 Scalar::Util::weaken $texture_cache{$self->{path}};
2139 2180
2140 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2181 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
… …
2460 } 2501 }
2461 2502
2462 1 2503 1
2463} 2504}
2464 2505
2506sub invoke_mouse_wheel {
2507 my ($self, $ev) = @_;
2508
2509 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2510
2511 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);
2512
2513 ! ! $delta
2514}
2515
2465sub update { 2516sub update {
2466 my ($self) = @_; 2517 my ($self) = @_;
2467 2518
2468 delete $self->{knob_w}; 2519 delete $self->{knob_w};
2469 $self->SUPER::update; 2520 $self->SUPER::update;
… …
2568sub new { 2619sub new {
2569 my $class = shift; 2620 my $class = shift;
2570 2621
2571 my $self = $class->SUPER::new ( 2622 my $self = $class->SUPER::new (
2572 fontsize => 1, 2623 fontsize => 1,
2573 can_events => 0, 2624 can_events => 1,
2574 indent => 0, 2625 indent => 0,
2575 #font => default_font 2626 #font => default_font
2576 @_, 2627 @_,
2577 2628
2578 layout => (new CFClient::Layout 1), 2629 layout => (new CFClient::Layout),
2579 par => [], 2630 par => [],
2580 height => 0, 2631 height => 0,
2581 children => [ 2632 children => [
2582 (new CFClient::UI::Empty expand => 1), 2633 (new CFClient::UI::Empty expand => 1),
2583 (new CFClient::UI::Slider vertical => 1), 2634 (new CFClient::UI::Slider vertical => 1),
… …
2618 2669
2619 $self->reflow; 2670 $self->reflow;
2620 2671
2621 local $self->{children} = [$empty, $slider]; 2672 local $self->{children} = [$empty, $slider];
2622 $self->SUPER::invoke_size_allocate ($w, $h) 2673 $self->SUPER::invoke_size_allocate ($w, $h)
2674}
2675
2676sub invoke_mouse_wheel {
2677 my ($self, $ev) = @_;
2678
2679 return 0 unless $ev->{dy}; # only vertical movements
2680
2681 $self->{children}[1]->emit (mouse_wheel => $ev);
2682
2683 1
2623} 2684}
2624 2685
2625sub get_layout { 2686sub get_layout {
2626 my ($self, $para) = @_; 2687 my ($self, $para) = @_;
2627 2688
… …
2744 my $y0 = $top; 2805 my $y0 = $top;
2745 my $y1 = $top + $H; 2806 my $y1 = $top + $H;
2746 2807
2747 my $y = 0; 2808 my $y = 0;
2748 2809
2749 glEnable GL_BLEND;
2750 #TODO# not correct in windows where rgba is forced off
2751 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2752
2753 for my $para (@{$self->{par}}) { 2810 for my $para (@{$self->{par}}) {
2754 my $h = $para->{h}; 2811 my $h = $para->{h};
2755 2812
2756 if ($y0 < $y + $h && $y < $y1) { 2813 if ($y0 < $y + $h && $y < $y1) {
2757 2814
2758 my $layout = $self->get_layout ($para); 2815 my $layout = $self->get_layout ($para);
2759 2816
2760 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2761
2762 glRasterPos $para->{indent}, $y - $y0; 2817 $layout->render ($para->{indent}, $y - $y0);
2763 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2764 2818
2765 if (my @w = @{ $para->{widget} }) { 2819 if (my @w = @{ $para->{widget} }) {
2766 my @s = $layout->get_shapes; 2820 my @s = $layout->get_shapes;
2767 2821
2768 glDisable GL_BLEND;
2769 for (@w) { 2822 for (@w) {
2770 my ($dx, $dy) = splice @s, 0, 2, (); 2823 my ($dx, $dy) = splice @s, 0, 2, ();
2771 2824
2772 $_->{x} = $dx + $para->{indent}; 2825 $_->{x} = $dx + $para->{indent};
2773 $_->{y} = $dy + $y - $y0; 2826 $_->{y} = $dy + $y - $y0;
2774 2827
2775 $_->draw; 2828 $_->draw;
2776 } 2829 }
2777 glEnable GL_BLEND;
2778 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2779 } 2830 }
2780 } 2831 }
2781 2832
2782 $y += $h; 2833 $y += $h;
2783 } 2834 }
2784
2785 glDisable GL_BLEND;
2786 }; 2835 };
2787 }); 2836 });
2788} 2837}
2789 2838
2790sub reconfigure { 2839sub reconfigure {
… …
3086 for my $item (@{ $self->{items} }) { 3135 for my $item (@{ $self->{items} }) {
3087 my ($widget, $cb, $tooltip) = @$item; 3136 my ($widget, $cb, $tooltip) = @$item;
3088 3137
3089 # handle various types of items, only text for now 3138 # handle various types of items, only text for now
3090 if (!ref $widget) { 3139 if (!ref $widget) {
3140 if ($widget =~ /\t/) {
3141 my ($left, $right) = split /\t/, $widget, 2;
3142
3143 $widget = new CFClient::UI::HBox
3144 can_hover => 1,
3145 can_events => 1,
3146 tooltip => $tooltip,
3147 children => [
3148 (new CFClient::UI::Label markup => $left, expand => 1),
3149 (new CFClient::UI::Label markup => $right, align => +1),
3150 ],
3151 ;
3152
3153 } else {
3091 $widget = new CFClient::UI::Label 3154 $widget = new CFClient::UI::Label
3092 can_hover => 1, 3155 can_hover => 1,
3093 can_events => 1, 3156 can_events => 1,
3094 markup => $widget, 3157 markup => $widget,
3095 tooltip => $tooltip 3158 tooltip => $tooltip;
3159 }
3096 } 3160 }
3097 3161
3098 $self->{item}{$widget} = $item; 3162 $self->{item}{$widget} = $item;
3099 3163
3100 $self->{vbox}->add ($widget); 3164 $self->{vbox}->add ($widget);
… …
3822 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3886 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3823 3887
3824 $w = 0 if $w < 0; 3888 $w = 0 if $w < 0;
3825 $h = 0 if $h < 0; 3889 $h = 0 if $h < 0;
3826 3890
3891 $w = max $widget->{min_w}, $w;
3892 $h = max $widget->{min_h}, $h;
3893
3894 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3895 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3896
3827 $w = int $w + 0.5; 3897 $w = int $w + 0.5;
3828 $h = int $h + 0.5; 3898 $h = int $h + 0.5;
3829 3899
3830 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3900 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3831 $widget->{old_w} = $widget->{w}; 3901 $widget->{old_w} = $widget->{w};

Diff Legend

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