Skip to content

Validate native Start opacity suppression #13

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

Closed
YellowNest wants to merge 1 commit into from
Closed

Validate native Start opacity suppression #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
54 changes: 43 additions & 11 deletions Src/StartMenu/StartMenuDLL/Win11StartButton.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ struct StartElement
CString type;
CString name;
bool visibilityOverride;
bool opacityOverride;
bool hitTestOverride;
bool startControlResolved;
bool isStartControl;
Expand All @@ -50,6 +51,7 @@ struct StartElement
{
parent = 0;
visibilityOverride = false;
opacityOverride = false;
hitTestOverride = false;
startControlResolved = false;
isStartControl = false;
Expand Down Expand Up @@ -265,8 +267,9 @@ class CWin11StartButtonTap: public IObjectWithSite, public IVisualTreeServiceCal
auto it = m_Elements.find(element.Handle);
if (it != m_Elements.end())
{
interesting = it->second.visibilityOverride || it->second.hitTestOverride ||
it->second.isStartControl || IsStartControlCandidate(it->second);
interesting = it->second.visibilityOverride || it->second.opacityOverride ||
it->second.hitTestOverride || it->second.isStartControl ||
IsStartControlCandidate(it->second);
bool wasPrimary = element.Handle == m_PrimaryStart;
m_Elements.erase(it);
if (wasPrimary)
Expand All @@ -284,6 +287,7 @@ class CWin11StartButtonTap: public IObjectWithSite, public IVisualTreeServiceCal
if (previous != m_Elements.end())
{
record.visibilityOverride = previous->second.visibilityOverride;
record.opacityOverride = previous->second.opacityOverride;
record.hitTestOverride = previous->second.hitTestOverride;
record.startControlResolved = previous->second.startControlResolved;
record.isStartControl = previous->second.isStartControl;
Expand Down Expand Up @@ -627,14 +631,16 @@ class CWin11StartButtonTap: public IObjectWithSite, public IVisualTreeServiceCal
return m_Visual->ClearProperty(handle, index);
}

void SetOverrideFlags( InstanceHandle handle, bool *visibility, bool *hitTest )
void SetOverrideFlags( InstanceHandle handle, bool *visibility, bool *opacity, bool *hitTest )
{
EnterCriticalSection(&m_Lock);
auto it = m_Elements.find(handle);
if (it != m_Elements.end())
{
if (visibility)
it->second.visibilityOverride = *visibility;
if (opacity)
it->second.opacityOverride = *opacity;
if (hitTest)
it->second.hitTestOverride = *hitTest;
}
Expand Down Expand Up @@ -687,23 +693,49 @@ class CWin11StartButtonTap: public IObjectWithSite, public IVisualTreeServiceCal
bool target = allTaskbars || !primaryStart || handle == primaryStart;
if (enabled && target)
{
// Hide the verified Start control itself rather than depending
// on the internal glyph subtree. Opacity preserves the taskbar
// layout slot while remaining stable if Microsoft changes the
// icon implementation on a newer Windows build.
if (!record.opacityOverride)
{
HRESULT hr = SetPropertyText(handle, L"Opacity", L"0");
if (SUCCEEDED(hr))
{
bool value = true;
SetOverrideFlags(handle, NULL, &value, NULL);
}
}

if (!record.hitTestOverride)
{
HRESULT hr = SetPropertyText(handle, L"IsHitTestVisible", L"False");
if (SUCCEEDED(hr))
{
bool value = true;
SetOverrideFlags(handle, NULL, &value);
SetOverrideFlags(handle, NULL, NULL, &value);
}
}
}
else if (record.hitTestOverride)
else
{
HRESULT hr = ClearPropertyByName(handle, L"IsHitTestVisible");
if (SUCCEEDED(hr))
if (record.opacityOverride)
{
bool value = false;
SetOverrideFlags(handle, NULL, &value);
HRESULT hr = ClearPropertyByName(handle, L"Opacity");
if (SUCCEEDED(hr))
{
bool value = false;
SetOverrideFlags(handle, NULL, &value, NULL);
}
}
if (record.hitTestOverride)
{
HRESULT hr = ClearPropertyByName(handle, L"IsHitTestVisible");
if (SUCCEEDED(hr))
{
bool value = false;
SetOverrideFlags(handle, NULL, NULL, &value);
}
}
}
continue;
Expand All @@ -725,7 +757,7 @@ class CWin11StartButtonTap: public IObjectWithSite, public IVisualTreeServiceCal
if (SUCCEEDED(hr))
{
bool value = true;
SetOverrideFlags(handle, &value, NULL);
SetOverrideFlags(handle, &value, NULL, NULL);
}
}
}
Expand All @@ -735,7 +767,7 @@ class CWin11StartButtonTap: public IObjectWithSite, public IVisualTreeServiceCal
if (SUCCEEDED(hr))
{
bool value = false;
SetOverrideFlags(handle, &value, NULL);
SetOverrideFlags(handle, &value, NULL, NULL);
}
}
}
Expand Down