From 04068176ba446ef3a41350c1715d811ac5d2b69c Mon Sep 17 00:00:00 2001 From: "dougt%meer.net" Date: Tue, 26 Jul 2005 16:06:25 +0000 Subject: [PATCH] WinCE only. remove snav.dll -- it is statically build. reorder minimo-link-names to make diffing being generated one easier. Added GetScreenSize so that we can calculate the screensize when opening a new window. NPODB. --- embedding/minimo/wince/MinimoPrivate.h | 1 + embedding/minimo/wince/SplashScreen.cpp | 9 +++++++++ embedding/minimo/wince/WindowCreator.cpp | 7 +++++-- embedding/minimo/wince/minimo-link-names | 4 ++-- embedding/minimo/wince/package.sh | 2 -- 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/embedding/minimo/wince/MinimoPrivate.h b/embedding/minimo/wince/MinimoPrivate.h index e4ceb371954..e1e7314fb3f 100755 --- a/embedding/minimo/wince/MinimoPrivate.h +++ b/embedding/minimo/wince/MinimoPrivate.h @@ -98,5 +98,6 @@ void CreateSplashScreen(); void KillSplashScreen(); +void GetScreenSize(unsigned long* x, unsigned long* y); #endif // MINIMO_PRIVATE_H diff --git a/embedding/minimo/wince/SplashScreen.cpp b/embedding/minimo/wince/SplashScreen.cpp index 097a020e961..2ce470d0edb 100755 --- a/embedding/minimo/wince/SplashScreen.cpp +++ b/embedding/minimo/wince/SplashScreen.cpp @@ -118,3 +118,12 @@ void CreateSplashScreen() CloseHandle(handle); } + +void GetScreenSize(unsigned long* x, unsigned long* y) +{ + RECT workarea; + SystemParametersInfo(SPI_GETWORKAREA, 0, &workarea, 0); + + *x = workarea.right - workarea.left; + *y = workarea.bottom - workarea.top; +} diff --git a/embedding/minimo/wince/WindowCreator.cpp b/embedding/minimo/wince/WindowCreator.cpp index 45f6451ab28..cffcf9bcd5a 100755 --- a/embedding/minimo/wince/WindowCreator.cpp +++ b/embedding/minimo/wince/WindowCreator.cpp @@ -94,11 +94,14 @@ WindowCreator::CreateChromeWindow2(nsIWebBrowserChrome *aParent, nsCOMPtr xulParent(do_GetInterface(aParent)); + unsigned long x, y; + GetScreenSize(&x, &y); + appShell->CreateTopLevelWindow(xulParent, 0, aChromeFlags, - 240, //XXXXXX - 320 - 24 /* 24 is the height of the menubar */, + x, + y, mAppShell, getter_AddRefs(newWindow)); } diff --git a/embedding/minimo/wince/minimo-link-names b/embedding/minimo/wince/minimo-link-names index b27ab72de9e..dcb2587b146 100755 --- a/embedding/minimo/wince/minimo-link-names +++ b/embedding/minimo/wince/minimo-link-names @@ -3,12 +3,13 @@ nsUConvModule nsI18nModule necko_core_and_primary_protocols nsJarModule -nsRDFModule nsPrefModule nsSecurityManagerModule +nsRDFModule nsParserModule nsGfxModule nsImageLib2Module +nsPluginModule nsWidgetModule nsLayoutModule docshell_provider @@ -22,5 +23,4 @@ nsMorkModule nsXMLExtrasModule TransformiixModule nsWebServicesModule -nsPluginModule SoftKeyBoardModule diff --git a/embedding/minimo/wince/package.sh b/embedding/minimo/wince/package.sh index 45d2494c555..5389ac0c446 100755 --- a/embedding/minimo/wince/package.sh +++ b/embedding/minimo/wince/package.sh @@ -48,8 +48,6 @@ cp -a bin/components/nsDictionary.js wince/components cp -a bin/components/nsInterfaceInfoToIDL.js wince/components cp -a bin/components/nsXmlRpcClient.js wince/components -cp -a bin/components/snav.dll wince/components - cp -a bin/components/pipboot.dll wince/components cp -a bin/components/pipnss.dll wince/components cp -a bin/components/pippki.dll wince/components