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

Diff Legend

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