d97c055514
Previously, TLW geometry was implicitly defined as just its position, size and the maximized/iconized state by wxPersistentTLW code. This already wasn't enough for wxGTK which added the decoration sizes to the geometry being saved/restored, but this had to be done using conditional compilation, which was not ideal. And it didn't allow using an entirely different geometry representation as will be done for wxMSW soon. Change the code to use wxTLWGeometry class defining the geometry, as used by the current port, explicitly and move wxPersistentTLW logic into it, as wxPersistentXXX classes are supposed to be very simple, which wasn't really the case. Also provide public SaveGeometry() and RestoreToGeometry() methods in wxTopLevelWindow, which can be useful even to people not using wxPersistentTLW for whatever reason. There should be no changes in behaviour so far.
78 lines
2.3 KiB
C++
78 lines
2.3 KiB
C++
///////////////////////////////////////////////////////////////////////////////
|
|
// Name: wx/gtk/private/tlwgeom.h
|
|
// Purpose: wxGTK-specific wxTLWGeometry class.
|
|
// Author: Vadim Zeitlin
|
|
// Created: 2018-04-29
|
|
// Copyright: (c) 2018 Vadim Zeitlin <vadim@wxwidgets.org>
|
|
// Licence: wxWindows licence
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef _WX_GTK_PRIVATE_TLWGEOM_H_
|
|
#define _WX_GTK_PRIVATE_TLWGEOM_H_
|
|
|
|
class wxTLWGeometry : public wxTLWGeometryGeneric
|
|
{
|
|
public:
|
|
virtual bool Save(const Serializer& ser) const wxOVERRIDE
|
|
{
|
|
if ( !wxTLWGeometryGeneric::Save(ser) )
|
|
return false;
|
|
|
|
// Don't save the decoration sizes if we don't really have any values
|
|
// for them.
|
|
if ( m_decorSize.left || m_decorSize.right ||
|
|
m_decorSize.top || m_decorSize.bottom )
|
|
{
|
|
ser.SaveField("decor_l", m_decorSize.left);
|
|
ser.SaveField("decor_r", m_decorSize.right);
|
|
ser.SaveField("decor_t", m_decorSize.top);
|
|
ser.SaveField("decor_b", m_decorSize.bottom);
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
virtual bool Restore(Serializer& ser) wxOVERRIDE
|
|
{
|
|
if ( !wxTLWGeometryGeneric::Restore(ser) )
|
|
return false;
|
|
|
|
ser.RestoreField("decor_l", &m_decorSize.left);
|
|
ser.RestoreField("decor_r", &m_decorSize.right);
|
|
ser.RestoreField("decor_t", &m_decorSize.top);
|
|
ser.RestoreField("decor_b", &m_decorSize.bottom);
|
|
|
|
return true;
|
|
}
|
|
|
|
virtual bool GetFrom(const wxTopLevelWindow* tlw) wxOVERRIDE
|
|
{
|
|
if ( !wxTLWGeometryGeneric::GetFrom(tlw) )
|
|
return false;
|
|
|
|
m_decorSize = tlw->m_decorSize;
|
|
|
|
return true;
|
|
}
|
|
|
|
virtual bool ApplyTo(wxTopLevelWindow* tlw) wxOVERRIDE
|
|
{
|
|
if ( !wxTLWGeometryGeneric::ApplyTo(tlw) )
|
|
return false;
|
|
|
|
// Don't overwrite the current decoration size if we already have it.
|
|
if ( !tlw->m_decorSize.left && !tlw->m_decorSize.right &&
|
|
!tlw->m_decorSize.top && !tlw->m_decorSize.bottom )
|
|
{
|
|
tlw->m_decorSize = m_decorSize;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
private:
|
|
wxTopLevelWindow::DecorSize m_decorSize;
|
|
};
|
|
|
|
#endif // _WX_GTK_PRIVATE_TLWGEOM_H_
|