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

maximize the window to the correct display (i.e. the one it is currently on); ShowFullScreen() actually shows the window, too

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19421 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-03-02 14:24:34 +00:00
parent 4a95c88547
commit 716645d361
2 changed files with 61 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/msw/toplevel.cpp
View File

@@ -42,7 +42,7 @@
#include "wx/msw/private.h"
#include "wx/popupwin.h"
#include "wx/display.h"
#ifndef ICON_BIG
#define ICON_BIG 1
@@ -600,18 +600,22 @@ void wxTopLevelWindowMSW::Restore()
bool wxTopLevelWindowMSW::ShowFullScreen(bool show, long style)
{
if (show)
if ( show == IsFullScreen() )
{
if (IsFullScreen())
return FALSE;
// nothing to do
return TRUE;
}
m_fsIsShowing = TRUE;
m_fsIsShowing = show;
if ( show )
{
m_fsStyle = style;
// zap the frame borders
// save the 'normal' window style
m_fsOldWindowStyle = GetWindowLong((HWND)GetHWND(), GWL_STYLE);
m_fsOldWindowStyle = GetWindowLong(GetHwnd(), GWL_STYLE);
// save the old position, width & height, maximize state
m_fsOldSize = GetRect();
@@ -624,44 +628,64 @@ bool wxTopLevelWindowMSW::ShowFullScreen(bool show, long style)
if (style & wxFULLSCREEN_NOBORDER)
offFlags |= WS_BORDER | WS_THICKFRAME;
if (style & wxFULLSCREEN_NOCAPTION)
offFlags |= (WS_CAPTION | WS_SYSMENU);
offFlags |= WS_CAPTION | WS_SYSMENU;
newStyle &= (~offFlags);
newStyle &= ~offFlags;
// change our window style to be compatible with full-screen mode
::SetWindowLong((HWND)GetHWND(), GWL_STYLE, newStyle);
::SetWindowLong(GetHwnd(), GWL_STYLE, newStyle);
// resize to the size of the desktop
int width, height;
wxRect rect;
#if wxUSE_DISPLAY
// resize to the size of the display containing us
int dpy = wxDisplay::GetFromWindow(this);
if ( dpy != wxNOT_FOUND )
{
rect = wxDisplay(dpy).GetGeometry();
}
else // fall back to the main desktop
#else // wxUSE_DISPLAY
{
// resize to the size of the desktop
wxCopyRECTToRect(wxGetWindowRect(::GetDesktopWindow()), rect);
}
#endif // wxUSE_DISPLAY
RECT rect = wxGetWindowRect(::GetDesktopWindow());
width = rect.right - rect.left;
height = rect.bottom - rect.top;
SetSize(width, height);
SetSize(rect);
// now flush the window style cache and actually go full-screen
SetWindowPos((HWND)GetHWND(), HWND_TOP, 0, 0, width, height, SWP_FRAMECHANGED);
long flags = SWP_FRAMECHANGED;
wxSizeEvent event(wxSize(width, height), GetId());
// showing the frame full screen should also show it if it's still
// hidden
if ( !IsShown() )
{
// don't call wxWindow version to avoid flicker from calling
// ::ShowWindow() -- we're going to show the window at the correct
// location directly below -- but do call the wxWindowBase version
// to sync the internal m_isShown flag
wxWindowBase::Show();
flags |= SWP_SHOWWINDOW;
}
SetWindowPos(GetHwnd(), HWND_TOP,
rect.x, rect.y, rect.width, rect.height,
flags);
// finally send an event allowing the window to relayout itself &c
wxSizeEvent event(rect.GetSize(), GetId());
GetEventHandler()->ProcessEvent(event);
return TRUE;
}
else
else // stop showing full screen
{
if (!IsFullScreen())
return FALSE;
m_fsIsShowing = FALSE;
Maximize(m_fsIsMaximized);
SetWindowLong((HWND)GetHWND(),GWL_STYLE, m_fsOldWindowStyle);
SetWindowPos((HWND)GetHWND(),HWND_TOP,m_fsOldSize.x, m_fsOldSize.y,
SetWindowLong(GetHwnd(),GWL_STYLE, m_fsOldWindowStyle);
SetWindowPos(GetHwnd(),HWND_TOP,m_fsOldSize.x, m_fsOldSize.y,
m_fsOldSize.width, m_fsOldSize.height, SWP_FRAMECHANGED);
return TRUE;
}
return TRUE;
}
// ----------------------------------------------------------------------------