Changeset 458

Timestamp:

10/25/08 06:38:35 (3 years ago)

Author:

adamk

Message:

Now we use SplitterWindows? the way they are supposed to be used

File:

• trunk/lib/Padre/Wx/MainWindow.pm (modified) (6 diffs, 1 prop)

trunk/lib/Padre/Wx/MainWindow.pm

@@ -80 +80 @@
     $self->GetToolBar->Realize;
 
-    # Create the layout boxes for the main window
+    # Create the status bar
+    $self->{statusbar} = $self->CreateStatusBar;
+    $self->{statusbar}->SetFieldsCount(4);
+    $self->{statusbar}->SetStatusWidths(-1, 100, 50, 100);
+
+    # Create the splitters but do not populate them yet
     $self->{main_panel} = Wx::SplitterWindow->new(
         $self,
@@ -88 +93 @@
         Wx::wxNO_FULL_REPAINT_ON_RESIZE | Wx::wxCLIP_CHILDREN,
     );
+    $self->{main_panel}->SetSashGravity(1);
     $self->{upper_panel} = Wx::SplitterWindow->new(
         $self->{main_panel},
@@ -95 +101 @@
         Wx::wxNO_FULL_REPAINT_ON_RESIZE | Wx::wxCLIP_CHILDREN,
     );
+    $self->{upper_panel}->SetSashGravity(1);
 
     # Create the right-hand sidebar
@@ -136 +143 @@
     );
 
-    # Add the bits to the layout
-    $self->{main_panel}->SplitHorizontally(
+    # Populate the layout
+    $self->{main_panel}->Initialize(
         $self->{upper_panel},
-        $self->{output},
-        $self->window_height,
     );
     $self->{upper_panel}->SplitVertically(
         $self->{notebook},
         $self->{rightbar},
-        $self->window_width - 200,
+        -150,
     );
-
-    # Create the status bar
-    $self->{statusbar} = $self->CreateStatusBar;
-    $self->{statusbar}->SetFieldsCount(4);
-    $self->{statusbar}->SetStatusWidths(-1, 100, 50, 100);
 
     # Special Key Handling
@@ -1116 +1116 @@
 sub show_output {
     my $self = shift;
-    my $on   = shift;
+    my $on   = @_ ? $_[0] ? 1 : 0 : 1;
     unless ( $on == $self->{menu}->{view_output}->IsChecked ) {
         $self->{menu}->{view_output}->Check($on);
     }
-    $self->{main_panel}->SetSashPosition(
-        $self->window_height - ($on ? 300 : 0)
-    );
+    if ( $on and not $self->{main_panel}->IsSplit ) {
+        $self->{main_panel}->SplitHorizontally(
+            $self->{upper_panel},
+            $self->{output},
+            -100,
+        );
+    }
+    if ( $self->{main_panel}->IsSplit and not $on ) {
+        $self->{main_panel}->Unsplit;
+    }
     return;
 }
@@ -1227 +1234 @@
 }
 
-
 1;