Bug 504238 - <menupopup>s on Windows CE are confusing window size and content size.. r=vladimir

This commit is contained in:
Justin Dolske 2009-07-23 17:35:49 -07:00
parent fb434726f0
commit a309e241c2
3 changed files with 21 additions and 9 deletions

View File

@ -47,8 +47,8 @@
menupopup,
popup,
panel {
border: 3px solid transparent;
padding: 0px;
border: 1px solid menutext;
padding: 2px;
min-width: 1px;
background: Menu;
}

View File

@ -165,14 +165,26 @@ nsSplashScreenWin::ThreadProc(LPVOID splashScreen)
int screenWidth = GetSystemMetrics(SM_CXSCREEN);
int screenHeight = GetSystemMetrics(SM_CYSCREEN);
HWND dlg = CreateWindowEx
(WS_EX_NOACTIVATE /* | WS_EX_TOPMOST | WS_EX_TOOLWINDOW*/,
LONG horizPad = (screenWidth - sp->mWidth) / 2;
LONG vertPad = (screenHeight - sp->mHeight) / 2;
RECT r = { horizPad,
vertPad,
horizPad + sp->mWidth,
vertPad + sp->mHeight };
DWORD winStyle = (WS_POPUP | WS_BORDER);
DWORD winStyleEx = WS_EX_NOACTIVATE;
if(!::AdjustWindowRectEx(&r, winStyle, FALSE, winStyleEx))
return 0;
HWND dlg = CreateWindowEx(
winStyleEx,
TEXT("MozillaSplashScreen"),
TEXT("Starting up..."),
WS_POPUP | WS_BORDER,
(screenWidth - sp->mWidth) / 2,
(screenHeight - sp->mHeight) / 2,
sp->mWidth, sp->mHeight,
winStyle,
r.left, r.top,
(r.right - r.left), (r.bottom - r.top),
HWND_DESKTOP,
NULL,
GetModuleHandle(0),

View File

@ -264,7 +264,7 @@ DWORD nsWindow::WindowStyle()
break;
case eWindowType_popup:
style = WS_POPUP | WS_BORDER;
style = WS_POPUP;
break;
default: