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.413 by root, Mon Jul 23 15:30:45 2007 UTC vs.
Revision 1.428 by root, Mon Aug 20 19:24:22 2007 UTC

… …
273 $self->emit ("destroy"); 273 $self->emit ("destroy");
274 %$self = (); 274 %$self = ();
275} 275}
276 276
277sub TO_JSON { 277sub TO_JSON {
278 { __widget_ref__ => $_[0]{s_id} } 278 { __w_ => $_[0]{s_id} }
279} 279}
280 280
281sub show { 281sub show {
282 my ($self) = @_; 282 my ($self) = @_;
283 283
… …
956 $self->emit (changed => $x, $y); 956 $self->emit (changed => $x, $y);
957 $self->update; 957 $self->update;
958 } 958 }
959} 959}
960 960
961sub set_center {
962 my ($self, $x, $y) = @_;
963
964 $self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
965}
966
967sub make_visible {
968 my ($self, $x, $y, $border) = @_;
969
970 if ( $x < $self->{view_x} + $self->{w} * $border
971 || $x > $self->{view_x} + $self->{w} * (1 - $border)
972 || $y < $self->{view_y} + $self->{h} * $border
973 || $y > $self->{view_y} + $self->{h} * (1 - $border)
974 ) {
975 $self->set_center ($x, $y);
976 }
977}
978
961# hmm, this does not work for topleft of $self... but we should not ask for that 979# hmm, this does not work for topleft of $self... but we should not ask for that
962sub coord2local { 980sub coord2local {
963 my ($self, $x, $y) = @_; 981 my ($self, $x, $y) = @_;
964 982
965 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y}) 983 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
… …
1009 my $child = delete $arg{child}; 1027 my $child = delete $arg{child};
1010 1028
1011 my $self; 1029 my $self;
1012 1030
1013 my $hslider = new CFPlus::UI::Slider 1031 my $hslider = new CFPlus::UI::Slider
1014 col => 0, 1032 c_col => 0,
1015 row => 1, 1033 c_row => 1,
1016 vertical => 0, 1034 vertical => 0,
1017 range => [0, 0, 1, 0.01], # HACK fix 1035 range => [0, 0, 1, 0.01], # HACK fix
1018 on_changed => sub { 1036 on_changed => sub {
1019 $self->{hpos} = $_[1]; 1037 $self->{hpos} = $_[1];
1020 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1038 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1021 }, 1039 },
1022 ; 1040 ;
1023 1041
1024 my $vslider = new CFPlus::UI::Slider 1042 my $vslider = new CFPlus::UI::Slider
1025 col => 1, 1043 c_col => 1,
1026 row => 0, 1044 c_row => 0,
1027 vertical => 1, 1045 vertical => 1,
1028 range => [0, 0, 1, 0.01], # HACK fix 1046 range => [0, 0, 1, 0.01], # HACK fix
1029 on_changed => sub { 1047 on_changed => sub {
1030 $self->{vpos} = $_[1]; 1048 $self->{vpos} = $_[1];
1031 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos}); 1049 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
… …
1042 row_expand => [1, 0], 1060 row_expand => [1, 0],
1043 %arg, 1061 %arg,
1044 ); 1062 );
1045 1063
1046 $self->{vp} = new CFPlus::UI::ViewPort 1064 $self->{vp} = new CFPlus::UI::ViewPort
1047 col => 0, 1065 c_col => 0,
1048 row => 0, 1066 c_row => 0,
1049 expand => 1, 1067 expand => 1,
1050 scroll_x => $self->{scroll_x}, 1068 scroll_x => $self->{scroll_x},
1051 scroll_y => $self->{scroll_y}, 1069 scroll_y => $self->{scroll_y},
1052 on_changed => sub { 1070 on_changed => sub {
1053 my ($vp, $x, $y) = @_; 1071 my ($vp, $x, $y) = @_;
… …
1074sub add { 1092sub add {
1075 my ($self, $widget) = @_; 1093 my ($self, $widget) = @_;
1076 1094
1077 $self->{vp}->add ($self->{child} = $widget); 1095 $self->{vp}->add ($self->{child} = $widget);
1078} 1096}
1097
1098sub set_offset { shift->{vp}->set_offset (@_) }
1099sub set_center { shift->{vp}->set_center (@_) }
1100sub make_visible { shift->{vp}->make_visible (@_) }
1079 1101
1080sub update_slider { 1102sub update_slider {
1081 my ($self) = @_; 1103 my ($self) = @_;
1082 1104
1083 my $child = ($self->{vp} or return)->child; 1105 my $child = ($self->{vp} or return)->child;
… …
1576 1598
1577sub add { 1599sub add {
1578 my ($self, @widgets) = @_; 1600 my ($self, @widgets) = @_;
1579 1601
1580 for my $child (@widgets) { 1602 for my $child (@widgets) {
1581 $child->{rowspan} ||= 1; 1603 $child->{c_rowspan} ||= 1;
1582 $child->{colspan} ||= 1; 1604 $child->{c_colspan} ||= 1;
1583 } 1605 }
1584 1606
1585 $self->SUPER::add (@widgets); 1607 $self->SUPER::add (@widgets);
1586} 1608}
1587 1609
… …
1591 my @widgets; 1613 my @widgets;
1592 1614
1593 while (@_) { 1615 while (@_) {
1594 my ($col, $row, $child) = splice @_, 0, 3, (); 1616 my ($col, $row, $child) = splice @_, 0, 3, ();
1595 1617
1596 $child->{row} = $row; 1618 $child->{c_row} = $row;
1597 $child->{col} = $col; 1619 $child->{c_col} = $col;
1598 1620
1599 push @widgets, $child; 1621 push @widgets, $child;
1600 } 1622 }
1601 1623
1602 $self->add (@widgets); 1624 $self->add (@widgets);
… …
1608 my (@w, @h); 1630 my (@w, @h);
1609 1631
1610 my @children = $self->children; 1632 my @children = $self->children;
1611 1633
1612 # first pass, columns 1634 # first pass, columns
1613 for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) { 1635 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1614 my ($c, $w, $cs) = @$widget{qw(col req_w colspan)}; 1636 my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1615 1637
1616 my $sw = sum @w[$c .. $c + $cs - 1]; 1638 my $sw = sum @w[$c .. $c + $cs - 1];
1617 1639
1618 if ($w > $sw) { 1640 if ($w > $sw) {
1619 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1]; 1641 $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1620 } 1642 }
1621 } 1643 }
1622 1644
1623 # second pass, rows 1645 # second pass, rows
1624 for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) { 1646 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1625 my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)}; 1647 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1626 1648
1627 my $sh = sum @h[$r .. $r + $rs - 1]; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
1628 1650
1629 if ($h > $sh) { 1651 if ($h > $sh) {
1630 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1]; 1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
… …
1672 1694
1673 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] } 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1674 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] } 1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1675 1697
1676 for my $widget ($self->children) { 1698 for my $widget ($self->children) {
1677 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)}; 1699 my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1678 1700
1679 $widget->configure ( 1701 $widget->configure (
1680 $x[$c], $y[$r], 1702 $x[$c], $y[$r],
1681 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r], 1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1682 ); 1704 );
… …
1901 1923
1902 delete $self->{ox}; 1924 delete $self->{ox};
1903 $self->SUPER::realloc; 1925 $self->SUPER::realloc;
1904} 1926}
1905 1927
1928sub clear {
1929 my ($self) = @_;
1930
1931 $self->set_text ("");
1932}
1933
1906sub set_text { 1934sub set_text {
1907 my ($self, $text) = @_; 1935 my ($self, $text) = @_;
1908 1936
1909 return if $self->{text} eq "T$text"; 1937 return if $self->{text} eq "T$text";
1910 $self->{text} = "T$text"; 1938 $self->{text} = "T$text";
… …
2016 : ($self->{w} - $size->[0]) * 0.5); 2044 : ($self->{w} - $size->[0]) * 0.5);
2017 2045
2018 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 2046 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2019 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y} 2047 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2020 : ($self->{h} - $size->[1]) * 0.5); 2048 : ($self->{h} - $size->[1]) * 0.5);
2049
2050 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2021 }; 2051 };
2022 2052
2023# unless ($self->{list}) { 2053# unless ($self->{list}) {
2024# $self->{list} = CFPlus::OpenGL::glGenList; 2054# $self->{list} = CFPlus::OpenGL::glGenList;
2025# CFPlus::OpenGL::glNewList $self->{list}; 2055# CFPlus::OpenGL::glNewList $self->{list};
… …
2027# CFPlus::OpenGL::glEndList; 2057# CFPlus::OpenGL::glEndList;
2028# } 2058# }
2029# 2059#
2030# CFPlus::OpenGL::glCallList $self->{list}; 2060# CFPlus::OpenGL::glCallList $self->{list};
2031 2061
2032 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style}); 2062 $self->{layout}->draw;
2033} 2063}
2034 2064
2035#sub destroy { 2065#sub destroy {
2036# my ($self) = @_; 2066# my ($self) = @_;
2037# 2067#
… …
2052 my $class = shift; 2082 my $class = shift;
2053 2083
2054 $class->SUPER::new ( 2084 $class->SUPER::new (
2055 fg => [1, 1, 1], 2085 fg => [1, 1, 1],
2056 bg => [0, 0, 0, 0.2], 2086 bg => [0, 0, 0, 0.2],
2087 outline => [0.6, 0.3, 0.1],
2057 active_bg => [1, 1, 1, 0.5], 2088 active_bg => [0, 0, 1, .2],
2058 active_fg => [0, 0, 0], 2089 active_fg => [1, 1, 1],
2090 active_outline => [1, 1, 0],
2059 can_hover => 1, 2091 can_hover => 1,
2060 can_focus => 1, 2092 can_focus => 1,
2061 valign => 0, 2093 valign => 0,
2062 can_events => 1, 2094 can_events => 1,
2063 ellipsise => 0, 2095 ellipsise => 0,
… …
2220 2252
2221 unless (exists $self->{cur_h}) { 2253 unless (exists $self->{cur_h}) {
2222 my $text = substr $self->{text}, 0, $self->{cursor}; 2254 my $text = substr $self->{text}, 0, $self->{cursor};
2223 utf8::encode $text; 2255 utf8::encode $text;
2224 2256
2225 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 2257 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2226 } 2258 }
2227 2259
2260 glColor_premultiply @{$self->{active_fg}};
2228 glBegin GL_LINES; 2261 glBegin GL_LINES;
2229 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2262 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
2230 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h}; 2263 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2264 glEnd;
2265
2266 glLineWidth 3;
2267 glColor @{$self->{active_outline}};
2268 glBegin GL_LINE_LOOP;
2269 glVertex 0, 0;
2270 glVertex $self->{w} - 1, 0;
2271 glVertex $self->{w} - 1, $self->{h} - 1;
2272 glVertex 0, $self->{h} - 1;
2273 glEnd;
2274 glLineWidth 1;
2275
2276 } else {
2277 glColor @{$self->{outline}};
2278 glTranslate .375, .375;
2279 glBegin GL_LINE_STRIP;
2280 glVertex 0, $self->{h} * .5;
2281 glVertex 0, $self->{h} - 3;
2282 glVertex $self->{w} - 1, $self->{h} - 3;
2283 glVertex $self->{w} - 1, $self->{h} * .5;
2231 glEnd; 2284 glEnd;
2232 } 2285 }
2233} 2286}
2234 2287
2235############################################################################# 2288#############################################################################
… …
2322 1 2375 1
2323} 2376}
2324 2377
2325############################################################################# 2378#############################################################################
2326 2379
2380package CFPlus::UI::ButtonBin;
2381
2382our @ISA = CFPlus::UI::Bin::;
2383
2384use CFPlus::OpenGL;
2385
2386my @tex =
2387 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2388 qw(b1_button_inactive.png b1_button_active.png);
2389
2390sub new {
2391 my $class = shift;
2392
2393 $class->SUPER::new (
2394 can_hover => 1,
2395 align => 0,
2396 valign => 0,
2397 can_events => 1,
2398 @_
2399 )
2400}
2401
2402sub invoke_button_up {
2403 my ($self, $ev, $x, $y) = @_;
2404
2405 $self->emit ("activate")
2406 if $x >= 0 && $x < $self->{w}
2407 && $y >= 0 && $y < $self->{h};
2408
2409 1
2410}
2411
2412sub _draw {
2413 my ($self) = @_;
2414
2415 glEnable GL_TEXTURE_2D;
2416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2417 glColor 0, 0, 0, 1;
2418
2419 my $tex = $tex[$GRAB == $self];
2420 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2421
2422 glDisable GL_TEXTURE_2D;
2423
2424 $self->SUPER::_draw;
2425}
2426
2427#############################################################################
2428
2327package CFPlus::UI::Button; 2429package CFPlus::UI::Button;
2328 2430
2329our @ISA = CFPlus::UI::Label::; 2431our @ISA = CFPlus::UI::Label::;
2330 2432
2331use CFPlus::OpenGL; 2433use CFPlus::OpenGL;
… …
2465sub new { 2567sub new {
2466 my $class = shift; 2568 my $class = shift;
2467 2569
2468 my $self = $class->SUPER::new ( 2570 my $self = $class->SUPER::new (
2469 can_events => 0, 2571 can_events => 0,
2572 scale => 1,
2470 @_, 2573 @_,
2471 ); 2574 );
2472 2575
2473 $self->{path} || $self->{tex} 2576 $self->{path} || $self->{tex}
2474 or Carp::croak "'path' or 'tex' attributes required"; 2577 or Carp::croak "'path' or 'tex' attributes required";
… …
2499} 2602}
2500 2603
2501sub size_request { 2604sub size_request {
2502 my ($self) = @_; 2605 my ($self) = @_;
2503 2606
2504 ($self->{tex}{w}, $self->{tex}{h}) 2607 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2505} 2608}
2506 2609
2507sub _draw { 2610sub _draw {
2508 my ($self) = @_; 2611 my ($self) = @_;
2509 2612
… …
2519 } 2622 }
2520 2623
2521 glEnable GL_TEXTURE_2D; 2624 glEnable GL_TEXTURE_2D;
2522 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2625 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2523 2626
2524 $tex->draw_quad (0, 0, $w, $h); 2627 $tex->draw_quad_alpha (0, 0, $w, $h);
2525 2628
2526 glDisable GL_TEXTURE_2D; 2629 glDisable GL_TEXTURE_2D;
2527} 2630}
2528 2631
2529############################################################################# 2632#############################################################################
… …
2548 align => 0, 2651 align => 0,
2549 valign => 0, 2652 valign => 0,
2550 can_events => 1, 2653 can_events => 1,
2551 @_ 2654 @_
2552 ); 2655 );
2656}
2657
2658sub invoke_button_down {
2659 my ($self, $ev, $x, $y) = @_;
2660
2661 1
2553} 2662}
2554 2663
2555sub invoke_button_up { 2664sub invoke_button_up {
2556 my ($self, $ev, $x, $y) = @_; 2665 my ($self, $ev, $x, $y) = @_;
2557 2666
… …
3203 3312
3204 if ($y0 < $y + $h && $y < $y1) { 3313 if ($y0 < $y + $h && $y < $y1) {
3205 my $layout = $self->get_layout ($para); 3314 my $layout = $self->get_layout ($para);
3206 3315
3207 $layout->render ($para->{indent}, $y - $y0); 3316 $layout->render ($para->{indent}, $y - $y0);
3317 $layout->draw;
3208 3318
3209 if (my @w = @{ $para->{widget} }) { 3319 if (my @w = @{ $para->{widget} }) {
3210 my @s = $layout->get_shapes; 3320 my @s = $layout->get_shapes;
3211 3321
3212 for (@w) { 3322 for (@w) {
… …
3403 glTranslate 0.375, 0.375; 3513 glTranslate 0.375, 0.375;
3404 3514
3405 my ($w, $h) = @$self{qw(w h)}; 3515 my ($w, $h) = @$self{qw(w h)};
3406 3516
3407 glColor 1, 0.8, 0.4; 3517 glColor 1, 0.8, 0.4;
3408 glBegin GL_QUADS; 3518 glRect 0, 0, $w, $h;
3409 glVertex 0 , 0;
3410 glVertex 0 , $h;
3411 glVertex $w, $h;
3412 glVertex $w, 0;
3413 glEnd;
3414 3519
3415 glColor 0, 0, 0; 3520 glColor 0, 0, 0;
3416 glBegin GL_LINE_LOOP; 3521 glBegin GL_LINE_LOOP;
3417 glVertex 0 , 0; 3522 glVertex 0 , 0;
3418 glVertex 0 , $h; 3523 glVertex 0 , $h;
… …
3450 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed}; 3555 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3451 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed}; 3556 $widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3452 $self->{timer} = Event->timer ( 3557 $self->{timer} = Event->timer (
3453 parked => 1, 3558 parked => 1,
3454 cb => sub { 3559 cb => sub {
3455 return unless $::CONN && $widget; 3560 return unless $::CONN;
3456 3561
3562 my $w = $widget
3563 or return;
3564
3457 ++$widget->{frame}; 3565 ++$w->{frame};
3458 $widget->update_face; 3566 $w->update_face;
3567
3568 # somehow, $widget can go away
3459 $widget->update; 3569 $w->update;
3460
3461 $widget->update_timer; 3570 $w->update_timer;
3462 }, 3571 },
3463 ); 3572 );
3464 3573
3465 $self->update_face; 3574 $self->update_face;
3466 $self->update_timer; 3575 $self->update_timer;
… …
3493 3602
3494 if (my $anim = $::CONN->{anim}[$self->{anim}]) { 3603 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3495 if ($anim && @$anim) { 3604 if ($anim && @$anim) {
3496 delete $self->{wait_face}; 3605 delete $self->{wait_face};
3497 $self->{face} = $anim->[ $self->{frame} % @$anim ]; 3606 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3498 $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]; 3607 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]) {
3608 unless ($tex->{name} || $tex->{loading}) {
3609 $tex->upload (sub { $self->reconfigure });
3610 }
3611 }
3499 } 3612 }
3500 } 3613 }
3501} 3614}
3502 3615
3503sub size_request { 3616sub size_request {
3504 my ($self) = @_; 3617 my ($self) = @_;
3505 3618
3506 if ($::CONN) { 3619 if ($::CONN) {
3507 if (my $faceid = $::CONN->{faceid}[$self->{face}]) { 3620 if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
3508 if (my $tex = $::CONN->{texture}[$faceid]) { 3621 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3509 $self->{tex} = $tex; 3622 if ($tex->{name}) {
3510 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h}); 3623 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3624 } elsif (!$tex->{loading}) {
3625 $tex->upload (sub { $self->reconfigure });
3626 }
3511 } else { 3627 } else {
3512 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub { 3628 $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3513 $self->realloc; 3629 $self->reconfigure;
3514 }); 3630 });
3515 } 3631 }
3516 } 3632 }
3517 } 3633 }
3518 3634
… …
3600 children => [ 3716 children => [
3601 (new CFPlus::UI::Label markup => $left, expand => 1), 3717 (new CFPlus::UI::Label markup => $left, expand => 1),
3602 (new CFPlus::UI::Label markup => $right, align => +1), 3718 (new CFPlus::UI::Label markup => $right, align => +1),
3603 ], 3719 ],
3604 ; 3720 ;
3605 3721
3606 } else { 3722 } else {
3607 $widget = new CFPlus::UI::Label 3723 $widget = new CFPlus::UI::Label
3608 can_hover => 1, 3724 can_hover => 1,
3609 can_events => 1, 3725 can_events => 1,
3610 markup => $widget, 3726 markup => $widget,
… …
3746 buttonbar => (new CFPlus::UI::Buttonbar), 3862 buttonbar => (new CFPlus::UI::Buttonbar),
3747 multiplexer => (new CFPlus::UI::Multiplexer expand => 1), 3863 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3748 # filter => # will be put between multiplexer and $self 3864 # filter => # will be put between multiplexer and $self
3749 @_, 3865 @_,
3750 ); 3866 );
3751 3867
3752 $self->{filter}->add ($self->{multiplexer}) if $self->{filter}; 3868 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3753 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer}); 3869 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3754 3870
3755 { 3871 {
3756 Scalar::Util::weaken (my $wself = $self); 3872 Scalar::Util::weaken (my $wself = $self);
… …
3797 3913
3798sub remove { 3914sub remove {
3799 my ($self, @widgets) = @_; 3915 my ($self, @widgets) = @_;
3800 3916
3801 $self->{multiplexer}->remove (@widgets) 3917 $self->{multiplexer}->remove (@widgets)
3918}
3919
3920sub pages {
3921 my ($self) = @_;
3922 $self->{multiplexer}->children
3802} 3923}
3803 3924
3804sub add_tab { 3925sub add_tab {
3805 my ($self, $title, $widget, $tooltip) = @_; 3926 my ($self, $title, $widget, $tooltip) = @_;
3806 3927
… …
4098} 4219}
4099 4220
4100sub update { 4221sub update {
4101 my ($self) = @_; 4222 my ($self) = @_;
4102 4223
4103 $::WANT_REFRESH++; 4224 $::WANT_REFRESH->start;
4104} 4225}
4105 4226
4106sub add { 4227sub add {
4107 my ($self, @children) = @_; 4228 my ($self, @children) = @_;
4108 4229

Diff Legend

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