Changeset 11089

Timestamp:

03/13/10 00:33:54 (6 months ago)

Author:

adamk

Message:

Dumping display geometry works

Files:

• trunk/Padre/lib/Padre/Plugin/Devel.pm (modified) (3 diffs)

trunk/Padre/lib/Padre/Plugin/Devel.pm

@@ -67 +67 @@
                 Wx::gettext('Dump Current PPI Tree') => 'dump_ppi',
                 Wx::gettext('Dump %INC and @INC')    => 'dump_inc',
-                Wx::gettext('Dump Display Data')     => 'dump_display',
+                Wx::gettext('Dump Display Geometry') => 'dump_display',
                 Wx::gettext('Start/Stop sub trace')  => 'trace_sub_startstop',
 
@@ -132 +132 @@
 }
 
-
 sub dump_document {
         my $self     = shift;
@@ -183 +182 @@
 sub dump_display {
         my $self     = shift;
-        my $count    = Wx::Display->GetCount;
         my @displays = ();
-        foreach ( 0 .. $count ) {
-                my $display = Wx::Display->new($_);
+
+        # Due to the way it is mapped into Wx.pm
+        # this must NOT be called as a method.
+        my $count = Wx::Display::GetCount();
+
+        foreach ( 0 .. $count - 1 ) {
+                my $display  = Wx::Display->new($_);
                 push @displays,
                         {
                         IsPrimary     => $display->IsPrimary,
-                        GetGeometry   => $display->GetGeometry,
-                        GetClientArea => $display->GetClientArea,
+                        GetGeometry   => $self->_rect($display->GetGeometry),
+                        GetClientArea => $self->_rect($display->GetClientArea),
                         };
         }
         $self->_dump(
-                {   GetCount    => $count,
+                {  GetCount    => $count,
                         DisplayList => \@displays,
                 }
         );
+}
+
+sub _rect {
+        my $self = shift;
+        my $rect = shift;
+        my %hash = map {
+                $_ => $rect->$_()
+        } qw{
+                GetTop
+                GetBottom
+                GetLeft
+                GetRight
+                GetHeight
+                GetWidth
+        };
+        $hash{wx} = $rect;
+        return \%hash;
 }