Mirrors_UI_SDK/MiniGUI
1
0
Fork 0
mirror of https://github.com/VincentWei/MiniGUI.git synced 2026-09-26 12:27:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

convert style WS_EX_TOPMOST to WS_EX_WINTYPE_HIGHER

Browse Source
This commit is contained in:
Vincent Wei
2020-02-19 19:36:34 +08:00
parent e602448df7
commit 0f416f990c
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/window.c
+11
View File
@@ -4072,6 +4072,13 @@ HWND GUIAPI CreateMainWindowEx2 (PMAINWINCREATE pCreateInfo,
pWin->dwStyle = pCreateInfo->dwStyle;
pWin->dwExStyle = pCreateInfo->dwExStyle;
/* Since 5.0.0: normalize the window styles */
pWin->dwStyle &= ~WS_MAINWIN_ONLY_MASK;
if (pWin->dwExStyle & WS_EX_TOPMOST) {
pWin->dwExStyle &= ~WS_EX_WINTYPE_MASK;
pWin->dwExStyle |= WS_EX_WINTYPE_HIGHER;
}
#ifdef _MGHAVE_MENU
pWin->hMenu = pCreateInfo->hMenu;
#else
@@ -4235,6 +4242,7 @@ HWND GUIAPI CreateMainWindowEx2 (PMAINWINCREATE pCreateInfo,
}
#endif
#if 0
/* Since 5.0.0: exclude the special window type style if failed */
if ((pWin->dwExStyle & WS_EX_WINTYPE_MASK) == WS_EX_WINTYPE_SCREENLOCK &&
pWin->idx_znode != ZNIDX_SCREENLOCK) {
@@ -4248,6 +4256,7 @@ HWND GUIAPI CreateMainWindowEx2 (PMAINWINCREATE pCreateInfo,
pWin->idx_znode != ZNIDX_LAUNCHER) {
pWin->dwExStyle &= ~WS_EX_WINTYPE_MASK;
}
#endif /* move to desktop */
return (HWND)pWin;
@@ -5690,12 +5699,14 @@ HWND GUIAPI CreateWindowEx2 (const char* spClassName,
if (!(pMainWin = gui_GetMainWindowPtrOfControl (hParentWnd)))
return HWND_INVALID;
#if 0
/* Since 5.0.0 */
if (dwExStyle & WS_EX_CTRLASMAINWIN &&
(pMainWin->dwExStyle & WS_EX_WINTYPE_MASK)) {
_WRN_PRINTF("Cannot create global controls in a special main window\n");
return HWND_INVALID;
}
#endif
cci = (PCTRLCLASSINFO)SendMessage (HWND_DESKTOP,
MSG_GETCTRLCLASSINFO, 0, (LPARAM)spClassName);