Amebis/wxExtend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Perist wxDialogs using new SaveGeometry() method

Browse Source
This commit is contained in:
Simon Rozman 2018-09-07 20:31:01 +02:00
parent a49b49c3b0
commit d6445e458e
2 changed files with 23 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/wxex/persist/auimanager.h
View File

@ -57,7 +57,7 @@ public:
/// ///
/// \returns `wxT(wxPERSIST_AUIMGR_KIND)` /// \returns `wxT(wxPERSIST_AUIMGR_KIND)`
/// ///
virtual wxString GetKind() const virtual wxString GetKind() const wxOVERRIDE
{ {
return wxT(wxPERSIST_AUIMGR_KIND); return wxT(wxPERSIST_AUIMGR_KIND);
} }
@ -65,7 +65,7 @@ public:
/// ///
/// Returns name of the window /// Returns name of the window
/// ///
virtual wxString GetName() const virtual wxString GetName() const wxOVERRIDE
{ {
// Borrow the name of wxAguiManager from its window. // Borrow the name of wxAguiManager from its window.
return GetManager()->GetManagedWindow()->GetName(); return GetManager()->GetManagedWindow()->GetName();
@ -74,7 +74,7 @@ public:
/// ///
/// Saves Aui manager state /// Saves Aui manager state
/// ///
virtual void Save() const virtual void Save() const wxOVERRIDE
{ {
// Save perspective string to configuration. // Save perspective string to configuration.
SaveValue(wxT(wxPERSIST_AUIMGR_PERSPECTIVE), GetManager()->SavePerspective()); SaveValue(wxT(wxPERSIST_AUIMGR_PERSPECTIVE), GetManager()->SavePerspective());
@ -83,7 +83,7 @@ public:
/// ///
/// Restores Aui manager state /// Restores Aui manager state
/// ///
virtual bool Restore() virtual bool Restore() wxOVERRIDE
{ {
// Load perspective string from configuration. // Load perspective string from configuration.
wxString persp; wxString persp;

50
include/wxex/persist/dialog.h
View File

@ -38,7 +38,9 @@
/// ///
/// Supports saving/restoring wxDialog state /// Supports saving/restoring wxDialog state
/// ///
class wxPersistentDialog : public wxPersistentWindow<wxDialog> class wxPersistentDialog :
public wxPersistentWindow<wxDialog>,
private wxTopLevelWindow::GeometrySerializer
{ {
public: public:
/// ///
@ -51,7 +53,7 @@ public:
/// ///
/// \returns `wxT(wxPERSIST_DIALOG_KIND)` /// \returns `wxT(wxPERSIST_DIALOG_KIND)`
/// ///
virtual wxString GetKind() const virtual wxString GetKind() const wxOVERRIDE
{ {
return wxT(wxPERSIST_DIALOG_KIND); return wxT(wxPERSIST_DIALOG_KIND);
} }
@ -59,51 +61,37 @@ public:
/// ///
/// Saves dialog state /// Saves dialog state
/// ///
virtual void Save() const virtual void Save() const wxOVERRIDE
{ {
const wxDialog * const wnd = Get(); const wxDialog * const wnd = Get();
// Code copied from wxPersistentTLW::Save() // Code copied from wxPersistentTLW::Save()
const wxPoint pos = wnd->GetScreenPosition(); wnd->SaveGeometry(*this);
SaveValue(wxPERSIST_TLW_X, pos.x);
SaveValue(wxPERSIST_TLW_Y, pos.y);
} }
/// ///
/// Restores dialog state /// Restores dialog state
/// ///
virtual bool Restore() virtual bool Restore() wxOVERRIDE
{ {
wxDialog * const wnd = Get(); wxDialog * const wnd = Get();
// Code copied from wxPersistentTLW::Restore() return wnd->RestoreToGeometry(*this);
long
x wxDUMMY_INITIALIZE(-1),
y wxDUMMY_INITIALIZE(-1);
const wxSize size = wnd->GetSize();
const bool hasPos = RestoreValue(wxPERSIST_TLW_X, &x) &&
RestoreValue(wxPERSIST_TLW_Y, &y);
if (hasPos) {
// to avoid making the window completely invisible if it had been
// shown on a monitor which was disconnected since the last run
// (this is pretty common for notebook with external displays)
//
// NB: we should allow window position to be (slightly) off screen,
// it's not uncommon to position the window so that its upper
// left corner has slightly negative coordinate
if (wxDisplay::GetFromPoint(wxPoint(x , y )) != wxNOT_FOUND ||
wxDisplay::GetFromPoint(wxPoint(x + size.x, y + size.y)) != wxNOT_FOUND)
{
wnd->Move(x, y, wxSIZE_ALLOW_MINUS_ONE);
}
}
return true;
} }
private: private:
wxDECLARE_NO_COPY_CLASS(wxPersistentDialog); wxDECLARE_NO_COPY_CLASS(wxPersistentDialog);
private:
virtual bool SaveField(const wxString& name, int value) const wxOVERRIDE
{
return SaveValue(name, value);
}
virtual bool RestoreField(const wxString& name, int* value) wxOVERRIDE
{
return RestoreValue(name, value);
}
}; };