ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI/Canvas.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI/Canvas.pm (file contents):
Revision 1.1 by root, Sat Jul 21 16:07:53 2007 UTC vs.
Revision 1.6 by root, Sat Apr 3 02:58:25 2010 UTC

1package CFPlus::UI::Canvas; 1package DC::UI::Canvas;
2 2
3use strict; 3use common::sense;
4use utf8;
5 4
6use List::Util qw(max min); 5use List::Util qw(max min);
7 6
8use CFPlus::OpenGL; 7use DC::OpenGL;
9 8
10our @ISA = CFPlus::UI::Fixed::; 9our @ISA = DC::UI::Fixed::;
11 10
12sub new { 11sub new {
13 my ($class, %arg) = @_; 12 my ($class, %arg) = @_;
14 13
15 my $items = delete $arg{items}; 14 my $items = delete $arg{items};
16 15
17 my $self = $class->SUPER::new ( 16 my $self = $class->SUPER::new (
18 items => [], 17 items => [],
19 @_, 18 @_,
20 ); 19 );
21 20
22 $self->add (@$items) 21 $self->add (@$items)
23 if $items && @$items; 22 if $items && @$items;
46sub size_request { 45sub size_request {
47 my ($self) = @_; 46 my ($self) = @_;
48 47
49 my ($w, $h) = $self->SUPER::size_request; 48 my ($w, $h) = $self->SUPER::size_request;
50 49
51 ((max $w, $self->{item_max_w}), (max $h, $self->{item_max_h})) 50 (
51 (max $w, $self->{item_max_w}),
52 (max $h, $self->{item_max_h}),
53 )
52} 54}
53 55
54my %GLTYPE = ( 56my %GLTYPE = (
55 lines => GL_LINES, 57 lines => GL_LINES,
56 line_strip => GL_LINE_STRIP, 58 line_strip => GL_LINE_STRIP,
82 glEnd; 84 glEnd;
83 } 85 }
84 86
85 glPopMatrix; 87 glPopMatrix;
86 } 88 }
89
90 glLineWidth 1;
91 glPointSize 1;
87} 92}
88 93
891 941
90 95

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines