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.321 by root, Tue Jul 4 23:44:23 2006 UTC vs.
Revision 1.335 by root, Sun Jul 23 16:11:56 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 {
417 my ($self, $x, $y) = @_; 441 my ($self, $x, $y) = @_;
418 442
443 Carp::confess unless $self->{parent};#d#
444
419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 445 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
420} 446}
421 447
422sub invoke_focus_in { 448sub invoke_focus_in {
423 my ($self) = @_; 449 my ($self) = @_;
… …
452 478
453 $FOCUS->emit ("focus_out") if $FOCUS; 479 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in"); 480 $self->emit ("focus_in");
455} 481}
456 482
457sub invoke_mouse_motion { 1 } 483sub invoke_mouse_motion { 0 }
458sub invoke_button_up { 1 } 484sub invoke_button_up { 0 }
459sub invoke_key_down { 1 } 485sub invoke_key_down { 0 }
460sub invoke_key_up { 1 } 486sub invoke_key_up { 0 }
487sub invoke_mouse_wheel { 0 }
461 488
462sub invoke_button_down { 489sub invoke_button_down {
463 my ($self, $ev, $x, $y) = @_; 490 my ($self, $ev, $x, $y) = @_;
464 491
465 $self->grab_focus; 492 $self->grab_focus;
466 493
467 1 494 0
468} 495}
469 496
470sub connect { 497sub connect {
471 my ($self, $signal, $cb) = @_; 498 my ($self, $signal, $cb) = @_;
472 499
473 push @{ $self->{signal_cb}{$signal} }, $cb; 500 push @{ $self->{signal_cb}{$signal} }, $cb;
501
502 defined wantarray and CFClient::guard {
503 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504 @{ $self->{signal_cb}{$signal} };
505 }
474} 506}
507
508my %has_coords = (
509 button_down => 1,
510 button_up => 1,
511 mouse_motion => 1,
512 mouse_wheel => 1,
513);
475 514
476sub emit { 515sub emit {
477 my ($self, $signal, @args) = @_; 516 my ($self, $signal, @args) = @_;
478 517
518 # I do not really like this solution, but I dislike duplication
519 # and needlessly verbose code, too.
520 my @append
521 = $has_coords{$signal}
522 ? $args[0]->xy ($self)
523 : ();
524
525 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526
479 #d##TODO# stop propagating at first true, do not use sum 527 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before 528 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure 529 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent 530 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483} 531}
484 532
485sub find_widget { 533sub find_widget {
486 my ($self, $x, $y) = @_; 534 my ($self, $x, $y) = @_;
487 535
… …
587} 635}
588 636
589sub DESTROY { 637sub DESTROY {
590 my ($self) = @_; 638 my ($self) = @_;
591 639
640 return if CFClient::in_destruct;
641
592 delete $WIDGET{$self+0}; 642 delete $WIDGET{$self+0};
593 643
594 eval { $self->destroy }; 644 eval { $self->destroy };
595 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/; 645 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
596} 646}
… …
679 729
680 $self->add (@$children) 730 $self->add (@$children)
681 if $children; 731 if $children;
682 732
683 $self 733 $self
734}
735
736sub realloc {
737 my ($self) = @_;
738
739 $self->{force_realloc} = 1;
740 $self->{force_size_alloc} = 1;
741 $self->SUPER::realloc;
684} 742}
685 743
686sub add { 744sub add {
687 my ($self, @widgets) = @_; 745 my ($self, @widgets) = @_;
688 746
… …
975 $self->{vp}->set_offset (0, $_[1]); 1033 $self->{vp}->set_offset (0, $_[1]);
976 }, 1034 },
977 ; 1035 ;
978 1036
979 $self = $class->SUPER::new ( 1037 $self = $class->SUPER::new (
980 vp => (new CFClient::UI::ViewPort expand => 1), 1038 vp => (new CFClient::UI::ViewPort expand => 1),
1039 can_events => 1,
981 slider => $slider, 1040 slider => $slider,
982 %arg, 1041 %arg,
983 ); 1042 );
984 1043
985 $self->SUPER::add ($self->{vp}, $self->{slider}); 1044 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child; 1045 $self->add ($child) if $child;
… …
992 1051
993sub add { 1052sub add {
994 my ($self, $widget) = @_; 1053 my ($self, $widget) = @_;
995 1054
996 $self->{vp}->add ($self->{child} = $widget); 1055 $self->{vp}->add ($self->{child} = $widget);
1056}
1057
1058sub invoke_mouse_wheel {
1059 my ($self, $ev) = @_;
1060
1061 return 0 unless $ev->{dy}; # only vertical movements
1062
1063 $self->{slider}->emit (mouse_wheel => $ev);
1064
1065 1
997} 1066}
998 1067
999sub update_slider { 1068sub update_slider {
1000 my ($self) = @_; 1069 my ($self) = @_;
1001 1070
… …
1080 my $self = $class->SUPER::new ( 1149 my $self = $class->SUPER::new (
1081 bg => [1, 1, 1, 1], 1150 bg => [1, 1, 1, 1],
1082 border_bg => [1, 1, 1, 1], 1151 border_bg => [1, 1, 1, 1],
1083 border => 0.6, 1152 border => 0.6,
1084 can_events => 1, 1153 can_events => 1,
1085 min_w => 16, 1154 min_w => 64,
1086 min_h => 16, 1155 min_h => 32,
1087 %arg, 1156 %arg,
1088 ); 1157 );
1089 1158
1090 $self->{title_widget} = new CFClient::UI::Label 1159 $self->{title_widget} = new CFClient::UI::Label
1091 align => 0, 1160 align => 0,
… …
1295sub children { 1364sub children {
1296 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1365 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1297} 1366}
1298 1367
1299sub add { 1368sub add {
1300 my ($self, $x, $y, $child) = @_; 1369 my ($self) = shift;
1301 1370
1371 while (@_) {
1372 my ($x, $y, $child) = splice @_, 0, 3, ();
1302 $child->set_parent ($self); 1373 $child->set_parent ($self);
1303 $self->{children}[$y][$x] = $child; 1374 $self->{children}[$y][$x] = $child;
1375 }
1304 1376
1377 $self->{force_realloc} = 1;
1378 $self->{force_size_alloc} = 1;
1305 $self->realloc; 1379 $self->realloc;
1306} 1380}
1307 1381
1308sub remove { 1382sub remove {
1309 my ($self, $child) = @_; 1383 my ($self, $child) = @_;
… …
1536 #font => default_font 1610 #font => default_font
1537 #text => initial text 1611 #text => initial text
1538 #markup => initial narkup 1612 #markup => initial narkup
1539 #max_w => maximum pixel width 1613 #max_w => maximum pixel width
1540 ellipsise => 3, # end 1614 ellipsise => 3, # end
1541 layout => (new CFClient::Layout 2), 1615 layout => (new CFClient::Layout),
1542 fontsize => 1, 1616 fontsize => 1,
1543 align => -1, 1617 align => -1,
1544 valign => -1, 1618 valign => -1,
1545 padding_x => 2, 1619 padding_x => 2,
1546 padding_y => 2, 1620 padding_y => 2,
1547 can_events => 0, 1621 can_events => 0,
1548 %arg 1622 %arg
1549 ); 1623 );
1550 1624
1551 if (exists $self->{template}) { 1625 if (exists $self->{template}) {
1552 my $layout = new CFClient::Layout 2; 1626 my $layout = new CFClient::Layout;
1553 $layout->set_text (delete $self->{template}); 1627 $layout->set_text (delete $self->{template});
1554 $self->{template} = $layout; 1628 $self->{template} = $layout;
1555 } 1629 }
1556 1630
1557 if (exists $self->{markup}) { 1631 if (exists $self->{markup}) {
… …
1559 } else { 1633 } else {
1560 $self->set_text (delete $self->{text}); 1634 $self->set_text (delete $self->{text});
1561 } 1635 }
1562 1636
1563 $self 1637 $self
1564}
1565
1566sub escape($) {
1567 local $_ = $_[0];
1568
1569 s/&/&amp;/g;
1570 s/>/&gt;/g;
1571 s/</&lt;/g;
1572
1573 $_
1574} 1638}
1575 1639
1576sub update { 1640sub update {
1577 my ($self) = @_; 1641 my ($self) = @_;
1578 1642
… …
1627 1691
1628 my ($w, $h) = $self->{layout}->size; 1692 my ($w, $h) = $self->{layout}->size;
1629 1693
1630 if (exists $self->{template}) { 1694 if (exists $self->{template}) {
1631 $self->{template}->set_font ($self->{font}) if $self->{font}; 1695 $self->{template}->set_font ($self->{font}) if $self->{font};
1696 $self->{template}->set_width ($self->{max_w} || -1);
1632 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1697 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1633 1698
1634 my ($w2, $h2) = $self->{template}->size; 1699 my ($w2, $h2) = $self->{template}->size;
1635 1700
1636 $w = List::Util::max $w, $w2; 1701 $w = List::Util::max $w, $w2;
… …
1688 $self->{layout}->set_width ($self->{w}); 1753 $self->{layout}->set_width ($self->{w});
1689 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1754 $self->{layout}->set_ellipsise ($self->{ellipsise});
1690 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1755 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1691 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1756 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1692 1757
1693 $self->{size_req} 1758 [$self->{layout}->size]
1694 }; 1759 };
1695 1760
1696 unless (exists $self->{ox}) { 1761 unless (exists $self->{ox}) {
1697 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1762 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1698 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x} 1763 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
… …
1825 1890
1826 my $idx = $self->{layout}->xy_to_index ($x, $y); 1891 my $idx = $self->{layout}->xy_to_index ($x, $y);
1827 1892
1828 # byte-index to char-index 1893 # byte-index to char-index
1829 my $text = $self->{text}; 1894 my $text = $self->{text};
1830 utf8::encode $text; 1895 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1831 $self->{cursor} = length substr $text, 0, $idx; 1896 $self->{cursor} = length $text;
1832 1897
1833 $self->_set_text ($self->{text}); 1898 $self->_set_text ($self->{text});
1834 $self->update; 1899 $self->update;
1835 1900
1836 1 1901 1
… …
2115 my $self = $class->SUPER::new ( 2180 my $self = $class->SUPER::new (
2116 can_events => 0, 2181 can_events => 0,
2117 @_, 2182 @_,
2118 ); 2183 );
2119 2184
2185 $self->{path} || $self->{tex}
2186 or Carp::croak "'path' or 'tex' attributes required";
2187
2188 $self->{tex} ||= $texture_cache{$self->{path}} ||=
2189 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2190
2191 Scalar::Util::weaken $texture_cache{$self->{path}};
2192
2193 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2194
2195 $self
2196}
2197
2198sub STORABLE_freeze {
2199 my ($self, $cloning) = @_;
2200
2120 $self->{path} 2201 $self->{path}
2121 or Carp::croak "required attribute 'path' not set"; 2202 or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
2122 2203
2123 $self->{tex} = $texture_cache{$self->{path}} ||= 2204 $self->{path}
2124 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1; 2205}
2125 2206
2126 Scalar::Util::weaken $texture_cache{$self->{path}}; 2207sub STORABLE_attach {
2208 my ($self, $cloning, $path) = @_;
2127 2209
2128 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h}; 2210 $self->new (path => $path)
2129
2130 $self
2131} 2211}
2132 2212
2133sub size_request { 2213sub size_request {
2134 my ($self) = @_; 2214 my ($self) = @_;
2135 2215
… …
2151 } 2231 }
2152 2232
2153 glEnable GL_TEXTURE_2D; 2233 glEnable GL_TEXTURE_2D;
2154 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2234 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2155 2235
2156 $tex->draw_quad_alpha (0, 0, $w, $h); 2236 $tex->draw_quad (0, 0, $w, $h);
2157 2237
2158 glDisable GL_TEXTURE_2D; 2238 glDisable GL_TEXTURE_2D;
2159} 2239}
2160 2240
2161############################################################################# 2241#############################################################################
… …
2448 } 2528 }
2449 2529
2450 1 2530 1
2451} 2531}
2452 2532
2533sub invoke_mouse_wheel {
2534 my ($self, $ev) = @_;
2535
2536 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2537
2538 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2539
2540 ! ! $delta
2541}
2542
2453sub update { 2543sub update {
2454 my ($self) = @_; 2544 my ($self) = @_;
2455 2545
2456 delete $self->{knob_w}; 2546 delete $self->{knob_w};
2457 $self->SUPER::update; 2547 $self->SUPER::update;
… …
2556sub new { 2646sub new {
2557 my $class = shift; 2647 my $class = shift;
2558 2648
2559 my $self = $class->SUPER::new ( 2649 my $self = $class->SUPER::new (
2560 fontsize => 1, 2650 fontsize => 1,
2561 can_events => 0, 2651 can_events => 1,
2562 indent => 0, 2652 indent => 0,
2563 #font => default_font 2653 #font => default_font
2564 @_, 2654 @_,
2565 2655
2566 layout => (new CFClient::Layout 2), 2656 layout => (new CFClient::Layout),
2567 par => [], 2657 par => [],
2568 height => 0, 2658 height => 0,
2569 children => [ 2659 children => [
2570 (new CFClient::UI::Empty expand => 1), 2660 (new CFClient::UI::Empty expand => 1),
2571 (new CFClient::UI::Slider vertical => 1), 2661 (new CFClient::UI::Slider vertical => 1),
… …
2606 2696
2607 $self->reflow; 2697 $self->reflow;
2608 2698
2609 local $self->{children} = [$empty, $slider]; 2699 local $self->{children} = [$empty, $slider];
2610 $self->SUPER::invoke_size_allocate ($w, $h) 2700 $self->SUPER::invoke_size_allocate ($w, $h)
2701}
2702
2703sub invoke_mouse_wheel {
2704 my ($self, $ev) = @_;
2705
2706 return 0 unless $ev->{dy}; # only vertical movements
2707
2708 $self->{children}[1]->emit (mouse_wheel => $ev);
2709
2710 1
2611} 2711}
2612 2712
2613sub get_layout { 2713sub get_layout {
2614 my ($self, $para) = @_; 2714 my ($self, $para) = @_;
2615 2715
… …
2913 3013
2914 $self->{root}->on_post_alloc ("move_$self" => sub { 3014 $self->{root}->on_post_alloc ("move_$self" => sub {
2915 my $widget = $self->{owner} 3015 my $widget = $self->{owner}
2916 or return; 3016 or return;
2917 3017
3018 if ($widget->{visible}) {
2918 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 3019 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2919 3020
2920 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 3021 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2921 if $x + $self->{w} > $self->{root}{w}; 3022 if $x + $self->{w} > $self->{root}{w};
2922 3023
2923 $self->move_abs ($x, $y); 3024 $self->move_abs ($x, $y);
3025 } else {
3026 $self->hide;
3027 }
2924 }); 3028 });
2925} 3029}
2926 3030
2927sub _draw { 3031sub _draw {
2928 my ($self) = @_; 3032 my ($self) = @_;
… …
3062 for my $item (@{ $self->{items} }) { 3166 for my $item (@{ $self->{items} }) {
3063 my ($widget, $cb, $tooltip) = @$item; 3167 my ($widget, $cb, $tooltip) = @$item;
3064 3168
3065 # handle various types of items, only text for now 3169 # handle various types of items, only text for now
3066 if (!ref $widget) { 3170 if (!ref $widget) {
3171 if ($widget =~ /\t/) {
3172 my ($left, $right) = split /\t/, $widget, 2;
3173
3174 $widget = new CFClient::UI::HBox
3175 can_hover => 1,
3176 can_events => 1,
3177 tooltip => $tooltip,
3178 children => [
3179 (new CFClient::UI::Label markup => $left, expand => 1),
3180 (new CFClient::UI::Label markup => $right, align => +1),
3181 ],
3182 ;
3183
3184 } else {
3067 $widget = new CFClient::UI::Label 3185 $widget = new CFClient::UI::Label
3068 can_hover => 1, 3186 can_hover => 1,
3069 can_events => 1, 3187 can_events => 1,
3070 markup => $widget, 3188 markup => $widget,
3071 tooltip => $tooltip 3189 tooltip => $tooltip;
3190 }
3072 } 3191 }
3073 3192
3074 $self->{item}{$widget} = $item; 3193 $self->{item}{$widget} = $item;
3075 3194
3076 $self->{vbox}->add ($widget); 3195 $self->{vbox}->add ($widget);
… …
3451sub new { 3570sub new {
3452 my $class = shift; 3571 my $class = shift;
3453 3572
3454 my $self = $class->SUPER::new ( 3573 my $self = $class->SUPER::new (
3455 col_expand => [0, 1, 0], 3574 col_expand => [0, 1, 0],
3575 items => [],
3456 @_, 3576 @_,
3457 ); 3577 );
3458 3578
3579 $self->set_sort_order (undef);
3580
3459 $self 3581 $self
3582}
3583
3584sub update_items {
3585 my ($self) = @_;
3586
3587 $self->clear;
3588
3589 my @item = $self->{sort}->(@{ $self->{items} });
3590
3591 my @adds;
3592 my $row = 0;
3593 for my $item ($self->{sort}->(@{ $self->{items} })) {
3594 CFClient::Item::update_widgets $item;
3595
3596 push @adds, 0, $row, $item->{face_widget};
3597 push @adds, 1, $row, $item->{desc_widget};
3598 push @adds, 2, $row, $item->{weight_widget};
3599
3600 $row++;
3601 }
3602
3603 $self->add (@adds);
3604}
3605
3606sub set_sort_order {
3607 my ($self, $order) = @_;
3608
3609 $self->{sort} = $order ||= sub {
3610 sort {
3611 $a->{type} <=> $b->{type}
3612 or $a->{name} cmp $b->{name}
3613 } @_
3614 };
3615
3616 $self->update_items;
3460} 3617}
3461 3618
3462sub set_items { 3619sub set_items {
3463 my ($self, $items) = @_; 3620 my ($self, $items) = @_;
3464 3621
3465 $self->clear; 3622 $self->{items} = [$items ? values %$items : ()];
3466 return unless $items; 3623 $self->update_items;
3467
3468 my @items = sort {
3469 ($a->{type} <=> $b->{type})
3470 or ($a->{name} cmp $b->{name})
3471 } values %$items;
3472
3473 $self->{real_items} = \@items;
3474
3475 my $row = 0;
3476 for my $item (@items) {
3477 CFClient::Item::update_widgets $item;
3478
3479 $self->add (0, $row, $item->{face_widget});
3480 $self->add (1, $row, $item->{desc_widget});
3481 $self->add (2, $row, $item->{weight_widget});
3482
3483 $row++;
3484 }
3485} 3624}
3486 3625
3487############################################################################# 3626#############################################################################
3488 3627
3489package CFClient::UI::SpellList; 3628package CFClient::UI::SpellList;
… …
3798 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3937 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3799 3938
3800 $w = 0 if $w < 0; 3939 $w = 0 if $w < 0;
3801 $h = 0 if $h < 0; 3940 $h = 0 if $h < 0;
3802 3941
3942 $w = max $widget->{min_w}, $w;
3943 $h = max $widget->{min_h}, $h;
3944
3945 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3946 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3947
3803 $w = int $w + 0.5; 3948 $w = int $w + 0.5;
3804 $h = int $h + 0.5; 3949 $h = int $h + 0.5;
3805 3950
3806 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3951 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3807 $widget->{old_w} = $widget->{w}; 3952 $widget->{old_w} = $widget->{w};

Diff Legend

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