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

return the restored window size from GetSize() when window is minimized (for consistency with wxGTK and also for convenience)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-02-11 00:21:06 +00:00
parent 1e93d59553
commit d43eb2a0d5
4 changed files with 86 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/msw/toplevel.cpp
View File

@@ -780,6 +780,75 @@ void wxTopLevelWindowMSW::SetLayoutDirection(wxLayoutDirection dir)
wxTopLevelWindowBase::SetLayoutDirection(dir);
}
// ----------------------------------------------------------------------------
// wxTopLevelWindowMSW geometry
// ----------------------------------------------------------------------------
void wxTopLevelWindowMSW::DoGetPosition(int *x, int *y) const
{
if ( IsIconized() )
{
WINDOWPLACEMENT wp;
wp.length = sizeof(WINDOWPLACEMENT);
if ( ::GetWindowPlacement(GetHwnd(), &wp) )
{
RECT& rc = wp.rcNormalPosition;
// the position returned by GetWindowPlacement() is in workspace
// coordinates except for windows with WS_EX_TOOLWINDOW style
if ( !HasFlag(wxFRAME_TOOL_WINDOW) )
{
// we must use the correct display for the translation as the
// task bar might be shown on one display but not the other one
int n = wxDisplay::GetFromWindow(this);
wxDisplay dpy(n == wxNOT_FOUND ? 0 : n);
const wxPoint ptOfs = dpy.GetClientArea().GetPosition() -
dpy.GetGeometry().GetPosition();
rc.left += ptOfs.x;
rc.top += ptOfs.y;
}
if ( x )
*x = rc.left;
if ( y )
*y = rc.top;
return;
}
wxLogLastError(_T("GetWindowPlacement"));
}
//else: normal case
wxTopLevelWindowBase::DoGetPosition(x, y);
}
void wxTopLevelWindowMSW::DoGetSize(int *width, int *height) const
{
if ( IsIconized() )
{
WINDOWPLACEMENT wp;
wp.length = sizeof(WINDOWPLACEMENT);
if ( ::GetWindowPlacement(GetHwnd(), &wp) )
{
const RECT& rc = wp.rcNormalPosition;
if ( width )
*width = rc.right - rc.left;
if ( height )
*height = rc.bottom - rc.top;
return;
}
wxLogLastError(_T("GetWindowPlacement"));
}
//else: normal case
wxTopLevelWindowBase::DoGetSize(width, height);
}
// ----------------------------------------------------------------------------
// wxTopLevelWindowMSW fullscreen
// ----------------------------------------------------------------------------