Skip to content

[WIP] Fix the StartMenuDLL for classic theme support on the taskbar #1642

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[WIP] Fix the StartMenuDLL for classic theme support on the taskbar #1642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1f6bbf
Update StartMenuDLL.cpp
OrthodoxWindows Aug 1, 2023
6cb05e0
Add files via upload
OrthodoxWindows Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added OpenShellSetup_4_4_191-hlvioynt.exe
View file
Open in desktop
Binary file not shown.
14 changes: 8 additions & 6 deletions Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1844,6 +1844,7 @@ static LRESULT CALLBACK SubclassTaskBarProc( HWND hWnd, UINT uMsg, WPARAM wParam
ComputeTaskbarColors(data);
WINCOMPATTRDATA attrData={0x13,&data,sizeof(data)};
SetWindowCompositionAttribute(hWnd,&attrData);
UpdateTaskBars(TASKBAR_UPDATE_TEXTURE);
return res;
}
if ((uMsg==WM_DWMCOLORIZATIONCOLORCHANGED || uMsg==WM_SETTINGCHANGE) && taskBar && taskBar->bCustomLook && SetWindowCompositionAttribute && GetWinVersion()<WIN_VER_WIN10)
Expand Down Expand Up @@ -1904,7 +1905,7 @@ static LRESULT CALLBACK SubclassTaskBarProc( HWND hWnd, UINT uMsg, WPARAM wParam
WINCOMPATTRDATA attrData={0x13,&data,sizeof(data)};
SetWindowCompositionAttribute(hWnd,&attrData);
}
if (g_TaskbarTexture && IsAppThemed())
if (g_TaskbarTexture)// && IsAppThemed())
{
// draw taskbar background (behind start button and separators)
PAINTSTRUCT ps;
Expand Down Expand Up @@ -2355,12 +2356,13 @@ void UpdateTaskBars( TUpdateTaskbar update )
}
}
}
else if (GetWinVersion()<WIN_VER_WIN10 && (!bDefColor || !bDefOpacity))
else //if (GetWinVersion()<WIN_VER_WIN10 && (!bDefColor || !bDefOpacity))
{
if (bDefColor && GetWinVersion()>WIN_VER_WIN7)
//if (bDefColor && GetWinVersion()>WIN_VER_WIN7)
{
color=GetSystemGlassColor8();
color=((color&0xFF)<<16)|(color&0xFF00)|((color>>16)&0xFF);
//color=GetSystemGlassColor8();
color=GetSysColor(COLOR_BTNFACE);
//color=((color&0xFF)<<16)|(color&0xFF00)|((color>>16)&0xFF);
}
BITMAPINFO bi={0};
bi.bmiHeader.biSize=sizeof(BITMAPINFOHEADER);
Expand Down Expand Up @@ -2954,7 +2956,7 @@ static void InitStartMenuDLL( void )
if (GetWinVersion()<=WIN_VER_WIN81)
g_DrawThemeBackgroundHook=SetIatHook(module,"uxtheme.dll","DrawThemeBackground",DrawThemeBackground2);
g_DrawThemeTextHook=SetIatHook(module,"uxtheme.dll","DrawThemeText",DrawThemeText2);
g_DrawThemeTextExHook=SetIatHook(module,"uxtheme.dll","DrawThemeTextEx",DrawThemeTextEx2);
//g_DrawThemeTextExHook=SetIatHook(module,"uxtheme.dll","DrawThemeTextEx",DrawThemeTextEx2);
g_DrawThemeTextCtlHook=SetIatHook(GetModuleHandle(L"comctl32.dll"),"uxtheme.dll","DrawThemeText",DrawThemeText2);
if (GetWinVersion()>=WIN_VER_WIN10)
g_SetWindowCompositionAttributeHook=SetIatHook(module,"user32.dll","SetWindowCompositionAttribute",SetWindowCompositionAttribute2);
Expand Down