solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Save last wxSplitterWindow position before it was unsplit

Browse source 
Use this position when the window is split again and also save and
restore it from persistent storage in wxPersistentSplitter.

Closes #24329.
This commit is contained in:
Doukas Dergiades 2024-02-12 04:17:53 +02:00 • committed by Vadim Zeitlin
parent 7bf295802e
commit f24b3d5483
4 changed files with 91 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/wx/generic/splitter.h
View file

@ -226,6 +226,15 @@ public:
// all any more.
wxDEPRECATED_INLINE( void SetSashSize(int WXUNUSED(width)), return; )
// Get the sash position that was last used before Unsplit() was called.
// Horizontal and vertical components correspond to the split in the
// corresponding direction, and are 0 if the splitter hadn't been split in
// this direction at all.
wxPoint GetLastSplitPosition() const;
// Set the default initial sash position to use when the splitter is split.
void SetLastSplitPosition(const wxPoint& pos);
protected:
// event handlers
#if defined(__WXMSW__) || defined(__WXMAC__)
@ -289,6 +298,7 @@ protected:
wxPoint m_ptStart; // mouse position when dragging started
int m_sashStart; // sash position when dragging started
int m_minimumPaneSize;
wxPoint m_lastSplitPosition;
wxCursor m_sashCursorWE;
wxCursor m_sashCursorNS;
wxOverlay m_overlay;

19
include/wx/persist/splitter.h
View file

@ -23,6 +23,9 @@
// Special position value of -1 means the splitter is not split at all.
#define wxPERSIST_SPLITTER_POSITION wxASCII_STR("Position")
#define wxPERSIST_SPLITTER_DEFAULT_HORIZONTAL wxASCII_STR("LastHorz")
#define wxPERSIST_SPLITTER_DEFAULT_VERTICAL wxASCII_STR("LastVert")
// ----------------------------------------------------------------------------
// wxPersistentSplitter: supports saving/restoring splitter position
// ----------------------------------------------------------------------------
@ -41,6 +44,14 @@ public:
int pos = splitter->IsSplit() ? splitter->GetSashPosition() : -1;
SaveValue(wxPERSIST_SPLITTER_POSITION, pos);
// Save the previously used position too if we have them.
const wxPoint lastSplitPos = splitter->GetLastSplitPosition();
if ( lastSplitPos.x || lastSplitPos.y )
{
SaveValue(wxPERSIST_SPLITTER_DEFAULT_HORIZONTAL, lastSplitPos.y);
SaveValue(wxPERSIST_SPLITTER_DEFAULT_VERTICAL, lastSplitPos.x);
}
}
virtual bool Restore() override
@ -54,6 +65,14 @@ public:
else
Get()->SetSashPosition(pos);
// Note that it's possible that default position was not stored, in
// which case lastSplitPos will just remain as (0, 0) and that's ok.
wxPoint lastSplitPos;
RestoreValue(wxPERSIST_SPLITTER_DEFAULT_HORIZONTAL, &lastSplitPos.x);
RestoreValue(wxPERSIST_SPLITTER_DEFAULT_VERTICAL, &lastSplitPos.y);
Get()->SetLastSplitPosition(lastSplitPos);
return true;
}