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

Fix restoring TLW size when using wxPersistenceManager on GTK

Browse Source 
The decoration size must be restored before restoring the window size
See #18863
This commit is contained in:
Paul Cornett
2020-08-18 08:46:19 -07:00
parent ae1bcc5cb2
commit 5192feb38e
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/gtk/private/tlwgeom.h
View File

@@ -12,6 +12,7 @@
class wxTLWGeometry : public wxTLWGeometryGeneric class wxTLWGeometry : public wxTLWGeometryGeneric
{ {
typedef wxTLWGeometryGeneric BaseType;
public: public:
virtual bool Save(const Serializer& ser) const wxOVERRIDE virtual bool Save(const Serializer& ser) const wxOVERRIDE
{ {
@@ -57,9 +58,6 @@ public:
virtual bool ApplyTo(wxTopLevelWindow* tlw) wxOVERRIDE virtual bool ApplyTo(wxTopLevelWindow* tlw) wxOVERRIDE
{ {
if ( !wxTLWGeometryGeneric::ApplyTo(tlw) )
return false;
// Don't overwrite the current decoration size if we already have it. // Don't overwrite the current decoration size if we already have it.
if ( !tlw->m_decorSize.left && !tlw->m_decorSize.right && if ( !tlw->m_decorSize.left && !tlw->m_decorSize.right &&
!tlw->m_decorSize.top && !tlw->m_decorSize.bottom ) !tlw->m_decorSize.top && !tlw->m_decorSize.bottom )
@@ -67,7 +65,7 @@ public:
tlw->m_decorSize = m_decorSize; tlw->m_decorSize = m_decorSize;
} }
return true; return BaseType::ApplyTo(tlw);
} }
private: private: