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.467 by root, Wed Sep 3 06:07:39 2008 UTC vs.
Revision 1.479 by root, Thu Feb 4 20:01:09 2010 UTC

1package DC::UI; 1package DC::UI;
2 2
3use utf8; 3use common::sense;
4use strict;
5 4
6use List::Util (); 5use List::Util ();
6
7use Guard ();
7 8
8use DC; 9use DC;
9use DC::Pod; 10use DC::Pod;
10use DC::Texture; 11use DC::Texture;
11 12
… …
189# call when resolution changes etc. 190# call when resolution changes etc.
190sub rescale_widgets { 191sub rescale_widgets {
191 my ($sx, $sy) = @_; 192 my ($sx, $sy) = @_;
192 193
193 for my $widget (values %WIDGET) { 194 for my $widget (values %WIDGET) {
194 if ($widget->{is_toplevel}) { 195 if ($widget->{is_toplevel} || $widget->{c_rescale}) {
195 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 196 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
196 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 197 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
197 198
198 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 199 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
199 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 200 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
… …
286sub set_visible { 287sub set_visible {
287 my ($self) = @_; 288 my ($self) = @_;
288 289
289 return if $self->{visible}; 290 return if $self->{visible};
290 291
292 $self->{parent} && $self->{parent}{root}#d#
293 or return ::clienterror ("set_visible called without parent ($self->{parent}) or root\n" => 1);
294
291 $self->{root} = $self->{parent}{root}; 295 $self->{root} = $self->{parent}{root};
292 $self->{visible} = $self->{parent}{visible} + 1; 296 $self->{visible} = $self->{parent}{visible} + 1;
293 297
294 $self->emit (visibility_change => 1); 298 $self->emit (visibility_change => 1);
295 299
296 $self->realloc if !exists $self->{req_w}; 300 $self->realloc if !exists $self->{req_w};
297 301
298 $_->set_visible for $self->children; 302 $_->set_visible for $self->visible_children;
299} 303}
300 304
301sub set_invisible { 305sub set_invisible {
302 my ($self) = @_; 306 my ($self) = @_;
303 307
… …
527sub connect { 531sub connect {
528 my ($self, $signal, $cb) = @_; 532 my ($self, $signal, $cb) = @_;
529 533
530 push @{ $self->{signal_cb}{$signal} }, $cb; 534 push @{ $self->{signal_cb}{$signal} }, $cb;
531 535
532 defined wantarray and DC::guard { 536 defined wantarray and Guard::guard {
533 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb, 537 @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
534 @{ $self->{signal_cb}{$signal} }; 538 @{ $self->{signal_cb}{$signal} };
535 } 539 }
536} 540}
537 541
… …
651 #active_bg => [1, 1, 1, 0.5], 655 #active_bg => [1, 1, 1, 0.5],
652 @_ 656 @_
653 ) 657 )
654} 658}
655 659
660sub set_bg {
661 my ($self, $bg) = @_;
662
663 $self->{bg} = $bg;
664 $self->update;
665}
666
656sub _draw { 667sub _draw {
657 my ($self) = @_; 668 my ($self) = @_;
658 669
659 my $color = $FOCUS == $self && $self->{active_bg} 670 my $color = $FOCUS == $self
660 ? $self->{active_bg} 671 ? $self->{active_bg} || $self->{bg}
661 : $self->{bg}; 672 : $self->{bg};
662 673
663 if ($color && (@$color < 4 || $color->[3])) { 674 if ($color && (@$color < 4 || $color->[3])) {
664 my ($w, $h) = @$self{qw(w h)}; 675 my ($w, $h) = @$self{qw(w h)};
665 676
… …
1256 fontsize => ($arg{border} || 0.8) * 0.75; 1267 fontsize => ($arg{border} || 0.8) * 0.75;
1257 } 1268 }
1258 1269
1259 my $self = $class->SUPER::new ( 1270 my $self = $class->SUPER::new (
1260 # label => "", 1271 # label => "",
1261 fg => [0.6, 0.3, 0.1], 1272 fg => undef,
1262 border => 0.8, 1273 border => 0.8,
1263 style => 'single', 1274 style => 'single',
1264 %arg, 1275 %arg,
1265 ); 1276 );
1266 1277
… …
1319 my $border = $self->border; 1330 my $border = $self->border;
1320 my ($w, $h) = ($self->{w}, $self->{h}); 1331 my ($w, $h) = ($self->{w}, $self->{h});
1321 1332
1322 $child->draw; 1333 $child->draw;
1323 1334
1324 glColor @{$self->{fg}}; 1335 glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1325 glBegin GL_LINE_STRIP; 1336 glBegin GL_LINE_STRIP;
1326 glVertex $border * 1.5 , $border * 0.5 + 0.5; 1337 glVertex $border * 1.5 , $border * 0.5 + 0.5;
1327 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5; 1338 glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1328 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1339 glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1329 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5; 1340 glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
… …
1361 my ($class, %arg) = @_; 1372 my ($class, %arg) = @_;
1362 1373
1363 my $self = $class->SUPER::new ( 1374 my $self = $class->SUPER::new (
1364 bg => [1, 1, 1, 1], 1375 bg => [1, 1, 1, 1],
1365 border_bg => [1, 1, 1, 1], 1376 border_bg => [1, 1, 1, 1],
1366 border => 1, 1377 border => 0.8,
1367 can_events => 1, 1378 can_events => 1,
1368 min_w => 64, 1379 min_w => 64,
1369 min_h => 32, 1380 min_h => 32,
1370 %arg, 1381 %arg,
1371 ); 1382 );
… …
1540 glEnable GL_TEXTURE_2D; 1551 glEnable GL_TEXTURE_2D;
1541 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1552 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1542 1553
1543 my $border = $self->border; 1554 my $border = $self->border;
1544 1555
1556 if ($border) {
1545 glColor @{ $self->{border_bg} }; 1557 glColor @{ $self->{border_bg} };
1546 $border[0]->draw_quad_alpha ( 0, 0, $w, $border); 1558 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1547 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch); 1559 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1548 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1560 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1549 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border); 1561 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1550 1562
1551 # move 1563 # move
1552 my $w2 = ($w - $border) * .5; 1564 my $w2 = ($w - $border) * .5;
1553 my $h2 = ($h - $border) * .5; 1565 my $h2 = ($h - $border) * .5;
1554 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border); 1566 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1555 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border); 1567 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1556 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border); 1568 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1557 1569
1558 # resize 1570 # resize
1559 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border); 1571 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1560 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border) 1572 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1561 unless $self->{has_close_button}; 1573 unless $self->{has_close_button};
1562 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border); 1574 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1563 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border); 1575 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1576 }
1564 1577
1565 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1578 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1566 glColor @{ $self->{bg} }; 1579 glColor @{ $self->{bg} };
1567 1580
1568 # TODO: repeat texture not scale 1581 # TODO: repeat texture not scale
… …
2090 my $class = shift; 2103 my $class = shift;
2091 2104
2092 $class->SUPER::new ( 2105 $class->SUPER::new (
2093 fg => [1, 1, 1], 2106 fg => [1, 1, 1],
2094 bg => [0, 0, 0, 0.2], 2107 bg => [0, 0, 0, 0.2],
2095 outline => [0.6, 0.3, 0.1], 2108 outline => undef,
2096 active_bg => [0, 0, 1, .2], 2109 active_bg => [0, 0, 1, .2],
2097 active_fg => [1, 1, 1], 2110 active_fg => [1, 1, 1],
2098 active_outline => [1, 1, 0], 2111 active_outline => [1, 1, 0],
2099 can_hover => 1, 2112 can_hover => 1,
2100 can_focus => 1, 2113 can_focus => 1,
… …
2273 glColor @{$self->{active_outline}}; 2286 glColor @{$self->{active_outline}};
2274 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5; 2287 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
2275 glLineWidth 1; 2288 glLineWidth 1;
2276 2289
2277 } else { 2290 } else {
2278 glColor @{$self->{outline}}; 2291 glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2279 glBegin GL_LINE_STRIP; 2292 glBegin GL_LINE_STRIP;
2280 glVertex .5, $self->{h} * .5; 2293 glVertex .5, $self->{h} * .5;
2281 glVertex .5, $self->{h} - 2.5; 2294 glVertex .5, $self->{h} - 2.5;
2282 glVertex $self->{w} - .5, $self->{h} - 2.5; 2295 glVertex $self->{w} - .5, $self->{h} - 2.5;
2283 glVertex $self->{w} - .5, $self->{h} * .5; 2296 glVertex $self->{w} - .5, $self->{h} * .5;
… …
2516 2529
2517sub new { 2530sub new {
2518 my $class = shift; 2531 my $class = shift;
2519 2532
2520 $class->SUPER::new ( 2533 $class->SUPER::new (
2534 fontsize => 1,
2521 padding_x => 2, 2535 padding_x => 2,
2522 padding_y => 2, 2536 padding_y => 2,
2523 fg => [1, 1, 1], 2537 fg => [1, 1, 1],
2524 active_fg => [1, 1, 0], 2538 active_fg => [1, 1, 0],
2525 bg => [0, 0, 0, 0.2], 2539 bg => [0, 0, 0, 0.2],
… …
2531} 2545}
2532 2546
2533sub size_request { 2547sub size_request {
2534 my ($self) = @_; 2548 my ($self) = @_;
2535 2549
2536 (6) x 2 2550 ($self->{fontsize} * $::FONTSIZE) x 2
2537} 2551}
2538 2552
2539sub toggle { 2553sub toggle {
2540 my ($self) = @_; 2554 my ($self) = @_;
2541 2555
… …
2579 2593
2580############################################################################# 2594#############################################################################
2581 2595
2582package DC::UI::Image; 2596package DC::UI::Image;
2583 2597
2584our @ISA = DC::UI::Base::; 2598our @ISA = DC::UI::DrawBG::;
2585 2599
2586use DC::OpenGL; 2600use DC::OpenGL;
2587 2601
2588our %texture_cache; 2602our %texture_cache;
2589 2603
… …
2622 my ($self, $cloning, $path) = @_; 2636 my ($self, $cloning, $path) = @_;
2623 2637
2624 $self->new (path => $path) 2638 $self->new (path => $path)
2625} 2639}
2626 2640
2641sub set_texture {
2642 my ($self, $tex) = @_;
2643
2644 $self->{tex} = $tex;
2645 $self->update;
2646}
2647
2627sub size_request { 2648sub size_request {
2628 my ($self) = @_; 2649 my ($self) = @_;
2629 2650
2630 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale}) 2651 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2631} 2652}
2632 2653
2633sub _draw { 2654sub _draw {
2634 my ($self) = @_; 2655 my ($self) = @_;
2656
2657 $self->SUPER::_draw;
2635 2658
2636 my $tex = $self->{tex}; 2659 my $tex = $self->{tex};
2637 2660
2638 my ($w, $h) = ($self->{w}, $self->{h}); 2661 my ($w, $h) = ($self->{w}, $self->{h});
2639 2662
… …
2657package DC::UI::ImageButton; 2680package DC::UI::ImageButton;
2658 2681
2659our @ISA = DC::UI::Image::; 2682our @ISA = DC::UI::Image::;
2660 2683
2661use DC::OpenGL; 2684use DC::OpenGL;
2662
2663my %textures;
2664 2685
2665sub new { 2686sub new {
2666 my $class = shift; 2687 my $class = shift;
2667 2688
2668 my $self = $class->SUPER::new ( 2689 my $self = $class->SUPER::new (
… …
2839 2860
2840sub new { 2861sub new {
2841 my ($class, %arg) = @_; 2862 my ($class, %arg) = @_;
2842 2863
2843 my $self = $class->SUPER::new ( 2864 my $self = $class->SUPER::new (
2865 padding_x => 2,
2866 padding_y => 2,
2844 fg => [1, 1, 1], 2867 fg => [1, 1, 1],
2845 bg => [0, 0, 1, 0.2], 2868 bg => [0, 0, 1, 0.2],
2846 bar => [0.7, 0.5, 0.1, 0.8], 2869 bar => [0.7, 0.5, 0.1, 0.8],
2847 outline => [0.4, 0.3, 0], 2870 outline => [0.4, 0.3, 0],
2848 fontsize => 0.9, 2871 fontsize => 0.9,
… …
2888 my ($self) = @_; 2911 my ($self) = @_;
2889 2912
2890 glEnable GL_BLEND; 2913 glEnable GL_BLEND;
2891 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2914 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2892 2915
2916 my $px = $self->{padding_x};
2917 my $py = $self->{padding_y};
2918
2893 if ($self->{value} >= 0) { 2919 if ($self->{value} >= 0) {
2894 my $s = int 2 + ($self->{w} - 4) * $self->{value}; 2920 my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
2895 2921
2896 glColor_premultiply @{$self->{bar}}; 2922 glColor_premultiply @{$self->{bar}};
2897 glRect 2, 2, $s, $self->{h} - 2; 2923 glRect $px, $py, $s, $self->{h} - $py;
2898 glColor_premultiply @{$self->{bg}}; 2924 glColor_premultiply @{$self->{bg}};
2899 glRect $s, 2, $self->{w} - 2, $self->{h} - 2; 2925 glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
2900 } 2926 }
2901 2927
2902 glColor_premultiply @{$self->{outline}}; 2928 glColor_premultiply @{$self->{outline}};
2929
2930 $px -= .5;
2931 $py -= .5;
2932
2903 glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5; 2933 glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
2904 2934
2905 glDisable GL_BLEND; 2935 glDisable GL_BLEND;
2906 2936
2907 { 2937 {
2908 local $self->{bg}; # do not draw background 2938 local $self->{bg}; # do not draw background
… …
2917our @ISA = DC::UI::Progress::; 2947our @ISA = DC::UI::Progress::;
2918 2948
2919sub new { 2949sub new {
2920 my ($class, %arg) = @_; 2950 my ($class, %arg) = @_;
2921 2951
2952 my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
2953
2922 my $self = $class->SUPER::new ( 2954 my $self = $class->SUPER::new (
2955 %arg,
2923 tooltip => sub { 2956 tooltip => sub {
2924 my ($self) = @_; 2957 my ($self) = @_;
2925 2958
2926 sprintf "level %d\n%s points\n%s next level\n%s to go", 2959 sprintf "%slevel %d\n%s points\n%s next level\n%s to go, %d%% done",
2960 $tt,
2927 $self->{lvl}, 2961 $self->{lvl},
2928 ::formsep ($self->{exp}), 2962 ::formsep ($self->{exp}),
2929 ::formsep ($self->{nxt}), 2963 ::formsep ($self->{nxt}),
2930 ::formsep ($self->{nxt} - $self->{exp}), 2964 ::formsep ($self->{nxt} - $self->{exp}),
2965 $self->_percent * 100,
2931 }, 2966 },
2932 %arg
2933 ); 2967 );
2934 2968
2935 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) } 2969 $::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
2936 if $::CONN; 2970 if $::CONN;
2937 2971
… …
2945 if $::CONN; 2979 if $::CONN;
2946 2980
2947 $self->SUPER::DESTROY; 2981 $self->SUPER::DESTROY;
2948} 2982}
2949 2983
2984sub _percent {
2985 my ($self) = @_;
2986
2987 my $table = $::CONN && $::CONN->{exp_table}
2988 or return -1;
2989
2990 my $l0 = $table->[$self->{lvl} - 1];
2991 my $l1 = $table->[$self->{lvl}];
2992
2993 $self->{nxt} = $l1;
2994
2995 ($self->{exp} - $l0) / ($l1 - $l0)
2996}
2997
2950sub set_value { 2998sub set_value {
2951 my ($self, $lvl, $exp) = @_; 2999 my ($self, $lvl, $exp) = @_;
2952 3000
2953 $self->{lvl} = $lvl; 3001 $self->{lvl} = $lvl;
2954 $self->{exp} = $exp; 3002 $self->{exp} = $exp;
2955 3003
2956 my $v = -1;
2957
2958 if ($::CONN && (my $table = $::CONN->{exp_table})) {
2959 my $l0 = $table->[$lvl - 1];
2960 my $l1 = $table->[$lvl];
2961
2962 $self->{nxt} = $l1;
2963
2964 $v = ($exp - $l0) / ($l1 - $l0);
2965 }
2966
2967 $self->SUPER::set_value ($v); 3004 $self->SUPER::set_value ($self->_percent);
2968} 3005}
2969 3006
2970############################################################################# 3007#############################################################################
2971 3008
2972package DC::UI::Gauge; 3009package DC::UI::Gauge;
… …
3620 3657
3621 $tip =~ s/^\n+//; 3658 $tip =~ s/^\n+//;
3622 $tip =~ s/\n+$//; 3659 $tip =~ s/\n+$//;
3623 3660
3624 $self->add (new DC::UI::Label 3661 $self->add (new DC::UI::Label
3662 fg => $DC::THEME{tooltip_fg},
3625 markup => $tip, 3663 markup => $tip,
3626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3664 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3627 align => 0, 3665 align => 0,
3628 fontsize => 0.8, 3666 fontsize => 0.8,
3629 style => 1, # FLAG_INVERSE 3667 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3630 ellipsise => 0, 3668 ellipsise => 0,
3631 font => ($widget->{tooltip_font} || $::FONT_PROP), 3669 font => ($widget->{tooltip_font} || $::FONT_PROP),
3632 ); 3670 );
3633} 3671}
3634 3672
… …
3671sub _draw { 3709sub _draw {
3672 my ($self) = @_; 3710 my ($self) = @_;
3673 3711
3674 my ($w, $h) = @$self{qw(w h)}; 3712 my ($w, $h) = @$self{qw(w h)};
3675 3713
3676 glColor 1, 0.8, 0.4; 3714 glColor @{ $DC::THEME{tooltip_bg} };
3677 glRect 0, 0, $w, $h; 3715 glRect 0, 0, $w, $h;
3678 3716
3679 glColor 0, 0, 0; 3717 glColor @{ $DC::THEME{tooltip_border} };
3680 glRect_lineloop .5, .5, $w + .5, $h + .5; 3718 glRect_lineloop .5, .5, $w + .5, $h + .5;
3681 3719
3682 glTranslate 2, 2; 3720 glTranslate 2, 2;
3683 3721
3684 $self->SUPER::_draw; 3722 $self->SUPER::_draw;
… …
3701 aspect => 1, 3739 aspect => 1,
3702 can_events => 0, 3740 can_events => 0,
3703 @_, 3741 @_,
3704 ); 3742 );
3705 3743
3706 if ($self->{anim} && $self->{animspeed}) {
3707 DC::weaken (my $widget = $self);
3708
3709 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3710 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3711 return unless $::CONN;
3712
3713 my $w = $widget
3714 or return;
3715
3716 ++$w->{frame};
3717 $w->update_face;
3718
3719 # somehow, $widget can go away
3720 $w->update;
3721 $w->update_timer;
3722 };
3723
3724 $self->update_face;
3725 $self->update_timer; 3744 $self->update_anim;
3726 }
3727 3745
3728 $self 3746 $self
3729} 3747}
3730 3748
3731sub update_timer { 3749sub update_timer {
… …
3754 $tex->upload (sub { $self->reconfigure }); 3772 $tex->upload (sub { $self->reconfigure });
3755 } 3773 }
3756 } 3774 }
3757 } 3775 }
3758 } 3776 }
3777 }
3778}
3779
3780sub update_anim {
3781 my ($self) = @_;
3782
3783 if ($self->{anim} && $self->{animspeed}) {
3784 DC::weaken (my $widget = $self);
3785
3786 $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3787 $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3788 return unless $::CONN;
3789
3790 my $w = $widget
3791 or return;
3792
3793 ++$w->{frame};
3794 $w->update_face;
3795
3796 # somehow, $widget can go away
3797 $w->update;
3798 $w->update_timer;
3799 };
3800
3801 $self->update_face;
3802 $self->update_timer;
3803 } else {
3804 delete $self->{timer};
3759 } 3805 }
3760} 3806}
3761 3807
3762sub size_request { 3808sub size_request {
3763 my ($self) = @_; 3809 my ($self) = @_;
… …
3785 return unless $self->{visible}; 3831 return unless $self->{visible};
3786 3832
3787 $self->SUPER::update; 3833 $self->SUPER::update;
3788} 3834}
3789 3835
3836sub set_face {
3837 my ($self, $face) = @_;
3838
3839 $self->{face} = $face;
3840 $self->reconfigure;
3841}
3842
3843sub set_anim {
3844 my ($self, $anim) = @_;
3845
3846 $self->{anim} = $anim;
3847 $self->update_anim;
3848}
3849
3850sub set_animspeed {
3851 my ($self, $animspeed) = @_;
3852
3853 $self->{animspeed} = $animspeed;
3854 $self->update_anim;
3855}
3856
3790sub invoke_visibility_change { 3857sub invoke_visibility_change {
3791 my ($self) = @_; 3858 my ($self) = @_;
3792 3859
3793 $self->update_timer; 3860 $self->update_timer;
3794 3861
… …
3890 # maybe save $GRAB? must be careful about events... 3957 # maybe save $GRAB? must be careful about events...
3891 $GRAB = $self; 3958 $GRAB = $self;
3892 $self->{button} = $ev->{button}; 3959 $self->{button} = $ev->{button};
3893 3960
3894 $self->show; 3961 $self->show;
3895 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3962
3963 my $x = $ev->{x};
3964 my $y = $ev->{y};
3965
3966 $self->{root}->on_post_alloc ($self => sub {
3967 $self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
3968 });
3969
3970 1 # so it can be used inside event handlers
3896} 3971}
3897 3972
3898sub invoke_mouse_motion { 3973sub invoke_mouse_motion {
3899 my ($self, $ev, $x, $y) = @_; 3974 my ($self, $ev, $x, $y) = @_;
3900 3975
… …
3932 4007
3933 my $self = $class->SUPER::new ( 4008 my $self = $class->SUPER::new (
3934 @_, 4009 @_,
3935 ); 4010 );
3936 4011
3937 $self->{current} = $self->{children}[0] 4012 $self->set_current_page (0);
3938 if @{ $self->{children} };
3939 4013
3940 $self 4014 $self
3941} 4015}
3942 4016
3943sub add { 4017sub add {
3944 my ($self, @widgets) = @_; 4018 my ($self, @widgets) = @_;
3945 4019
3946 $self->SUPER::add (@widgets); 4020 $self->SUPER::add (@widgets);
3947 4021
3948 $self->{current} = $self->{children}[0] 4022 $self->set_current_page (0)
3949 if @{ $self->{children} }; 4023 if @widgets == @{ $self->{children} };
3950} 4024}
3951 4025
3952sub get_current_page { 4026sub get_current_page {
3953 my ($self) = @_; 4027 my ($self) = @_;
3954 4028
… …
3960 4034
3961 my $widget = ref $page_or_widget 4035 my $widget = ref $page_or_widget
3962 ? $page_or_widget 4036 ? $page_or_widget
3963 : $self->{children}[$page_or_widget]; 4037 : $self->{children}[$page_or_widget];
3964 4038
4039 $self->{current}->set_invisible if $self->{current} && $self->{visible};
4040
3965 $self->{current} = $widget; 4041 if (($self->{current} = $widget)) {
4042 $self->{current}->set_visible if $self->{current} && $self->{visible};
3966 $self->{current}->configure (0, 0, $self->{w}, $self->{h}); 4043 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3967 4044
3968 $self->emit (page_changed => $self->{current}); 4045 $self->emit (page_changed => $self->{current});
4046 }
3969 4047
3970 $self->realloc; 4048 $self->realloc;
3971} 4049}
3972 4050
3973sub visible_children { 4051sub visible_children {
3974 $_[0]{current} 4052 $_[0]{current} || ()
3975} 4053}
3976 4054
3977sub size_request { 4055sub size_request {
3978 my ($self) = @_; 4056 my ($self) = @_;
3979 4057
4058 $self->{current}
3980 $self->{current}->size_request 4059 ? $self->{current}->size_request
4060 : (0, 0)
3981} 4061}
3982 4062
3983sub invoke_size_allocate { 4063sub invoke_size_allocate {
3984 my ($self, $w, $h) = @_; 4064 my ($self, $w, $h) = @_;
3985 4065
3986 $self->{current}->configure (0, 0, $w, $h); 4066 $self->{current}->configure (0, 0, $w, $h)
4067 if $self->{current};
3987 4068
3988 1 4069 1
3989} 4070}
3990 4071
3991sub _draw { 4072sub _draw {
3992 my ($self) = @_; 4073 my ($self) = @_;
3993 4074
3994 $self->{current}->draw; 4075 $self->{current}->draw
4076 if $self->{current};
3995} 4077}
3996 4078
3997############################################################################# 4079#############################################################################
3998 4080
3999package DC::UI::Notebook; 4081package DC::UI::Notebook;
… …
4209 $self 4291 $self
4210} 4292}
4211 4293
4212sub reorder { 4294sub reorder {
4213 my ($self) = @_; 4295 my ($self) = @_;
4214 my $NOW = Time::HiRes::time; 4296 my $NOW = EV::time;
4215 4297
4216 # freeze display when hovering over any label 4298 # freeze display when hovering over any label
4217 return if $DC::UI::TOOLTIP->{owner} 4299 return if $DC::UI::TOOLTIP->{owner}
4218 && grep $DC::UI::TOOLTIP->{owner} == $_->{label}, 4300 && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
4219 values %{ $self->{item} }; 4301 values %{ $self->{item} };
… …
4269 $label->{fg}[3] = $item->{fg}[3] || 1; 4351 $label->{fg}[3] = $item->{fg}[3] || 1;
4270 } 4352 }
4271 4353
4272 push @widgets, $label; 4354 push @widgets, $label;
4273 } 4355 }
4356
4357 my $hash = join ",", @widgets;
4358 return if $hash eq $self->{last_widget_hash};
4359 $self->{last_widget_hash} = $hash;
4274 4360
4275 $self->clear; 4361 $self->clear;
4276 $self->SUPER::add (reverse @widgets); 4362 $self->SUPER::add (reverse @widgets);
4277} 4363}
4278 4364
… …
4583 4669
4584$ROOT = new DC::UI::Root; 4670$ROOT = new DC::UI::Root;
4585$TOOLTIP = new DC::UI::Tooltip z => 900; 4671$TOOLTIP = new DC::UI::Tooltip z => 900;
4586 4672
45871 46731
4588

Diff Legend

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