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

don't set the size to the full screen for the windows which are maximized before being shown, just set the pending size to make sure that layout calculations work correctly but without breaking restoring the window

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@39920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2006-07-01 14:21:58 +00:00
parent 0d6fdb3cbd
commit 6fd54d582d
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/msw/toplevel.cpp
View File

@ -501,20 +501,9 @@ bool wxTopLevelWindowMSW::CreateFrame(const wxString& title,
WXDWORD exflags;
WXDWORD flags = MSWGetCreateWindowFlags(&exflags);
wxSize sz;
const wxSize sz = IsAlwaysMaximized() ? wxDefaultSize : size;
if (IsAlwaysMaximized())
{
sz = wxDefaultSize;
}
else
{
sz = size;
}
bool result = MSWCreate(wxCanvasClassName, title, pos, sz, flags, exflags);
return result;
return MSWCreate(wxCanvasClassName, title, pos, sz, flags, exflags);
}
bool wxTopLevelWindowMSW::Create(wxWindow *parent,
@ -695,6 +684,11 @@ bool wxTopLevelWindowMSW::Show(bool show)
frame->GetMenuBar()->AddAdornments(GetWindowStyleFlag());
#endif
// we only set pending size if we're maximized before being shown, now that
// we're shown we don't need it any more (it is reset in size event handler
// for child windows but we have to do it ourselves for this parent window)
m_pendingSize = wxDefaultSize;
return true;
}
@ -721,9 +715,15 @@ void wxTopLevelWindowMSW::Maximize(bool maximize)
// it's shown, so return our size as it will be then in this case
if ( maximize )
{
// unfortunately we don't know which display we're on yet so we
// have to use the default one
SetSize(wxGetClientDisplayRect().GetSize());
// we must only change pending size here, and not call SetSize()
// because otherwise Windows would think that this (full screen)
// size is the natural size for the frame and so would use it when
// the user clicks on "restore" title bar button instead of the
// correct initial frame size
//
// NB: unfortunately we don't know which display we're on yet so we
// have to use the default one
m_pendingSize = wxGetClientDisplayRect().GetSize();
}
//else: can't do anything in this case, we don't have the old size
}