wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

bug 544887 - Soft keyboard pop-up is on top of search engine bar in the awesome bar on first run r=dougt

Browse Source
This commit is contained in:
Brad Lassey 2010-02-08 18:37:46 -05:00
parent 7fba05200e
commit 6548d54ea7
2 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
widget/src/windows/nsWindow.cpp
View File

@ -2139,20 +2139,45 @@ nsWindow::MakeFullScreen(PRBool aFullScreen)
RECT rc;
if (aFullScreen) {
SetForegroundWindow(mWnd);
SHFullScreen(mWnd, SHFS_HIDETASKBAR | SHFS_HIDESTARTICON | SHFS_HIDESIPBUTTON);
SetRect(&rc, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN));
if (nsWindowCE::sMenuBarShown) {
SIPINFO sipInfo;
memset(&sipInfo, 0, sizeof(SIPINFO));
sipInfo.cbSize = sizeof(SIPINFO);
if (SipGetInfo(&sipInfo))
SetRect(&rc, 0, 0, GetSystemMetrics(SM_CXSCREEN),
sipInfo.rcVisibleDesktop.bottom);
else
SetRect(&rc, 0, 0, GetSystemMetrics(SM_CXSCREEN),
GetSystemMetrics(SM_CYSCREEN));
RECT menuBarRect;
if (GetWindowRect(nsWindowCE::sSoftKeyMenuBarHandle, &menuBarRect) &&
menuBarRect.top < rc.bottom)
rc.bottom = menuBarRect.top;
SHFullScreen(mWnd, SHFS_HIDETASKBAR | SHFS_HIDESTARTICON | SHFS_SHOWSIPBUTTON);
} else {
SHFullScreen(mWnd, SHFS_HIDETASKBAR | SHFS_HIDESTARTICON | SHFS_HIDESIPBUTTON);
SetRect(&rc, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN));
}
}
else {
SHFullScreen(mWnd, SHFS_SHOWTASKBAR | SHFS_SHOWSTARTICON);
SystemParametersInfo(SPI_GETWORKAREA, 0, &rc, FALSE);
}
MoveWindow(mWnd, rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, TRUE);
if (aFullScreen)
mSizeMode = nsSizeMode_Fullscreen;
#endif
// nsBaseWidget hides the chrome and resizes the window, replicate that here
HideWindowChrome(aFullScreen);
Resize(rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, PR_TRUE);
return NS_OK;
#else
return nsBaseWidget::MakeFullScreen(aFullScreen);
#endif
}
/**************************************************************

6
widget/src/windows/nsWindowCE.h
View File

@ -92,13 +92,15 @@ public:
static void CheckKeyboardStatus();
static TriStateBool GetSliderStateOpen();
static void ResetSoftKB(HWND wnd);
protected:
static PRBool sMenuBarShown;
static HWND sSoftKeyMenuBarHandle;
private:
static TriStateBool sHardKBPresence;
static HWND sSoftKeyMenuBarHandle;
static RECT sDefaultSIPRect;
static HWND sMainWindowHandle;
static PRBool sMenuBarShown;
#endif
friend class nsWindow;
};
#endif /* WINCE */