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.380 by root, Tue Jul 17 17:39:07 2007 UTC vs.
Revision 1.385 by root, Fri Jul 20 16:32:17 2007 UTC

… …
1093 1093
1094 0 1094 0
1095 }, 1095 },
1096 ; 1096 ;
1097 1097
1098 $self->SUPER::add (0, 0, $self->{vp}); 1098 $self->SUPER::add_at (0, 0, $self->{vp});
1099 1099
1100 $self->add ($child) if $child; 1100 $self->add ($child) if $child;
1101 1101
1102 $self 1102 $self
1103} 1103}
… …
1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w}); 1118 my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]); 1119 $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120 1120
1121 my $visible = $w1 > $w2; 1121 my $visible = $w1 > $w2;
1122 if ($visible != $self->{hslider}{visible}) { 1122 if ($visible != $self->{hslider}{visible}) {
1123 $visible ? $self->SUPER::add (0, 1, $self->{hslider}) 1123 $visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
1124 : $self->{hslider}->hide; 1124 : $self->{hslider}->hide;
1125 } 1125 }
1126 1126
1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h}); 1127 my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1128 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]); 1128 $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1129 1129
1130 my $visible = $h1 > $h2; 1130 my $visible = $h1 > $h2;
1131 if ($visible != $self->{vslider}{visible}) { 1131 if ($visible != $self->{vslider}{visible}) {
1132 $visible ? $self->SUPER::add (1, 0, $self->{vslider}) 1132 $visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
1133 : $self->{vslider}->hide; 1133 : $self->{vslider}->hide;
1134 } 1134 }
1135} 1135}
1136 1136
1137sub update { 1137sub update {
… …
1355 1355
1356my @border = 1356my @border =
1357 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 1357 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1358 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1358 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1359 1359
1360my @icon =
1361 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1362 qw(x1_move.png x1_resize.png);
1363
1360sub new { 1364sub new {
1361 my ($class, %arg) = @_; 1365 my ($class, %arg) = @_;
1362 1366
1363 my $self = $class->SUPER::new ( 1367 my $self = $class->SUPER::new (
1364 bg => [1, 1, 1, 1], 1368 bg => [1, 1, 1, 1],
… …
1532 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1536 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1533 1537
1534 my $border = $self->border; 1538 my $border = $self->border;
1535 1539
1536 glColor @{ $self->{border_bg} }; 1540 glColor @{ $self->{border_bg} };
1537 $border[0]->draw_quad_alpha (0, 0, $w, $border); 1541 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1538 $border[1]->draw_quad_alpha (0, $border, $border, $ch); 1542 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1539 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1543 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1540 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border); 1544 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1545
1546 # move
1547 my $w2 = ($w - $border) * .5;
1548 my $h2 = ($h - $border) * .5;
1549 $icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1550 $icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1551 $icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1552
1553 # resize
1554 $icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1555 $icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1556 unless $self->{has_close_button};
1557 $icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1558 $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1541 1559
1542 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1560 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1543 glColor @{ $self->{bg} }; 1561 glColor @{ $self->{bg} };
1544 1562
1545 # TODO: repeat texture not scale 1563 # TODO: repeat texture not scale
… …
1589 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1607 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1590} 1608}
1591 1609
1592# TODO: store row/col info in child widget and use standard add/del 1610# TODO: store row/col info in child widget and use standard add/del
1593sub add { 1611sub add {
1594 my ($self) = shift; 1612 my $self = shift;
1613
1614 Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
1615 $self->add_at (@_);
1616}
1617
1618sub add_at {
1619 my $self = shift;
1595 1620
1596 while (@_) { 1621 while (@_) {
1597 my ($x, $y, $child) = splice @_, 0, 3, (); 1622 my ($col, $row, $child) = splice @_, 0, 3, ();
1623
1598 $child->set_parent ($self); 1624 $child->set_parent ($self);
1599 $self->{children}[$y][$x] = $child; 1625 $self->{children}[$row][$col] = $child;
1600 } 1626 }
1601 1627
1602 $self->{force_realloc} = 1; 1628 $self->{force_realloc} = 1;
1603 $self->{force_size_alloc} = 1; 1629 $self->{force_size_alloc} = 1;
1604 $self->realloc; 1630 $self->realloc;
… …
2381 2407
2382use CFPlus::OpenGL; 2408use CFPlus::OpenGL;
2383 2409
2384my @tex = 2410my @tex =
2385 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 } 2411 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2386 qw(b1_button_active.png); 2412 qw(b1_button_inactive.png b1_button_active.png);
2387 2413
2388sub new { 2414sub new {
2389 my $class = shift; 2415 my $class = shift;
2390 2416
2391 $class->SUPER::new ( 2417 $class->SUPER::new (
2392 padding_x => 4, 2418 padding_x => 4,
2393 padding_y => 4, 2419 padding_y => 4,
2394 fg => [1, 1, 1], 2420 fg => [1.0, 1.0, 1.0],
2395 active_fg => [0, 0, 1], 2421 active_fg => [0.8, 0.8, 0.8],
2396 can_hover => 1, 2422 can_hover => 1,
2397 align => 0, 2423 align => 0,
2398 valign => 0, 2424 valign => 0,
2399 can_events => 1, 2425 can_events => 1,
2400 @_ 2426 @_
… …
2418 2444
2419 glEnable GL_TEXTURE_2D; 2445 glEnable GL_TEXTURE_2D;
2420 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2446 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2421 glColor 0, 0, 0, 1; 2447 glColor 0, 0, 0, 1;
2422 2448
2449 my $tex = $tex[$GRAB == $self];
2423 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2450 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2424 2451
2425 glDisable GL_TEXTURE_2D; 2452 glDisable GL_TEXTURE_2D;
2426 2453
2427 $self->SUPER::_draw; 2454 $self->SUPER::_draw;
2428} 2455}
… …
4257 while ($self->{post_alloc_hook}) { 4284 while ($self->{post_alloc_hook}) {
4258 $_->() 4285 $_->()
4259 for values %{delete $self->{post_alloc_hook}}; 4286 for values %{delete $self->{post_alloc_hook}};
4260 } 4287 }
4261 4288
4262
4263 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4289 glViewport 0, 0, $::WIDTH, $::HEIGHT;
4264 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4290 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4265 glClear GL_COLOR_BUFFER_BIT; 4291 glClear GL_COLOR_BUFFER_BIT;
4266 4292
4267 glMatrixMode GL_PROJECTION; 4293 glMatrixMode GL_PROJECTION;

Diff Legend

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