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.101 by elmex, Fri Apr 14 11:43:51 2006 UTC vs.
Revision 1.104 by elmex, Fri Apr 14 14:02:52 2006 UTC

… …
1255 1255
1256package CFClient::UI::CheckBox; 1256package CFClient::UI::CheckBox;
1257 1257
1258our @ISA = CFClient::UI::DrawBG::; 1258our @ISA = CFClient::UI::DrawBG::;
1259 1259
1260my @tex =
1261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1262 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1263
1260use SDL; 1264use SDL;
1261use SDL::OpenGL; 1265use SDL::OpenGL;
1262 1266
1263sub new { 1267sub new {
1264 my $class = shift; 1268 my $class = shift;
… …
1301 $self->SUPER::_draw; 1305 $self->SUPER::_draw;
1302 1306
1303 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1307 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1304 1308
1305 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1309 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1306 1310
1307 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1311 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1308 1312
1309 glBegin GL_LINE_LOOP; 1313 glEnable GL_BLEND;
1310 glVertex 0 , 0; 1314 glEnable GL_TEXTURE_2D;
1311 glVertex 0 , $s; 1315 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1312 glVertex $s, $s;
1313 glVertex $s, 0;
1314 glEnd;
1315 1316
1316 if ($self->{state}) { 1317 my $tex = $self->{state} ? $tex[1] : $tex[0];
1317 glBegin GL_LINES; 1318
1318 glVertex 0 , 0; 1319 $tex->draw_quad (0, 0, $s, $s);
1319 glVertex $s, $s; 1320
1320 glVertex $s, 0; 1321 glDisable GL_TEXTURE_2D;
1321 glVertex 0 , $s; 1322 glDisable GL_BLEND;
1322 glEnd;
1323 }
1324} 1323}
1325 1324
1326############################################################################# 1325#############################################################################
1327 1326
1328package CFClient::UI::Slider; 1327package CFClient::UI::Slider;
… …
1351 range => [0, 0, 100, 10], 1350 range => [0, 0, 100, 10],
1352 req_w => 40, 1351 req_w => 40,
1353 req_h => 13, 1352 req_h => 13,
1354 vertical => 0, 1353 vertical => 0,
1355 can_hover => 1, 1354 can_hover => 1,
1355 inner_pad => 5,
1356 @_ 1356 @_
1357 ); 1357 );
1358 1358
1359 $self 1359 $self
1360} 1360}
… …
1381 if ($GRAB == $self) { 1381 if ($GRAB == $self) {
1382 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1382 my ($value, $lo, $hi, $page) = @{$self->{range}};
1383 1383
1384 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 1384 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1385 1385
1386 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1387 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1388
1389 $x -= $inner_pad_px; # substract the padding
1386 $x = $x * ($hi - $lo) / $w + $lo; 1390 $x = $x * ($hi - $lo) / $inner_w + $lo;
1387 $x = $lo if $x < $lo; 1391 $x = $lo if $x < $lo;
1388 $x = $hi - $page if $x > $hi - $page; 1392 $x = $hi - $page if $x > $hi - $page;
1389 $self->{range}[0] = $x; 1393 $self->{range}[0] = $x;
1390 1394
1391 $self->emit (changed => $x); 1395 $self->emit (changed => $x);
1392 $self->update; 1396 $self->update;
1393 } 1397 }
1398}
1399
1400# the inner_* stuff is for generating a padding for the slider handle,
1401# so that the handle doesn't leave the texture. This calculation isn't 100%
1402# correct propably, but it does the job for now
1403sub _calc_inner_pad_px {
1404 my ($self, $w) = @_;
1405 ($w / 100) * $self->{inner_pad} # % to pixels
1394} 1406}
1395 1407
1396sub _draw { 1408sub _draw {
1397 my ($self) = @_; 1409 my ($self) = @_;
1398 1410
… …
1412 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1424 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1413 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1425 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1414 1426
1415 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1427 my ($value, $lo, $hi, $page) = @{$self->{range}};
1416 1428
1417 # the inner_* stuff is for generating a padding for the slider handle, 1429 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1418 # so that the handle doesn't leave the texture. This calculation isn't 100%
1419 # correct propably, but it does the job for now
1420 my $inner_pad = 5; # 5% of width for slider bg texture border
1421 my $inner_pad_px = ($w / 100) * $inner_pad; # % to pixels
1422 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 1430 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1423 1431
1424 $page = int $page * $inner_w / ($hi - $lo); 1432 $page = int $page * $inner_w / ($hi - $lo);
1425 $value = int +($value - $lo) * $inner_w / ($hi - $lo); 1433 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1426 1434
1427 $w -= $page; 1435 $w -= $page;
… …
1654 $::CONN->user_send ("command stay fire"); 1662 $::CONN->user_send ("command stay fire");
1655 } elsif ($sym == SDLK_a) { 1663 } elsif ($sym == SDLK_a) {
1656 $::CONN->user_send ("command apply"); 1664 $::CONN->user_send ("command apply");
1657 } elsif ($sym == SDLK_QUOTE) { 1665 } elsif ($sym == SDLK_QUOTE) {
1658 $self->emit ('activate_console'); 1666 $self->emit ('activate_console');
1667 } elsif ($sym == SDLK_SLASH) {
1668 $self->emit ('activate_console' => '/');
1659 } elsif (exists $DIR{$sym}) { 1669 } elsif (exists $DIR{$sym}) {
1660 if ($mod & KMOD_SHIFT) { 1670 if ($mod & KMOD_SHIFT) {
1661 $self->{shft}++; 1671 $self->{shft}++;
1662 $::CONN->user_send ("command fire $DIR{$sym}[0]"); 1672 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1663 } elsif ($mod & KMOD_CTRL) { 1673 } elsif ($mod & KMOD_CTRL) {

Diff Legend

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