… | |
… | |
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 | |
436 | sub invoke_focus_out { |
435 | sub 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 | |
451 | sub grab_focus { |
450 | sub 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 | |
457 | sub invoke_mouse_motion { 1 } |
457 | sub invoke_mouse_motion { 1 } |
458 | sub invoke_button_up { 1 } |
458 | sub invoke_button_up { 1 } |
… | |
… | |
1096 | |
1096 | |
1097 | if ($self->{has_close_button}) { |
1097 | if ($self->{has_close_button}) { |
1098 | $self->{close_button} = |
1098 | $self->{close_button} = |
1099 | new CFClient::UI::ImageButton |
1099 | new CFClient::UI::ImageButton |
1100 | path => 'x1_close.png', |
1100 | path => 'x1_close.png', |
1101 | on_activate => sub { $self->hide }; |
1101 | on_activate => sub { $self->emit ("delete") }; |
1102 | |
1102 | |
1103 | $self->CFClient::UI::Container::add ($self->{close_button}); |
1103 | $self->CFClient::UI::Container::add ($self->{close_button}); |
1104 | } |
1104 | } |
1105 | |
1105 | |
1106 | $self |
1106 | $self |
… | |
… | |
1152 | $self->child->configure ($border, $border, $w, $h); |
1152 | $self->child->configure ($border, $border, $w, $h); |
1153 | |
1153 | |
1154 | $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) |
1154 | $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border) |
1155 | if $self->{close_button}; |
1155 | if $self->{close_button}; |
1156 | |
1156 | |
|
|
1157 | 1 |
|
|
1158 | } |
|
|
1159 | |
|
|
1160 | sub invoke_delete { |
|
|
1161 | my ($self) = @_; |
|
|
1162 | |
|
|
1163 | $self->hide; |
|
|
1164 | |
1157 | 1 |
1165 | 1 |
1158 | } |
1166 | } |
1159 | |
1167 | |
1160 | sub invoke_button_down { |
1168 | sub invoke_button_down { |
1161 | my ($self, $ev, $x, $y) = @_; |
1169 | my ($self, $ev, $x, $y) = @_; |
… | |
… | |
1583 | my ($self, $text) = @_; |
1591 | my ($self, $text) = @_; |
1584 | |
1592 | |
1585 | return if $self->{text} eq "T$text"; |
1593 | return if $self->{text} eq "T$text"; |
1586 | $self->{text} = "T$text"; |
1594 | $self->{text} = "T$text"; |
1587 | |
1595 | |
1588 | $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; |
|
|
1589 | $self->{layout}->set_text ($text); |
1596 | $self->{layout}->set_text ($text); |
1590 | |
1597 | |
1591 | delete $self->{size_req}; |
1598 | delete $self->{size_req}; |
1592 | $self->realloc; |
1599 | $self->realloc; |
1593 | $self->update; |
1600 | $self->update; |
… | |
… | |
1599 | return if $self->{text} eq "M$markup"; |
1606 | return if $self->{text} eq "M$markup"; |
1600 | $self->{text} = "M$markup"; |
1607 | $self->{text} = "M$markup"; |
1601 | |
1608 | |
1602 | my $rgba = $markup =~ /span.*(?:foreground|background)/; |
1609 | my $rgba = $markup =~ /span.*(?:foreground|background)/; |
1603 | |
1610 | |
1604 | $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; |
|
|
1605 | $self->{layout}->set_markup ($markup); |
1611 | $self->{layout}->set_markup ($markup); |
1606 | |
1612 | |
1607 | delete $self->{size_req}; |
1613 | delete $self->{size_req}; |
1608 | $self->realloc; |
1614 | $self->realloc; |
1609 | $self->update; |
1615 | $self->update; |
… | |
… | |
1621 | |
1627 | |
1622 | my ($w, $h) = $self->{layout}->size; |
1628 | my ($w, $h) = $self->{layout}->size; |
1623 | |
1629 | |
1624 | if (exists $self->{template}) { |
1630 | if (exists $self->{template}) { |
1625 | $self->{template}->set_font ($self->{font}) if $self->{font}; |
1631 | $self->{template}->set_font ($self->{font}) if $self->{font}; |
|
|
1632 | $self->{template}->set_width ($self->{max_w} || -1); |
1626 | $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); |
1633 | $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); |
1627 | |
1634 | |
1628 | my ($w2, $h2) = $self->{template}->size; |
1635 | my ($w2, $h2) = $self->{template}->size; |
1629 | |
1636 | |
1630 | $w = List::Util::max $w, $w2; |
1637 | $w = List::Util::max $w, $w2; |
… | |
… | |
1664 | |
1671 | |
1665 | sub reconfigure { |
1672 | sub reconfigure { |
1666 | my ($self) = @_; |
1673 | my ($self) = @_; |
1667 | |
1674 | |
1668 | delete $self->{size_req}; |
1675 | delete $self->{size_req}; |
|
|
1676 | delete $self->{texture}; |
1669 | |
1677 | |
1670 | $self->SUPER::reconfigure; |
1678 | $self->SUPER::reconfigure; |
1671 | } |
1679 | } |
1672 | |
1680 | |
1673 | sub _draw { |
1681 | sub _draw { |
1674 | my ($self) = @_; |
1682 | my ($self) = @_; |
1675 | |
1683 | |
1676 | $self->SUPER::_draw; # draw background, if applicable |
1684 | $self->SUPER::_draw; # draw background, if applicable |
1677 | |
1685 | |
1678 | my $tex = $self->{texture} ||= do { |
1686 | my $size = $self->{texture} ||= do { |
1679 | $self->{layout}->set_foreground (@{$self->{fg}}); |
1687 | $self->{layout}->set_foreground (@{$self->{fg}}); |
1680 | $self->{layout}->set_font ($self->{font}) if $self->{font}; |
1688 | $self->{layout}->set_font ($self->{font}) if $self->{font}; |
1681 | $self->{layout}->set_width ($self->{w}); |
1689 | $self->{layout}->set_width ($self->{w}); |
1682 | $self->{layout}->set_ellipsise ($self->{ellipsise}); |
1690 | $self->{layout}->set_ellipsise ($self->{ellipsise}); |
1683 | $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); |
1691 | $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); |
1684 | $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); |
1692 | $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); |
1685 | |
1693 | |
1686 | new_from_layout CFClient::Texture $self->{layout} |
1694 | [$self->{layout}->size] |
1687 | }; |
1695 | }; |
1688 | |
1696 | |
1689 | unless (exists $self->{ox}) { |
1697 | unless (exists $self->{ox}) { |
1690 | $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} |
1698 | $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} |
1691 | : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} |
1699 | : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} |
1692 | : ($self->{w} - $tex->{w}) * 0.5); |
1700 | : ($self->{w} - $size->[0]) * 0.5); |
1693 | |
1701 | |
1694 | $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} |
1702 | $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} |
1695 | : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} |
1703 | : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} |
1696 | : ($self->{h} - $tex->{h}) * 0.5); |
1704 | : ($self->{h} - $size->[1]) * 0.5); |
1697 | }; |
1705 | }; |
1698 | |
1706 | |
1699 | glEnable GL_TEXTURE_2D; |
|
|
1700 | |
|
|
1701 | my $w = List::Util::min $self->{w} + 4, $tex->{w}; |
1707 | my $w = List::Util::min $self->{w} + 4, $size->[0]; |
1702 | my $h = List::Util::min $self->{h} + 2, $tex->{h}; |
1708 | my $h = List::Util::min $self->{h} + 2, $size->[1]; |
1703 | |
1709 | |
1704 | if ($tex->{format} == GL_ALPHA) { |
1710 | $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 | } |
1711 | } |
1715 | |
1712 | |
1716 | ############################################################################# |
1713 | ############################################################################# |
1717 | |
1714 | |
1718 | package CFClient::UI::EntryBase; |
1715 | package CFClient::UI::EntryBase; |
… | |
… | |
2060 | my ($self) = @_; |
2057 | my ($self) = @_; |
2061 | |
2058 | |
2062 | (6) x 2 |
2059 | (6) x 2 |
2063 | } |
2060 | } |
2064 | |
2061 | |
|
|
2062 | sub toggle { |
|
|
2063 | my ($self) = @_; |
|
|
2064 | |
|
|
2065 | $self->{state} = !$self->{state}; |
|
|
2066 | $self->emit (changed => $self->{state}); |
|
|
2067 | $self->update; |
|
|
2068 | } |
|
|
2069 | |
2065 | sub invoke_button_down { |
2070 | sub invoke_button_down { |
2066 | my ($self, $ev, $x, $y) = @_; |
2071 | my ($self, $ev, $x, $y) = @_; |
2067 | |
2072 | |
2068 | if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} |
2073 | if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} |
2069 | && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { |
2074 | && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { |
2070 | $self->{state} = !$self->{state}; |
2075 | $self->toggle; |
2071 | $self->emit (changed => $self->{state}); |
|
|
2072 | } else { |
2076 | } else { |
2073 | return 0 |
2077 | return 0 |
2074 | } |
2078 | } |
2075 | |
2079 | |
2076 | 1 |
2080 | 1 |
… | |
… | |
2247 | my $ycut1 = max 0, min 1, $ycut; |
2251 | my $ycut1 = max 0, min 1, $ycut; |
2248 | my $ycut2 = max 0, min 1, $ycut - 1; |
2252 | my $ycut2 = max 0, min 1, $ycut - 1; |
2249 | |
2253 | |
2250 | my $h1 = $self->{h} * (1 - $ycut1); |
2254 | my $h1 = $self->{h} * (1 - $ycut1); |
2251 | my $h2 = $self->{h} * (1 - $ycut2); |
2255 | my $h2 = $self->{h} * (1 - $ycut2); |
|
|
2256 | my $h3 = $self->{h}; |
|
|
2257 | |
|
|
2258 | $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3); |
2252 | |
2259 | |
2253 | glEnable GL_BLEND; |
2260 | glEnable GL_BLEND; |
2254 | glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, |
2261 | glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, |
2255 | GL_ONE, GL_ONE_MINUS_SRC_ALPHA; |
2262 | GL_ONE, GL_ONE_MINUS_SRC_ALPHA; |
2256 | glEnable GL_TEXTURE_2D; |
2263 | glEnable GL_TEXTURE_2D; |
… | |
… | |
2275 | |
2282 | |
2276 | if ($t3) { |
2283 | if ($t3) { |
2277 | glBindTexture GL_TEXTURE_2D, $t3->{name}; |
2284 | glBindTexture GL_TEXTURE_2D, $t3->{name}; |
2278 | glBegin GL_QUADS; |
2285 | glBegin GL_QUADS; |
2279 | glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; |
2286 | glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; |
2280 | glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; |
2287 | glTexCoord 0 , $t3->{t}; glVertex 0 , $h3; |
2281 | glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; |
2288 | glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3; |
2282 | glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; |
2289 | glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; |
2283 | glEnd; |
2290 | glEnd; |
2284 | } |
2291 | } |
2285 | |
2292 | |
2286 | glDisable GL_BLEND; |
2293 | glDisable GL_BLEND; |
… | |
… | |
2555 | can_events => 0, |
2562 | can_events => 0, |
2556 | indent => 0, |
2563 | indent => 0, |
2557 | #font => default_font |
2564 | #font => default_font |
2558 | @_, |
2565 | @_, |
2559 | |
2566 | |
2560 | layout => (new CFClient::Layout 1), |
2567 | layout => (new CFClient::Layout), |
2561 | par => [], |
2568 | par => [], |
2562 | height => 0, |
2569 | height => 0, |
2563 | children => [ |
2570 | children => [ |
2564 | (new CFClient::UI::Empty expand => 1), |
2571 | (new CFClient::UI::Empty expand => 1), |
2565 | (new CFClient::UI::Slider vertical => 1), |
2572 | (new CFClient::UI::Slider vertical => 1), |
… | |
… | |
2726 | my $y0 = $top; |
2733 | my $y0 = $top; |
2727 | my $y1 = $top + $H; |
2734 | my $y1 = $top + $H; |
2728 | |
2735 | |
2729 | my $y = 0; |
2736 | my $y = 0; |
2730 | |
2737 | |
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}}) { |
2738 | for my $para (@{$self->{par}}) { |
2736 | my $h = $para->{h}; |
2739 | my $h = $para->{h}; |
2737 | |
2740 | |
2738 | if ($y0 < $y + $h && $y < $y1) { |
2741 | if ($y0 < $y + $h && $y < $y1) { |
2739 | |
2742 | |
2740 | my $layout = $self->get_layout ($para); |
2743 | my $layout = $self->get_layout ($para); |
2741 | |
2744 | |
2742 | my ($w, $h, $data, $format, $internalformat) = $layout->render; |
|
|
2743 | |
|
|
2744 | glRasterPos $para->{indent}, $y - $y0; |
2745 | $layout->render ($para->{indent}, $y - $y0); |
2745 | glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; |
|
|
2746 | |
2746 | |
2747 | if (my @w = @{ $para->{widget} }) { |
2747 | if (my @w = @{ $para->{widget} }) { |
2748 | my @s = $layout->get_shapes; |
2748 | my @s = $layout->get_shapes; |
2749 | |
2749 | |
2750 | glDisable GL_BLEND; |
|
|
2751 | for (@w) { |
2750 | for (@w) { |
2752 | my ($dx, $dy) = splice @s, 0, 2, (); |
2751 | my ($dx, $dy) = splice @s, 0, 2, (); |
2753 | |
2752 | |
2754 | $_->{x} = $dx + $para->{indent}; |
2753 | $_->{x} = $dx + $para->{indent}; |
2755 | $_->{y} = $dy + $y - $y0; |
2754 | $_->{y} = $dy + $y - $y0; |
2756 | |
2755 | |
2757 | $_->draw; |
2756 | $_->draw; |
2758 | } |
2757 | } |
2759 | glEnable GL_BLEND; |
|
|
2760 | glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; |
|
|
2761 | } |
2758 | } |
2762 | } |
2759 | } |
2763 | |
2760 | |
2764 | $y += $h; |
2761 | $y += $h; |
2765 | } |
2762 | } |
2766 | |
|
|
2767 | glDisable GL_BLEND; |
|
|
2768 | }; |
2763 | }; |
2769 | }); |
2764 | }); |
2770 | } |
2765 | } |
2771 | |
2766 | |
2772 | sub reconfigure { |
2767 | sub reconfigure { |
… | |
… | |
3068 | for my $item (@{ $self->{items} }) { |
3063 | for my $item (@{ $self->{items} }) { |
3069 | my ($widget, $cb, $tooltip) = @$item; |
3064 | my ($widget, $cb, $tooltip) = @$item; |
3070 | |
3065 | |
3071 | # handle various types of items, only text for now |
3066 | # handle various types of items, only text for now |
3072 | if (!ref $widget) { |
3067 | if (!ref $widget) { |
|
|
3068 | if ($widget =~ /\t/) { |
|
|
3069 | my ($left, $right) = split /\t/, $widget, 2; |
|
|
3070 | |
|
|
3071 | $widget = new CFClient::UI::HBox |
|
|
3072 | can_hover => 1, |
|
|
3073 | can_events => 1, |
|
|
3074 | tooltip => $tooltip, |
|
|
3075 | children => [ |
|
|
3076 | (new CFClient::UI::Label markup => $left, expand => 1), |
|
|
3077 | (new CFClient::UI::Label markup => $right, align => +1), |
|
|
3078 | ], |
|
|
3079 | ; |
|
|
3080 | |
|
|
3081 | } else { |
3073 | $widget = new CFClient::UI::Label |
3082 | $widget = new CFClient::UI::Label |
3074 | can_hover => 1, |
3083 | can_hover => 1, |
3075 | can_events => 1, |
3084 | can_events => 1, |
3076 | markup => $widget, |
3085 | markup => $widget, |
3077 | tooltip => $tooltip |
3086 | tooltip => $tooltip; |
|
|
3087 | } |
3078 | } |
3088 | } |
3079 | |
3089 | |
3080 | $self->{item}{$widget} = $item; |
3090 | $self->{item}{$widget} = $item; |
3081 | |
3091 | |
3082 | $self->{vbox}->add ($widget); |
3092 | $self->{vbox}->add ($widget); |
… | |
… | |
3149 | |
3159 | |
3150 | $self->SUPER::add (@widgets); |
3160 | $self->SUPER::add (@widgets); |
3151 | |
3161 | |
3152 | $self->{current} = $self->{children}[0] |
3162 | $self->{current} = $self->{children}[0] |
3153 | if @{ $self->{children} }; |
3163 | if @{ $self->{children} }; |
|
|
3164 | } |
|
|
3165 | |
|
|
3166 | sub get_current_page { |
|
|
3167 | my ($self) = @_; |
|
|
3168 | |
|
|
3169 | $self->{current} |
3154 | } |
3170 | } |
3155 | |
3171 | |
3156 | sub set_current_page { |
3172 | sub set_current_page { |
3157 | my ($self, $page_or_widget) = @_; |
3173 | my ($self, $page_or_widget) = @_; |
3158 | |
3174 | |
… | |
… | |
3224 | tooltip => $tooltip, |
3240 | tooltip => $tooltip, |
3225 | on_activate => sub { $self->set_current_page ($widget) }, |
3241 | on_activate => sub { $self->set_current_page ($widget) }, |
3226 | ); |
3242 | ); |
3227 | |
3243 | |
3228 | $self->{multiplexer}->add ($widget); |
3244 | $self->{multiplexer}->add ($widget); |
|
|
3245 | } |
|
|
3246 | |
|
|
3247 | sub get_current_page { |
|
|
3248 | my ($self) = @_; |
|
|
3249 | |
|
|
3250 | $self->{multiplexer}->get_current_page |
3229 | } |
3251 | } |
3230 | |
3252 | |
3231 | sub set_current_page { |
3253 | sub set_current_page { |
3232 | my ($self, $page) = @_; |
3254 | my ($self, $page) = @_; |
3233 | |
3255 | |
… | |
… | |
3438 | |
3460 | |
3439 | ############################################################################# |
3461 | ############################################################################# |
3440 | |
3462 | |
3441 | package CFClient::UI::Inventory; |
3463 | package CFClient::UI::Inventory; |
3442 | |
3464 | |
3443 | our @ISA = CFClient::UI::ScrolledWindow::; |
3465 | our @ISA = CFClient::UI::Table::; |
3444 | |
3466 | |
3445 | sub new { |
3467 | sub new { |
3446 | my $class = shift; |
3468 | my $class = shift; |
3447 | |
3469 | |
3448 | my $self = $class->SUPER::new ( |
3470 | my $self = $class->SUPER::new ( |
3449 | child => (new CFClient::UI::Table col_expand => [0, 1, 0]), |
3471 | col_expand => [0, 1, 0], |
3450 | @_, |
3472 | @_, |
3451 | ); |
3473 | ); |
3452 | |
3474 | |
3453 | $self |
3475 | $self |
3454 | } |
3476 | } |
3455 | |
3477 | |
3456 | sub set_items { |
3478 | sub set_items { |
3457 | my ($self, $items) = @_; |
3479 | my ($self, $items) = @_; |
3458 | |
3480 | |
3459 | $self->{child}->clear; |
3481 | $self->clear; |
3460 | return unless $items; |
3482 | return unless $items; |
3461 | |
3483 | |
3462 | my @items = sort { |
3484 | my @items = sort { |
3463 | ($a->{type} <=> $b->{type}) |
3485 | ($a->{type} <=> $b->{type}) |
3464 | or ($a->{name} cmp $b->{name}) |
3486 | or ($a->{name} cmp $b->{name}) |
… | |
… | |
3468 | |
3490 | |
3469 | my $row = 0; |
3491 | my $row = 0; |
3470 | for my $item (@items) { |
3492 | for my $item (@items) { |
3471 | CFClient::Item::update_widgets $item; |
3493 | CFClient::Item::update_widgets $item; |
3472 | |
3494 | |
3473 | $self->{child}->add (0, $row, $item->{face_widget}); |
3495 | $self->add (0, $row, $item->{face_widget}); |
3474 | $self->{child}->add (1, $row, $item->{desc_widget}); |
3496 | $self->add (1, $row, $item->{desc_widget}); |
3475 | $self->{child}->add (2, $row, $item->{weight_widget}); |
3497 | $self->add (2, $row, $item->{weight_widget}); |
3476 | |
3498 | |
3477 | $row++; |
3499 | $row++; |
3478 | } |
3500 | } |
3479 | } |
3501 | } |
3480 | |
3502 | |