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.316 by root, Sun Jul 2 13:57:58 2006 UTC vs.
Revision 1.328 by root, Sat Jul 22 13:43:05 2006 UTC

… …
82} 82}
83 83
84sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
85 my ($ev) = @_; 85 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
87
88 warn "button down $ev->{button}\n";#d#
87 89
88 if (!$BUTTON_STATE) { 90 if (!$BUTTON_STATE) {
89 my $widget = $ROOT->find_widget ($x, $y); 91 my $widget = $ROOT->find_widget ($x, $y);
90 92
91 $GRAB = $widget; 93 $GRAB = $widget;
… …
423 my ($self) = @_; 425 my ($self) = @_;
424 426
425 return if $FOCUS == $self; 427 return if $FOCUS == $self;
426 return unless $self->{can_focus}; 428 return unless $self->{can_focus};
427 429
428 my $focus = $FOCUS; $FOCUS = $self; 430 $FOCUS = $self;
429 431
430 $focus->update if $focus; 432 $self->update;
431 $FOCUS->update;
432 433
433 0 434 0
434} 435}
435 436
436sub invoke_focus_out { 437sub invoke_focus_out {
437 my ($self) = @_; 438 my ($self) = @_;
438 439
439 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
440 441
441 my $focus = $FOCUS; undef $FOCUS; 442 undef $FOCUS;
442 443
443 $focus->update if $focus; #? 444 $self->update;
444 445
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus 446 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS; 447 unless $FOCUS;
447 448
448 0 449 0
449} 450}
450 451
451sub grab_focus { 452sub grab_focus {
452 my ($self) = @_; 453 my ($self) = @_;
453 454
455 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 456 $self->emit ("focus_in");
455} 457}
456 458
457sub invoke_mouse_motion { 1 } 459sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 460sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 461sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 462sub invoke_key_up { 0 }
461 463
462sub invoke_button_down { 464sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 465 my ($self, $ev, $x, $y) = @_;
464 466
465 $self->grab_focus; 467 $self->grab_focus;
466 468
469 warn "button down $ev->{button} $x $y\n";#d#
470
467 1 471 0
468} 472}
469 473
470sub connect { 474sub connect {
471 my ($self, $signal, $cb) = @_; 475 my ($self, $signal, $cb) = @_;
472 476
… …
587} 591}
588 592
589sub DESTROY { 593sub DESTROY {
590 my ($self) = @_; 594 my ($self) = @_;
591 595
596 return if CFClient::in_destruct;
597
592 delete $WIDGET{$self+0}; 598 delete $WIDGET{$self+0};
593 599
594 eval { $self->destroy }; 600 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 601 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596} 602}
… …
994 my ($self, $widget) = @_; 1000 my ($self, $widget) = @_;
995 1001
996 $self->{vp}->add ($self->{child} = $widget); 1002 $self->{vp}->add ($self->{child} = $widget);
997} 1003}
998 1004
1005sub invoke_button_down {
1006 my ($self, $ev) = @_;
1007
1008 warn "button down $ev->{button}\n";#d#
1009
1010 0
1011}
1012
999sub update_slider { 1013sub update_slider {
1000 my ($self) = @_; 1014 my ($self) = @_;
1001 1015
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]); 1016 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1003} 1017}
… …
1080 my $self = $class->SUPER::new ( 1094 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1095 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1096 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1097 border => 0.6,
1084 can_events => 1, 1098 can_events => 1,
1085 min_w => 16, 1099 min_w => 64,
1086 min_h => 16, 1100 min_h => 32,
1087 %arg, 1101 %arg,
1088 ); 1102 );
1089 1103
1090 $self->{title_widget} = new CFClient::UI::Label 1104 $self->{title_widget} = new CFClient::UI::Label
1091 align => 0, 1105 align => 0,
… …
1096 1110
1097 if ($self->{has_close_button}) { 1111 if ($self->{has_close_button}) {
1098 $self->{close_button} = 1112 $self->{close_button} =
1099 new CFClient::UI::ImageButton 1113 new CFClient::UI::ImageButton
1100 path => 'x1_close.png', 1114 path => 'x1_close.png',
1101 on_activate => sub { $self->hide }; 1115 on_activate => sub { $self->emit ("delete") };
1102 1116
1103 $self->CFClient::UI::Container::add ($self->{close_button}); 1117 $self->CFClient::UI::Container::add ($self->{close_button});
1104 } 1118 }
1105 1119
1106 $self 1120 $self
… …
1152 $self->child->configure ($border, $border, $w, $h); 1166 $self->child->configure ($border, $border, $w, $h);
1153 1167
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) 1168 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button}; 1169 if $self->{close_button};
1156 1170
1171 1
1172}
1173
1174sub invoke_delete {
1175 my ($self) = @_;
1176
1177 $self->hide;
1178
1157 1 1179 1
1158} 1180}
1159 1181
1160sub invoke_button_down { 1182sub invoke_button_down {
1161 my ($self, $ev, $x, $y) = @_; 1183 my ($self, $ev, $x, $y) = @_;
… …
1583 my ($self, $text) = @_; 1605 my ($self, $text) = @_;
1584 1606
1585 return if $self->{text} eq "T$text"; 1607 return if $self->{text} eq "T$text";
1586 $self->{text} = "T$text"; 1608 $self->{text} = "T$text";
1587 1609
1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1589 $self->{layout}->set_text ($text); 1610 $self->{layout}->set_text ($text);
1590 1611
1591 delete $self->{size_req}; 1612 delete $self->{size_req};
1592 $self->realloc; 1613 $self->realloc;
1593 $self->update; 1614 $self->update;
… …
1599 return if $self->{text} eq "M$markup"; 1620 return if $self->{text} eq "M$markup";
1600 $self->{text} = "M$markup"; 1621 $self->{text} = "M$markup";
1601 1622
1602 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1623 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1603 1624
1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1605 $self->{layout}->set_markup ($markup); 1625 $self->{layout}->set_markup ($markup);
1606 1626
1607 delete $self->{size_req}; 1627 delete $self->{size_req};
1608 $self->realloc; 1628 $self->realloc;
1609 $self->update; 1629 $self->update;
… …
1621 1641
1622 my ($w, $h) = $self->{layout}->size; 1642 my ($w, $h) = $self->{layout}->size;
1623 1643
1624 if (exists $self->{template}) { 1644 if (exists $self->{template}) {
1625 $self->{template}->set_font ($self->{font}) if $self->{font}; 1645 $self->{template}->set_font ($self->{font}) if $self->{font};
1646 $self->{template}->set_width ($self->{max_w} || -1);
1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1647 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1627 1648
1628 my ($w2, $h2) = $self->{template}->size; 1649 my ($w2, $h2) = $self->{template}->size;
1629 1650
1630 $w = List::Util::max $w, $w2; 1651 $w = List::Util::max $w, $w2;
… …
1664 1685
1665sub reconfigure { 1686sub reconfigure {
1666 my ($self) = @_; 1687 my ($self) = @_;
1667 1688
1668 delete $self->{size_req}; 1689 delete $self->{size_req};
1690 delete $self->{texture};
1669 1691
1670 $self->SUPER::reconfigure; 1692 $self->SUPER::reconfigure;
1671} 1693}
1672 1694
1673sub _draw { 1695sub _draw {
1674 my ($self) = @_; 1696 my ($self) = @_;
1675 1697
1676 $self->SUPER::_draw; # draw background, if applicable 1698 $self->SUPER::_draw; # draw background, if applicable
1677 1699
1678 my $tex = $self->{texture} ||= do { 1700 my $size = $self->{texture} ||= do {
1679 $self->{layout}->set_foreground (@{$self->{fg}}); 1701 $self->{layout}->set_foreground (@{$self->{fg}});
1680 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1702 $self->{layout}->set_font ($self->{font}) if $self->{font};
1681 $self->{layout}->set_width ($self->{w}); 1703 $self->{layout}->set_width ($self->{w});
1682 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1704 $self->{layout}->set_ellipsise ($self->{ellipsise});
1683 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1705 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1684 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1706 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1685 1707
1686 new_from_layout CFClient::Texture $self->{layout} 1708 [$self->{layout}->size]
1687 }; 1709 };
1688 1710
1689 unless (exists $self->{ox}) { 1711 unless (exists $self->{ox}) {
1690 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1712 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1691 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1713 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1692 : ($self->{w} - $tex->{w}) * 0.5); 1714 : ($self->{w} - $size->[0]) * 0.5);
1693 1715
1694 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1716 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1695 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1717 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1696 : ($self->{h} - $tex->{h}) * 0.5); 1718 : ($self->{h} - $size->[1]) * 0.5);
1697 }; 1719 };
1698 1720
1699 glEnable GL_TEXTURE_2D;
1700
1701 my $w = List::Util::min $self->{w} + 4, $tex->{w}; 1721 my $w = List::Util::min $self->{w} + 4, $size->[0];
1702 my $h = List::Util::min $self->{h} + 2, $tex->{h}; 1722 my $h = List::Util::min $self->{h} + 2, $size->[1];
1703 1723
1704 if ($tex->{format} == GL_ALPHA) { 1724 $self->{layout}->render ($self->{ox}, $self->{oy});
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1706 glColor @{$self->{fg}};
1707 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1708 } else {
1709 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1710 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1711 }
1712
1713 glDisable GL_TEXTURE_2D;
1714} 1725}
1715 1726
1716############################################################################# 1727#############################################################################
1717 1728
1718package CFClient::UI::EntryBase; 1729package CFClient::UI::EntryBase;
… …
1829 1840
1830 my $idx = $self->{layout}->xy_to_index ($x, $y); 1841 my $idx = $self->{layout}->xy_to_index ($x, $y);
1831 1842
1832 # byte-index to char-index 1843 # byte-index to char-index
1833 my $text = $self->{text}; 1844 my $text = $self->{text};
1834 utf8::encode $text; 1845 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1835 $self->{cursor} = length substr $text, 0, $idx; 1846 $self->{cursor} = length $text;
1836 1847
1837 $self->_set_text ($self->{text}); 1848 $self->_set_text ($self->{text});
1838 $self->update; 1849 $self->update;
1839 1850
1840 1 1851 1
… …
2060 my ($self) = @_; 2071 my ($self) = @_;
2061 2072
2062 (6) x 2 2073 (6) x 2
2063} 2074}
2064 2075
2076sub toggle {
2077 my ($self) = @_;
2078
2079 $self->{state} = !$self->{state};
2080 $self->emit (changed => $self->{state});
2081 $self->update;
2082}
2083
2065sub invoke_button_down { 2084sub invoke_button_down {
2066 my ($self, $ev, $x, $y) = @_; 2085 my ($self, $ev, $x, $y) = @_;
2067 2086
2068 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2087 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2069 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2088 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2070 $self->{state} = !$self->{state}; 2089 $self->toggle;
2071 $self->emit (changed => $self->{state});
2072 } else { 2090 } else {
2073 return 0 2091 return 0
2074 } 2092 }
2075 2093
2076 1 2094 1
… …
2112 my $self = $class->SUPER::new ( 2130 my $self = $class->SUPER::new (
2113 can_events => 0, 2131 can_events => 0,
2114 @_, 2132 @_,
2115 ); 2133 );
2116 2134
2117 $self->{path} 2135 $self->{path} || $self->{tex}
2118 or Carp::croak "required attribute 'path' not set"; 2136 or Carp::croak "'path' or 'tex' attributes required";
2119 2137
2120 $self->{tex} = $texture_cache{$self->{path}} ||= 2138 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2121 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2139 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2122 2140
2123 Scalar::Util::weaken $texture_cache{$self->{path}}; 2141 Scalar::Util::weaken $texture_cache{$self->{path}};
2124 2142
2125 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2143 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
… …
2247 my $ycut1 = max 0, min 1, $ycut; 2265 my $ycut1 = max 0, min 1, $ycut;
2248 my $ycut2 = max 0, min 1, $ycut - 1; 2266 my $ycut2 = max 0, min 1, $ycut - 1;
2249 2267
2250 my $h1 = $self->{h} * (1 - $ycut1); 2268 my $h1 = $self->{h} * (1 - $ycut1);
2251 my $h2 = $self->{h} * (1 - $ycut2); 2269 my $h2 = $self->{h} * (1 - $ycut2);
2270 my $h3 = $self->{h};
2271
2272 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2252 2273
2253 glEnable GL_BLEND; 2274 glEnable GL_BLEND;
2254 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, 2275 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2255 GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2276 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2256 glEnable GL_TEXTURE_2D; 2277 glEnable GL_TEXTURE_2D;
… …
2275 2296
2276 if ($t3) { 2297 if ($t3) {
2277 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2298 glBindTexture GL_TEXTURE_2D, $t3->{name};
2278 glBegin GL_QUADS; 2299 glBegin GL_QUADS;
2279 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2300 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2280 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2301 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2281 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2302 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2282 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2303 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2283 glEnd; 2304 glEnd;
2284 } 2305 }
2285 2306
2286 glDisable GL_BLEND; 2307 glDisable GL_BLEND;
… …
2555 can_events => 0, 2576 can_events => 0,
2556 indent => 0, 2577 indent => 0,
2557 #font => default_font 2578 #font => default_font
2558 @_, 2579 @_,
2559 2580
2560 layout => (new CFClient::Layout 1), 2581 layout => (new CFClient::Layout),
2561 par => [], 2582 par => [],
2562 height => 0, 2583 height => 0,
2563 children => [ 2584 children => [
2564 (new CFClient::UI::Empty expand => 1), 2585 (new CFClient::UI::Empty expand => 1),
2565 (new CFClient::UI::Slider vertical => 1), 2586 (new CFClient::UI::Slider vertical => 1),
… …
2726 my $y0 = $top; 2747 my $y0 = $top;
2727 my $y1 = $top + $H; 2748 my $y1 = $top + $H;
2728 2749
2729 my $y = 0; 2750 my $y = 0;
2730 2751
2731 glEnable GL_BLEND;
2732 #TODO# not correct in windows where rgba is forced off
2733 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2734
2735 for my $para (@{$self->{par}}) { 2752 for my $para (@{$self->{par}}) {
2736 my $h = $para->{h}; 2753 my $h = $para->{h};
2737 2754
2738 if ($y0 < $y + $h && $y < $y1) { 2755 if ($y0 < $y + $h && $y < $y1) {
2739 2756
2740 my $layout = $self->get_layout ($para); 2757 my $layout = $self->get_layout ($para);
2741 2758
2742 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2743
2744 glRasterPos $para->{indent}, $y - $y0; 2759 $layout->render ($para->{indent}, $y - $y0);
2745 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2746 2760
2747 if (my @w = @{ $para->{widget} }) { 2761 if (my @w = @{ $para->{widget} }) {
2748 my @s = $layout->get_shapes; 2762 my @s = $layout->get_shapes;
2749 2763
2750 glDisable GL_BLEND;
2751 for (@w) { 2764 for (@w) {
2752 my ($dx, $dy) = splice @s, 0, 2, (); 2765 my ($dx, $dy) = splice @s, 0, 2, ();
2753 2766
2754 $_->{x} = $dx + $para->{indent}; 2767 $_->{x} = $dx + $para->{indent};
2755 $_->{y} = $dy + $y - $y0; 2768 $_->{y} = $dy + $y - $y0;
2756 2769
2757 $_->draw; 2770 $_->draw;
2758 } 2771 }
2759 glEnable GL_BLEND;
2760 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2761 } 2772 }
2762 } 2773 }
2763 2774
2764 $y += $h; 2775 $y += $h;
2765 } 2776 }
2766
2767 glDisable GL_BLEND;
2768 }; 2777 };
2769 }); 2778 });
2770} 2779}
2771 2780
2772sub reconfigure { 2781sub reconfigure {
… …
3068 for my $item (@{ $self->{items} }) { 3077 for my $item (@{ $self->{items} }) {
3069 my ($widget, $cb, $tooltip) = @$item; 3078 my ($widget, $cb, $tooltip) = @$item;
3070 3079
3071 # handle various types of items, only text for now 3080 # handle various types of items, only text for now
3072 if (!ref $widget) { 3081 if (!ref $widget) {
3082 if ($widget =~ /\t/) {
3083 my ($left, $right) = split /\t/, $widget, 2;
3084
3085 $widget = new CFClient::UI::HBox
3086 can_hover => 1,
3087 can_events => 1,
3088 tooltip => $tooltip,
3089 children => [
3090 (new CFClient::UI::Label markup => $left, expand => 1),
3091 (new CFClient::UI::Label markup => $right, align => +1),
3092 ],
3093 ;
3094
3095 } else {
3073 $widget = new CFClient::UI::Label 3096 $widget = new CFClient::UI::Label
3074 can_hover => 1, 3097 can_hover => 1,
3075 can_events => 1, 3098 can_events => 1,
3076 markup => $widget, 3099 markup => $widget,
3077 tooltip => $tooltip 3100 tooltip => $tooltip;
3101 }
3078 } 3102 }
3079 3103
3080 $self->{item}{$widget} = $item; 3104 $self->{item}{$widget} = $item;
3081 3105
3082 $self->{vbox}->add ($widget); 3106 $self->{vbox}->add ($widget);
… …
3149 3173
3150 $self->SUPER::add (@widgets); 3174 $self->SUPER::add (@widgets);
3151 3175
3152 $self->{current} = $self->{children}[0] 3176 $self->{current} = $self->{children}[0]
3153 if @{ $self->{children} }; 3177 if @{ $self->{children} };
3178}
3179
3180sub get_current_page {
3181 my ($self) = @_;
3182
3183 $self->{current}
3154} 3184}
3155 3185
3156sub set_current_page { 3186sub set_current_page {
3157 my ($self, $page_or_widget) = @_; 3187 my ($self, $page_or_widget) = @_;
3158 3188
… …
3224 tooltip => $tooltip, 3254 tooltip => $tooltip,
3225 on_activate => sub { $self->set_current_page ($widget) }, 3255 on_activate => sub { $self->set_current_page ($widget) },
3226 ); 3256 );
3227 3257
3228 $self->{multiplexer}->add ($widget); 3258 $self->{multiplexer}->add ($widget);
3259}
3260
3261sub get_current_page {
3262 my ($self) = @_;
3263
3264 $self->{multiplexer}->get_current_page
3229} 3265}
3230 3266
3231sub set_current_page { 3267sub set_current_page {
3232 my ($self, $page) = @_; 3268 my ($self, $page) = @_;
3233 3269
… …
3438 3474
3439############################################################################# 3475#############################################################################
3440 3476
3441package CFClient::UI::Inventory; 3477package CFClient::UI::Inventory;
3442 3478
3443our @ISA = CFClient::UI::ScrolledWindow::; 3479our @ISA = CFClient::UI::Table::;
3444 3480
3445sub new { 3481sub new {
3446 my $class = shift; 3482 my $class = shift;
3447 3483
3448 my $self = $class->SUPER::new ( 3484 my $self = $class->SUPER::new (
3449 child => (new CFClient::UI::Table col_expand => [0, 1, 0]), 3485 col_expand => [0, 1, 0],
3450 @_, 3486 @_,
3451 ); 3487 );
3452 3488
3453 $self 3489 $self
3454} 3490}
3455 3491
3456sub set_items { 3492sub set_items {
3457 my ($self, $items) = @_; 3493 my ($self, $items) = @_;
3458 3494
3459 $self->{child}->clear; 3495 $self->clear;
3460 return unless $items; 3496 return unless $items;
3461 3497
3462 my @items = sort { 3498 my @items = sort {
3463 ($a->{type} <=> $b->{type}) 3499 ($a->{type} <=> $b->{type})
3464 or ($a->{name} cmp $b->{name}) 3500 or ($a->{name} cmp $b->{name})
… …
3468 3504
3469 my $row = 0; 3505 my $row = 0;
3470 for my $item (@items) { 3506 for my $item (@items) {
3471 CFClient::Item::update_widgets $item; 3507 CFClient::Item::update_widgets $item;
3472 3508
3473 $self->{child}->add (0, $row, $item->{face_widget}); 3509 $self->add (0, $row, $item->{face_widget});
3474 $self->{child}->add (1, $row, $item->{desc_widget}); 3510 $self->add (1, $row, $item->{desc_widget});
3475 $self->{child}->add (2, $row, $item->{weight_widget}); 3511 $self->add (2, $row, $item->{weight_widget});
3476 3512
3477 $row++; 3513 $row++;
3478 } 3514 }
3479} 3515}
3480 3516
… …
3792 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3828 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3793 3829
3794 $w = 0 if $w < 0; 3830 $w = 0 if $w < 0;
3795 $h = 0 if $h < 0; 3831 $h = 0 if $h < 0;
3796 3832
3833 $w = max $widget->{min_w}, $w;
3834 $h = max $widget->{min_h}, $h;
3835
3836 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3837 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3838
3797 $w = int $w + 0.5; 3839 $w = int $w + 0.5;
3798 $h = int $h + 0.5; 3840 $h = int $h + 0.5;
3799 3841
3800 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3842 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3801 $widget->{old_w} = $widget->{w}; 3843 $widget->{old_w} = $widget->{w};

Diff Legend

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