Changeset 486c619 in git

Timestamp:

21/01/14 02:16:12 (6 years ago)

Author:

Olly Betts <olly@…>

Branches:

line_contents, master, stereo, travis-osx

Children:

08e858b

Parents:

fb941bfd

Message:

src/mainfrm.cc,src/mainfrm.h: If full screen, don't recreate the
side panel when a new file is opened (e.g. via Ctrl+O).

Files:

• ChangeLog (modified) (1 diff)
• src/mainfrm.cc (modified) (4 diffs)
• src/mainfrm.h (modified) (1 diff)

ChangeLog

@@ +1 @@
+Tue Jan 21 02:15:38 GMT 2014  Olly Betts <olly@survex.com>
+
+        * src/mainfrm.cc,src/mainfrm.h: If full screen, don't recreate the
+          side panel when a new file is opened (e.g. via Ctrl+O).
+
 Mon Jan 20 05:33:04 GMT 2014  Olly Betts <olly@survex.com>
 

src/mainfrm.cc

@@ -688 +688 @@
 MainFrm::MainFrm(const wxString& title, const wxPoint& pos, const wxSize& size) :
     wxFrame(NULL, 101, title, pos, size, wxDEFAULT_FRAME_STYLE),
+    m_SashPosition(-1),
     m_Gfx(NULL), m_NumEntrances(0), m_NumFixedPts(0), m_NumExportedPts(0),
     m_NumHighlighted(0),
@@ -1707 +1708 @@
 void MainFrm::InitialiseAfterLoad(const wxString & file)
 {
-    int x;
-    int y;
-    GetClientSize(&x, &y);
-    if (x < 600)
-        x /= 3;
-    else if (x < 1000)
-        x = 200;
-    else
-        x /= 5;
+    if (m_SashPosition < 0) {
+        // Calculate sane default width for side panel.
+        int x;
+        int y;
+        GetClientSize(&x, &y);
+        if (x < 600)
+            x /= 3;
+        else if (x < 1000)
+            x = 200;
+        else
+            x /= 5;
+        m_SashPosition = x;
+    }
 
     // Do this before we potentially delete the log window which may own the
@@ -1748 +1753 @@
     }
 
-    m_Splitter->SplitVertically(m_Notebook, m_Gfx, x);
-    m_SashPosition = x; // Save width of panel.
+    if (!IsFullScreen()) {
+        m_Splitter->SplitVertically(m_Notebook, m_Gfx, m_SashPosition);
+    } else {
+        was_showing_sidepanel_before_fullscreen = true;
+    }
 
     m_Gfx->Initialise(same_file);
-    m_Notebook->Show(true);
+    if (!IsFullScreen()) {
+        m_Notebook->Show(true);
+    }
 
     m_Gfx->Show(true);
@@ -2558 +2568 @@
 void MainFrm::ViewFullScreen() {
     ShowFullScreen(!IsFullScreen());
-    static bool sidepanel;
-    if (IsFullScreen()) sidepanel = ShowingSidePanel();
-    if (sidepanel) ToggleSidePanel();
-}
+    if (IsFullScreen())
+        was_showing_sidepanel_before_fullscreen = ShowingSidePanel();
+    if (was_showing_sidepanel_before_fullscreen)
+        ToggleSidePanel();
+}

src/mainfrm.h

@@ -217 +217 @@
     wxFileHistory m_history;
     int m_SashPosition;
+    bool was_showing_sidepanel_before_fullscreen;
     list<traverse> traverses;
     list<traverse> surface_traverses;