Changeset 11098

Timestamp:

03/13/10 05:54:59 (2 years ago)

Author:

adamk

Message:

• New Padre::Wx::Display screen geometry library for handling multiple screens, weird geometry setups and other weird stuff that coders have on their development setups. Padre's main window uses this to calculate an elegant golden-ratio uniform-margin default position and size (ADAMK)

Location:

trunk/Padre

Files:

• Changes (modified) (1 diff)
• lib/Padre/Wx/Display.pm (modified) (3 diffs)
• lib/Padre/Wx/Main.pm (modified) (1 diff)

trunk/Padre/Changes

@@ -15 +15 @@
     - Add language names/translated texts to select_language list (SEWI)
     - Fixed ticket #865 Wrong document type in View Document As (PLAVEN)
+    - New Padre::Wx::Display screen geometry library for handling multiple
+      screens, weird geometry setups and other weird stuff that coders
+      have on their development setups. Padre's main window uses this to
+      calculate an elegant golden-ratio uniform-margin default position
+      and size (ADAMK)
 
 0.58 2010.03.08  **WARNING Still not stable**

trunk/Padre/lib/Padre/Wx/Display.pm

@@ -67 +67 @@
 sub primary_default {
     my $primary = primary();
-    return _rect_scale(
-        _rect_golden(
-            $primary->GetClientArea
+    return _rect_golden(
+        _rect_scale_margin(
+            $primary->GetClientArea,
+            0.9,
         ),
-        0.8,
     );
 }
@@ -104 +104 @@
     my $ratio  = shift;
     my $margin = (1 - $ratio) / 2;
+    $rect->width( int( $rect->width * $ratio ) );
+    $rect->height( int( $rect->height * $ratio ) );
     $rect->x( $rect->x + int($rect->width  * $margin) );
     $rect->y( $rect->y + int($rect->height * $margin) );
-    $rect->width( int( $rect->width * $ratio ) );
-    $rect->height( int( $rect->height * $ratio ) );
+    return $rect;
+}
+
+# Scale a rect by some ration at the centre,
+# while retaining a consistent margin.
+sub _rect_scale_margin {
+    my $rect    = shift;
+    my $ratio   = shift;
+    my $marginr = (1 - $ratio) / 2;
+    my $marginx = int($rect->width  * $marginr);
+    my $marginy = int($rect->height * $marginr);
+    my $margin  = ($marginx > $marginy) ? $marginy : $marginx;
+    $rect->width( $rect->width - $margin * 2 );
+    $rect->height( $rect->height - $margin * 2 );
+    $rect->x( $rect->x + $margin );
+    $rect->y( $rect->y + $margin );
     return $rect;
 }
@@ -114 +130 @@
 sub _rect_golden {
     my $rect = shift;
-    if ( $rect->width > $rect->height * GOLDEN ) {
+    if ( $rect->width > ($rect->height * GOLDEN) ) {
         # Shrink left from the right
-        $rect->width( int($rect->height * GOLDEN) );
+        $rect->width( int($rect->height / GOLDEN) );
     } else {
         # Shrink up from the bottom
-        $rect->height( int($rect->width * GOLDEN) );
+        $rect->height( int($rect->width / GOLDEN) );
     }
     return $rect;

trunk/Padre/lib/Padre/Wx/Main.pm

@@ -100 +100 @@
     Wx::InitAllImageHandlers();
 
-    # Determine the initial frame style
-    my $config = $ide->config;
-    my $style  = Wx::wxDEFAULT_FRAME_STYLE;
+    # Initialise the style and position
+    my $config   = $ide->config;
+    my $size     = [ $config->main_width, $config->main_height ];
+    my $position = [ $config->main_left, $config->main_top ];
+    my $style    = Wx::wxDEFAULT_FRAME_STYLE;
+
+    # If we closed while maximized on the previous run,
+    # the previous size is completely suspect.
     if ( $config->main_maximized ) {
-        $style |= Wx::wxMAXIMIZE;
+        $style   |= Wx::wxMAXIMIZE;
+        $size     = [ -1, -1 ];
+        $position = [ -1, -1 ];
+    }
+
+    # Generate a smarter default size than Wx does
+    if ( $size->[0] == -1 ) {
+        require Padre::Wx::Display;
+        my $rect  = Padre::Wx::Display::primary_default();
+        $size     = $rect->GetSize;
+        $position = $rect->GetPosition;
     }
 
     # Create the underlying Wx frame
     my $self = $class->SUPER::new(
-        undef, -1, 'Padre: New window',
-        [ $config->main_left, $config->main_top, ],
-        [ $config->main_width, $config->main_height, ], $style,
+        undef, -1,
+        'Padre',
+        $position,
+        $size,
+        $style,
     );