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.314 by root, Mon Jun 26 21:59:04 2006 UTC vs.
Revision 1.327 by root, Mon Jul 17 01:41:53 2006 UTC

… …
423 my ($self) = @_; 423 my ($self) = @_;
424 424
425 return if $FOCUS == $self; 425 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
427 427
428 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
429 429
430 $focus->update if $focus; 430 $self->update;
431 $FOCUS->update;
432 431
433 0 432 0
434} 433}
435 434
436sub invoke_focus_out { 435sub invoke_focus_out {
437 my ($self) = @_; 436 my ($self) = @_;
438 437
439 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
440 439
441 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
442 441
443 $focus->update if $focus; #? 442 $self->update;
444 443
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 445 unless $FOCUS;
447 446
448 0 447 0
449} 448}
450 449
451sub grab_focus { 450sub grab_focus {
452 my ($self) = @_; 451 my ($self) = @_;
453 452
453 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 454 $self->emit ("focus_in");
455} 455}
456 456
457sub invoke_mouse_motion { 1 } 457sub invoke_mouse_motion { 1 }
458sub invoke_button_up { 1 } 458sub invoke_button_up { 1 }
… …
587} 587}
588 588
589sub DESTROY { 589sub DESTROY {
590 my ($self) = @_; 590 my ($self) = @_;
591 591
592 return if CFClient::in_destruct;
593
592 delete $WIDGET{$self+0}; 594 delete $WIDGET{$self+0};
593 595
594 eval { $self->destroy }; 596 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 597 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596} 598}
… …
1080 my $self = $class->SUPER::new ( 1082 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1083 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1084 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1085 border => 0.6,
1084 can_events => 1, 1086 can_events => 1,
1085 min_w => 16, 1087 min_w => 64,
1086 min_h => 16, 1088 min_h => 32,
1087 %arg, 1089 %arg,
1088 ); 1090 );
1089 1091
1090 $self->{title_widget} = new CFClient::UI::Label 1092 $self->{title_widget} = new CFClient::UI::Label
1091 align => 0, 1093 align => 0,
… …
1096 1098
1097 if ($self->{has_close_button}) { 1099 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1100 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1101 new CFClient::UI::ImageButton
1100 path => 'x1_close.png', 1102 path => 'x1_close.png',
1101 on_activate => sub { $self->hide }; 1103 on_activate => sub { $self->emit ("delete") };
1102 1104
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1105 $self->CFClient::UI::Container::add ($self->{close_button});
1104 } 1106 }
1105 1107
1106 $self 1108 $self
… …
1152 $self->child->configure ($border, $border, $w, $h); 1154 $self->child->configure ($border, $border, $w, $h);
1153 1155
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1156 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button}; 1157 if $self->{close_button};
1156 1158
1159 1
1160}
1161
1162sub invoke_delete {
1163 my ($self) = @_;
1164
1165 $self->hide;
1166
1157 1 1167 1
1158} 1168}
1159 1169
1160sub invoke_button_down { 1170sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1171 my ($self, $ev, $x, $y) = @_;
… …
1583 my ($self, $text) = @_; 1593 my ($self, $text) = @_;
1584 1594
1585 return if $self->{text} eq "T$text"; 1595 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 1596 $self->{text} = "T$text";
1587 1597
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 1598 $self->{layout}->set_text ($text);
1590 1599
1591 delete $self->{size_req}; 1600 delete $self->{size_req};
1592 $self->realloc; 1601 $self->realloc;
1593 $self->update; 1602 $self->update;
… …
1599 return if $self->{text} eq "M$markup"; 1608 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 1609 $self->{text} = "M$markup";
1601 1610
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1611 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 1612
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 1613 $self->{layout}->set_markup ($markup);
1606 1614
1607 delete $self->{size_req}; 1615 delete $self->{size_req};
1608 $self->realloc; 1616 $self->realloc;
1609 $self->update; 1617 $self->update;
… …
1621 1629
1622 my ($w, $h) = $self->{layout}->size; 1630 my ($w, $h) = $self->{layout}->size;
1623 1631
1624 if (exists $self->{template}) { 1632 if (exists $self->{template}) {
1625 $self->{template}->set_font ($self->{font}) if $self->{font}; 1633 $self->{template}->set_font ($self->{font}) if $self->{font};
1634 $self->{template}->set_width ($self->{max_w} || -1);
1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1635 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 1636
1628 my ($w2, $h2) = $self->{template}->size; 1637 my ($w2, $h2) = $self->{template}->size;
1629 1638
1630 $w = List::Util::max $w, $w2; 1639 $w = List::Util::max $w, $w2;
… …
1654 1663
1655sub set_fontsize { 1664sub set_fontsize {
1656 my ($self, $fontsize) = @_; 1665 my ($self, $fontsize) = @_;
1657 1666
1658 $self->{fontsize} = $fontsize; 1667 $self->{fontsize} = $fontsize;
1668 delete $self->{size_req};
1659 delete $self->{texture}; 1669 delete $self->{texture};
1660 1670
1661 $self->realloc; 1671 $self->realloc;
1662} 1672}
1663 1673
1664sub reconfigure { 1674sub reconfigure {
1665 my ($self) = @_; 1675 my ($self) = @_;
1666 1676
1667 delete $self->{size_req}; 1677 delete $self->{size_req};
1678 delete $self->{texture};
1668 1679
1669 $self->SUPER::reconfigure; 1680 $self->SUPER::reconfigure;
1670} 1681}
1671 1682
1672sub _draw { 1683sub _draw {
1673 my ($self) = @_; 1684 my ($self) = @_;
1674 1685
1675 $self->SUPER::_draw; # draw background, if applicable 1686 $self->SUPER::_draw; # draw background, if applicable
1676 1687
1677 my $tex = $self->{texture} ||= do { 1688 my $size = $self->{texture} ||= do {
1678 $self->{layout}->set_foreground (@{$self->{fg}}); 1689 $self->{layout}->set_foreground (@{$self->{fg}});
1679 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1690 $self->{layout}->set_font ($self->{font}) if $self->{font};
1680 $self->{layout}->set_width ($self->{w}); 1691 $self->{layout}->set_width ($self->{w});
1681 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1692 $self->{layout}->set_ellipsise ($self->{ellipsise});
1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1693 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1694 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1684 1695
1685 new_from_layout CFClient::Texture $self->{layout} 1696 [$self->{layout}->size]
1686 }; 1697 };
1687 1698
1688 unless (exists $self->{ox}) { 1699 unless (exists $self->{ox}) {
1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1700 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1701 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1691 : ($self->{w} - $tex->{w}) * 0.5); 1702 : ($self->{w} - $size->[0]) * 0.5);
1692 1703
1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1704 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1705 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1695 : ($self->{h} - $tex->{h}) * 0.5); 1706 : ($self->{h} - $size->[1]) * 0.5);
1696 }; 1707 };
1697 1708
1698 glEnable GL_TEXTURE_2D;
1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1709 my $w = List::Util::min $self->{w} + 4, $size->[0];
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1710 my $h = List::Util::min $self->{h} + 2, $size->[1];
1702 1711
1703 if ($tex->{format} == GL_ALPHA) { 1712 $self->{layout}->render ($self->{ox}, $self->{oy});
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1705 glColor @{$self->{fg}};
1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1710 }
1711
1712 glDisable GL_TEXTURE_2D;
1713} 1713}
1714 1714
1715############################################################################# 1715#############################################################################
1716 1716
1717package CFClient::UI::EntryBase; 1717package CFClient::UI::EntryBase;
… …
1828 1828
1829 my $idx = $self->{layout}->xy_to_index ($x, $y); 1829 my $idx = $self->{layout}->xy_to_index ($x, $y);
1830 1830
1831 # byte-index to char-index 1831 # byte-index to char-index
1832 my $text = $self->{text}; 1832 my $text = $self->{text};
1833 utf8::encode $text; 1833 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1834 $self->{cursor} = length substr $text, 0, $idx; 1834 $self->{cursor} = length $text;
1835 1835
1836 $self->_set_text ($self->{text}); 1836 $self->_set_text ($self->{text});
1837 $self->update; 1837 $self->update;
1838 1838
1839 1 1839 1
… …
2059 my ($self) = @_; 2059 my ($self) = @_;
2060 2060
2061 (6) x 2 2061 (6) x 2
2062} 2062}
2063 2063
2064sub toggle {
2065 my ($self) = @_;
2066
2067 $self->{state} = !$self->{state};
2068 $self->emit (changed => $self->{state});
2069 $self->update;
2070}
2071
2064sub invoke_button_down { 2072sub invoke_button_down {
2065 my ($self, $ev, $x, $y) = @_; 2073 my ($self, $ev, $x, $y) = @_;
2066 2074
2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2075 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2076 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2069 $self->{state} = !$self->{state}; 2077 $self->toggle;
2070 $self->emit (changed => $self->{state});
2071 } else { 2078 } else {
2072 return 0 2079 return 0
2073 } 2080 }
2074 2081
2075 1 2082 1
… …
2111 my $self = $class->SUPER::new ( 2118 my $self = $class->SUPER::new (
2112 can_events => 0, 2119 can_events => 0,
2113 @_, 2120 @_,
2114 ); 2121 );
2115 2122
2116 $self->{path} 2123 $self->{path} || $self->{tex}
2117 or Carp::croak "required attribute 'path' not set"; 2124 or Carp::croak "'path' or 'tex' attributes required";
2118 2125
2119 $self->{tex} = $texture_cache{$self->{path}} ||= 2126 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2120 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2127 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2121 2128
2122 Scalar::Util::weaken $texture_cache{$self->{path}}; 2129 Scalar::Util::weaken $texture_cache{$self->{path}};
2123 2130
2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2131 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
… …
2246 my $ycut1 = max 0, min 1, $ycut; 2253 my $ycut1 = max 0, min 1, $ycut;
2247 my $ycut2 = max 0, min 1, $ycut - 1; 2254 my $ycut2 = max 0, min 1, $ycut - 1;
2248 2255
2249 my $h1 = $self->{h} * (1 - $ycut1); 2256 my $h1 = $self->{h} * (1 - $ycut1);
2250 my $h2 = $self->{h} * (1 - $ycut2); 2257 my $h2 = $self->{h} * (1 - $ycut2);
2258 my $h3 = $self->{h};
2259
2260 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2251 2261
2252 glEnable GL_BLEND; 2262 glEnable GL_BLEND;
2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2263 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2264 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2255 glEnable GL_TEXTURE_2D; 2265 glEnable GL_TEXTURE_2D;
… …
2274 2284
2275 if ($t3) { 2285 if ($t3) {
2276 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2286 glBindTexture GL_TEXTURE_2D, $t3->{name};
2277 glBegin GL_QUADS; 2287 glBegin GL_QUADS;
2278 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2288 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2279 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2289 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2280 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2290 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2281 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2291 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2282 glEnd; 2292 glEnd;
2283 } 2293 }
2284 2294
2285 glDisable GL_BLEND; 2295 glDisable GL_BLEND;
… …
2554 can_events => 0, 2564 can_events => 0,
2555 indent => 0, 2565 indent => 0,
2556 #font => default_font 2566 #font => default_font
2557 @_, 2567 @_,
2558 2568
2559 layout => (new CFClient::Layout 1), 2569 layout => (new CFClient::Layout),
2560 par => [], 2570 par => [],
2561 height => 0, 2571 height => 0,
2562 children => [ 2572 children => [
2563 (new CFClient::UI::Empty expand => 1), 2573 (new CFClient::UI::Empty expand => 1),
2564 (new CFClient::UI::Slider vertical => 1), 2574 (new CFClient::UI::Slider vertical => 1),
… …
2725 my $y0 = $top; 2735 my $y0 = $top;
2726 my $y1 = $top + $H; 2736 my $y1 = $top + $H;
2727 2737
2728 my $y = 0; 2738 my $y = 0;
2729 2739
2730 glEnable GL_BLEND;
2731 #TODO# not correct in windows where rgba is forced off
2732 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2733
2734 for my $para (@{$self->{par}}) { 2740 for my $para (@{$self->{par}}) {
2735 my $h = $para->{h}; 2741 my $h = $para->{h};
2736 2742
2737 if ($y0 < $y + $h && $y < $y1) { 2743 if ($y0 < $y + $h && $y < $y1) {
2738 2744
2739 my $layout = $self->get_layout ($para); 2745 my $layout = $self->get_layout ($para);
2740 2746
2741 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2742
2743 glRasterPos $para->{indent}, $y - $y0; 2747 $layout->render ($para->{indent}, $y - $y0);
2744 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2745 2748
2746 if (my @w = @{ $para->{widget} }) { 2749 if (my @w = @{ $para->{widget} }) {
2747 my @s = $layout->get_shapes; 2750 my @s = $layout->get_shapes;
2748 2751
2749 glDisable GL_BLEND;
2750 for (@w) { 2752 for (@w) {
2751 my ($dx, $dy) = splice @s, 0, 2, (); 2753 my ($dx, $dy) = splice @s, 0, 2, ();
2752 2754
2753 $_->{x} = $dx + $para->{indent}; 2755 $_->{x} = $dx + $para->{indent};
2754 $_->{y} = $dy + $y - $y0; 2756 $_->{y} = $dy + $y - $y0;
2755 2757
2756 $_->draw; 2758 $_->draw;
2757 } 2759 }
2758 glEnable GL_BLEND;
2759 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2760 } 2760 }
2761 } 2761 }
2762 2762
2763 $y += $h; 2763 $y += $h;
2764 } 2764 }
2765
2766 glDisable GL_BLEND;
2767 }; 2765 };
2768 }); 2766 });
2769} 2767}
2770 2768
2771sub reconfigure { 2769sub reconfigure {
… …
3067 for my $item (@{ $self->{items} }) { 3065 for my $item (@{ $self->{items} }) {
3068 my ($widget, $cb, $tooltip) = @$item; 3066 my ($widget, $cb, $tooltip) = @$item;
3069 3067
3070 # handle various types of items, only text for now 3068 # handle various types of items, only text for now
3071 if (!ref $widget) { 3069 if (!ref $widget) {
3070 if ($widget =~ /\t/) {
3071 my ($left, $right) = split /\t/, $widget, 2;
3072
3073 $widget = new CFClient::UI::HBox
3074 can_hover => 1,
3075 can_events => 1,
3076 tooltip => $tooltip,
3077 children => [
3078 (new CFClient::UI::Label markup => $left, expand => 1),
3079 (new CFClient::UI::Label markup => $right, align => +1),
3080 ],
3081 ;
3082
3083 } else {
3072 $widget = new CFClient::UI::Label 3084 $widget = new CFClient::UI::Label
3073 can_hover => 1, 3085 can_hover => 1,
3074 can_events => 1, 3086 can_events => 1,
3075 markup => $widget, 3087 markup => $widget,
3076 tooltip => $tooltip 3088 tooltip => $tooltip;
3089 }
3077 } 3090 }
3078 3091
3079 $self->{item}{$widget} = $item; 3092 $self->{item}{$widget} = $item;
3080 3093
3081 $self->{vbox}->add ($widget); 3094 $self->{vbox}->add ($widget);
… …
3148 3161
3149 $self->SUPER::add (@widgets); 3162 $self->SUPER::add (@widgets);
3150 3163
3151 $self->{current} = $self->{children}[0] 3164 $self->{current} = $self->{children}[0]
3152 if @{ $self->{children} }; 3165 if @{ $self->{children} };
3166}
3167
3168sub get_current_page {
3169 my ($self) = @_;
3170
3171 $self->{current}
3153} 3172}
3154 3173
3155sub set_current_page { 3174sub set_current_page {
3156 my ($self, $page_or_widget) = @_; 3175 my ($self, $page_or_widget) = @_;
3157 3176
… …
3223 tooltip => $tooltip, 3242 tooltip => $tooltip,
3224 on_activate => sub { $self->set_current_page ($widget) }, 3243 on_activate => sub { $self->set_current_page ($widget) },
3225 ); 3244 );
3226 3245
3227 $self->{multiplexer}->add ($widget); 3246 $self->{multiplexer}->add ($widget);
3247}
3248
3249sub get_current_page {
3250 my ($self) = @_;
3251
3252 $self->{multiplexer}->get_current_page
3228} 3253}
3229 3254
3230sub set_current_page { 3255sub set_current_page {
3231 my ($self, $page) = @_; 3256 my ($self, $page) = @_;
3232 3257
… …
3410 count => 1, 3435 count => 1,
3411 %arg, 3436 %arg,
3412 }; 3437 };
3413 } 3438 }
3414 3439
3440 $ROOT->on_refresh (reorder => sub {
3415 $self->reorder; 3441 $self->reorder;
3442 });
3416} 3443}
3417 3444
3418sub reconfigure { 3445sub reconfigure {
3419 my ($self) = @_; 3446 my ($self) = @_;
3420 3447
… …
3435 3462
3436############################################################################# 3463#############################################################################
3437 3464
3438package CFClient::UI::Inventory; 3465package CFClient::UI::Inventory;
3439 3466
3440our @ISA = CFClient::UI::ScrolledWindow::; 3467our @ISA = CFClient::UI::Table::;
3441 3468
3442sub new { 3469sub new {
3443 my $class = shift; 3470 my $class = shift;
3444 3471
3445 my $self = $class->SUPER::new ( 3472 my $self = $class->SUPER::new (
3446 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3473 col_expand => [0, 1, 0],
3447 @_, 3474 @_,
3448 ); 3475 );
3449 3476
3450 $self 3477 $self
3451} 3478}
3452 3479
3453sub set_items { 3480sub set_items {
3454 my ($self, $items) = @_; 3481 my ($self, $items) = @_;
3455 3482
3456 $self->{child}->clear; 3483 $self->clear;
3457 return unless $items; 3484 return unless $items;
3458 3485
3459 my @items = sort { 3486 my @items = sort {
3460 ($a->{type} <=> $b->{type}) 3487 ($a->{type} <=> $b->{type})
3461 or ($a->{name} cmp $b->{name}) 3488 or ($a->{name} cmp $b->{name})
3462 } @$items; 3489 } values %$items;
3463 3490
3464 $self->{real_items} = \@items; 3491 $self->{real_items} = \@items;
3465 3492
3466 my $row = 0; 3493 my $row = 0;
3467 for my $item (@items) { 3494 for my $item (@items) {
3468 CFClient::Item::update_widgets $item; 3495 CFClient::Item::update_widgets $item;
3469 3496
3470 $self->{child}->add (0, $row, $item->{face_widget}); 3497 $self->add (0, $row, $item->{face_widget});
3471 $self->{child}->add (1, $row, $item->{desc_widget}); 3498 $self->add (1, $row, $item->{desc_widget});
3472 $self->{child}->add (2, $row, $item->{weight_widget}); 3499 $self->add (2, $row, $item->{weight_widget});
3473 3500
3474 $row++; 3501 $row++;
3475 } 3502 }
3476} 3503}
3477 3504
… …
3789 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3816 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3790 3817
3791 $w = 0 if $w < 0; 3818 $w = 0 if $w < 0;
3792 $h = 0 if $h < 0; 3819 $h = 0 if $h < 0;
3793 3820
3821 $w = max $widget->{min_w}, $w;
3822 $h = max $widget->{min_h}, $h;
3823
3824 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3825 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3826
3794 $w = int $w + 0.5; 3827 $w = int $w + 0.5;
3795 $h = int $h + 0.5; 3828 $h = int $h + 0.5;
3796 3829
3797 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3830 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3798 $widget->{old_w} = $widget->{w}; 3831 $widget->{old_w} = $widget->{w};

Diff Legend

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