2014-11-02 20:18:54 +00:00
|
|
|
/*
|
|
|
|
* ReactOS Explorer
|
|
|
|
*
|
|
|
|
* Copyright 2006 - 2007 Thomas Weidenmueller <w3seek@reactos.org>
|
2018-01-18 14:53:33 +00:00
|
|
|
* Copyright 2018 Ged Murphy <gedmurphy@reactos.org>
|
2014-11-02 20:18:54 +00:00
|
|
|
*
|
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
* License along with this library; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "precomp.h"
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
#include <commoncontrols.h>
|
2014-11-02 20:18:54 +00:00
|
|
|
|
2019-04-22 19:25:41 +00:00
|
|
|
static const WCHAR szTrayNotifyWndClass[] = L"TrayNotifyWnd";
|
2014-11-02 20:18:54 +00:00
|
|
|
|
2018-01-29 19:50:33 +00:00
|
|
|
#define TRAY_NOTIFY_WND_SPACING_X 1
|
2017-07-28 10:04:38 +00:00
|
|
|
#define TRAY_NOTIFY_WND_SPACING_Y 1
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
#define CLOCK_TEXT_HACK 4
|
|
|
|
|
|
|
|
/*
|
|
|
|
* TrayNotifyWnd
|
|
|
|
*/
|
2014-11-02 20:18:54 +00:00
|
|
|
|
|
|
|
class CTrayNotifyWnd :
|
2018-01-28 12:21:45 +00:00
|
|
|
public CComCoClass<CTrayNotifyWnd>,
|
2014-11-02 20:18:54 +00:00
|
|
|
public CComObjectRootEx<CComMultiThreadModelNoCS>,
|
2018-01-28 12:21:45 +00:00
|
|
|
public CWindowImpl < CTrayNotifyWnd, CWindow, CControlWinTraits >,
|
|
|
|
public IOleWindow
|
2014-11-02 20:18:54 +00:00
|
|
|
{
|
2018-01-28 12:21:45 +00:00
|
|
|
CComPtr<IUnknown> m_clock;
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
CTrayShowDesktopButton m_ShowDesktopButton;
|
2018-01-28 12:21:45 +00:00
|
|
|
CComPtr<IUnknown> m_pager;
|
|
|
|
|
|
|
|
HWND m_hwndClock;
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
HWND m_hwndShowDesktop;
|
2018-01-28 12:21:45 +00:00
|
|
|
HWND m_hwndPager;
|
2014-11-02 20:18:54 +00:00
|
|
|
|
|
|
|
HTHEME TrayTheme;
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
SIZE trayClockMinSize;
|
|
|
|
SIZE trayShowDesktopSize;
|
|
|
|
SIZE trayNotifySize;
|
2014-11-02 20:18:54 +00:00
|
|
|
MARGINS ContentMargin;
|
2017-10-30 15:39:12 +00:00
|
|
|
BOOL IsHorizontal;
|
2014-11-02 20:18:54 +00:00
|
|
|
|
|
|
|
public:
|
|
|
|
CTrayNotifyWnd() :
|
2018-01-28 12:21:45 +00:00
|
|
|
m_hwndClock(NULL),
|
|
|
|
m_hwndPager(NULL),
|
2014-11-02 20:18:54 +00:00
|
|
|
TrayTheme(NULL),
|
2017-10-30 15:39:12 +00:00
|
|
|
IsHorizontal(FALSE)
|
2014-11-02 20:18:54 +00:00
|
|
|
{
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
ZeroMemory(&trayClockMinSize, sizeof(trayClockMinSize));
|
|
|
|
ZeroMemory(&trayShowDesktopSize, sizeof(trayShowDesktopSize));
|
|
|
|
ZeroMemory(&trayNotifySize, sizeof(trayNotifySize));
|
2014-11-02 20:18:54 +00:00
|
|
|
ZeroMemory(&ContentMargin, sizeof(ContentMargin));
|
|
|
|
}
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
~CTrayNotifyWnd() { }
|
2014-11-02 20:18:54 +00:00
|
|
|
|
|
|
|
LRESULT OnThemeChanged()
|
|
|
|
{
|
|
|
|
if (TrayTheme)
|
|
|
|
CloseThemeData(TrayTheme);
|
|
|
|
|
|
|
|
if (IsThemeActive())
|
|
|
|
TrayTheme = OpenThemeData(m_hWnd, L"TrayNotify");
|
|
|
|
else
|
|
|
|
TrayTheme = NULL;
|
|
|
|
|
|
|
|
if (TrayTheme)
|
|
|
|
{
|
|
|
|
SetWindowExStyle(m_hWnd, WS_EX_STATICEDGE, 0);
|
|
|
|
|
|
|
|
GetThemeMargins(TrayTheme,
|
|
|
|
NULL,
|
|
|
|
TNP_BACKGROUND,
|
|
|
|
0,
|
|
|
|
TMT_CONTENTMARGINS,
|
|
|
|
NULL,
|
|
|
|
&ContentMargin);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
SetWindowExStyle(m_hWnd, WS_EX_STATICEDGE, WS_EX_STATICEDGE);
|
|
|
|
|
2017-07-29 13:57:29 +00:00
|
|
|
ContentMargin.cxLeftWidth = 2;
|
|
|
|
ContentMargin.cxRightWidth = 2;
|
|
|
|
ContentMargin.cyTopHeight = 2;
|
|
|
|
ContentMargin.cyBottomHeight = 2;
|
2014-11-02 20:18:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
LRESULT OnThemeChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
|
|
|
|
{
|
|
|
|
return OnThemeChanged();
|
|
|
|
}
|
|
|
|
|
|
|
|
LRESULT OnCreate(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
|
|
|
|
{
|
2018-01-28 12:21:45 +00:00
|
|
|
HRESULT hr;
|
|
|
|
|
|
|
|
hr = CTrayClockWnd_CreateInstance(m_hWnd, IID_PPV_ARG(IUnknown, &m_clock));
|
|
|
|
if (FAILED_UNEXPECTEDLY(hr))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
hr = IUnknown_GetWindow(m_clock, &m_hwndClock);
|
|
|
|
if (FAILED_UNEXPECTEDLY(hr))
|
|
|
|
return FALSE;
|
|
|
|
|
|
|
|
hr = CSysPagerWnd_CreateInstance(m_hWnd, IID_PPV_ARG(IUnknown, &m_pager));
|
|
|
|
if (FAILED_UNEXPECTEDLY(hr))
|
|
|
|
return FALSE;
|
2014-11-02 20:18:54 +00:00
|
|
|
|
2018-01-28 12:21:45 +00:00
|
|
|
hr = IUnknown_GetWindow(m_pager, &m_hwndPager);
|
|
|
|
if (FAILED_UNEXPECTEDLY(hr))
|
|
|
|
return FALSE;
|
2014-11-02 20:18:54 +00:00
|
|
|
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
/* Create the 'Show Desktop' button */
|
|
|
|
m_ShowDesktopButton.DoCreate(m_hWnd);
|
|
|
|
m_hwndShowDesktop = m_ShowDesktopButton.m_hWnd;
|
|
|
|
|
2014-11-02 20:18:54 +00:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2017-05-27 09:09:01 +00:00
|
|
|
BOOL GetMinimumSize(IN OUT PSIZE pSize)
|
2014-11-02 20:18:54 +00:00
|
|
|
{
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
SIZE clockSize = { 0, 0 };
|
|
|
|
SIZE traySize = { 0, 0 };
|
|
|
|
SIZE showDesktopSize = { 0, 0 };
|
2014-11-02 20:18:54 +00:00
|
|
|
|
2017-10-30 15:39:12 +00:00
|
|
|
if (!g_TaskbarSettings.sr.HideClock)
|
2014-11-02 20:18:54 +00:00
|
|
|
{
|
2017-05-27 09:09:01 +00:00
|
|
|
if (IsHorizontal)
|
2014-11-02 20:18:54 +00:00
|
|
|
{
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
clockSize.cy = pSize->cy;
|
|
|
|
if (clockSize.cy <= 0)
|
2014-11-02 20:18:54 +00:00
|
|
|
goto NoClock;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
clockSize.cx = pSize->cx;
|
|
|
|
if (clockSize.cx <= 0)
|
2014-11-02 20:18:54 +00:00
|
|
|
goto NoClock;
|
|
|
|
}
|
|
|
|
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
::SendMessage(m_hwndClock, TNWM_GETMINIMUMSIZE, (WPARAM) IsHorizontal, (LPARAM) &clockSize);
|
2014-11-02 20:18:54 +00:00
|
|
|
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
trayClockMinSize = clockSize;
|
2014-11-02 20:18:54 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
NoClock:
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
trayClockMinSize = clockSize;
|
2014-11-02 20:18:54 +00:00
|
|
|
|
2017-05-27 09:09:01 +00:00
|
|
|
if (IsHorizontal)
|
2014-11-02 20:18:54 +00:00
|
|
|
{
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
traySize.cy = pSize->cy - 2 * TRAY_NOTIFY_WND_SPACING_Y;
|
2014-11-02 20:18:54 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
traySize.cx = pSize->cx - 2 * TRAY_NOTIFY_WND_SPACING_X;
|
2014-11-02 20:18:54 +00:00
|
|
|
}
|
|
|
|
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
::SendMessage(m_hwndPager, TNWM_GETMINIMUMSIZE, (WPARAM) IsHorizontal, (LPARAM) &traySize);
|
2014-11-02 20:18:54 +00:00
|
|
|
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
trayNotifySize = traySize;
|
|
|
|
|
|
|
|
INT showDesktopButtonExtent = 0;
|
|
|
|
if (g_TaskbarSettings.bShowDesktopButton)
|
|
|
|
{
|
|
|
|
showDesktopButtonExtent = m_ShowDesktopButton.WidthOrHeight();
|
|
|
|
if (IsHorizontal)
|
|
|
|
{
|
|
|
|
showDesktopSize.cx = showDesktopButtonExtent;
|
|
|
|
showDesktopSize.cy = pSize->cy;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
showDesktopSize.cx = pSize->cx;
|
|
|
|
showDesktopSize.cy = showDesktopButtonExtent;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
trayShowDesktopSize = showDesktopSize;
|
2014-11-02 20:18:54 +00:00
|
|
|
|
2017-05-27 09:09:01 +00:00
|
|
|
if (IsHorizontal)
|
2014-11-02 20:18:54 +00:00
|
|
|
{
|
|
|
|
pSize->cx = 2 * TRAY_NOTIFY_WND_SPACING_X;
|
|
|
|
|
2017-10-30 15:39:12 +00:00
|
|
|
if (!g_TaskbarSettings.sr.HideClock)
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
pSize->cx += TRAY_NOTIFY_WND_SPACING_X + trayClockMinSize.cx;
|
2014-11-02 20:18:54 +00:00
|
|
|
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
if (g_TaskbarSettings.bShowDesktopButton)
|
|
|
|
pSize->cx += showDesktopButtonExtent;
|
|
|
|
|
|
|
|
pSize->cx += traySize.cx;
|
2018-01-28 20:04:34 +00:00
|
|
|
pSize->cx += ContentMargin.cxLeftWidth + ContentMargin.cxRightWidth;
|
2014-11-02 20:18:54 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
pSize->cy = 2 * TRAY_NOTIFY_WND_SPACING_Y;
|
|
|
|
|
2017-10-30 15:39:12 +00:00
|
|
|
if (!g_TaskbarSettings.sr.HideClock)
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
pSize->cy += TRAY_NOTIFY_WND_SPACING_Y + trayClockMinSize.cy;
|
|
|
|
|
|
|
|
if (g_TaskbarSettings.bShowDesktopButton)
|
|
|
|
pSize->cy += showDesktopButtonExtent;
|
2014-11-02 20:18:54 +00:00
|
|
|
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
pSize->cy += traySize.cy;
|
2018-01-28 20:04:34 +00:00
|
|
|
pSize->cy += ContentMargin.cyTopHeight + ContentMargin.cyBottomHeight;
|
2014-11-02 20:18:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
VOID Size(IN OUT SIZE *pszClient)
|
|
|
|
{
|
|
|
|
RECT rcClient = {0, 0, pszClient->cx, pszClient->cy};
|
|
|
|
AlignControls(&rcClient);
|
|
|
|
pszClient->cx = rcClient.right - rcClient.left;
|
|
|
|
pszClient->cy = rcClient.bottom - rcClient.top;
|
|
|
|
}
|
|
|
|
|
|
|
|
VOID AlignControls(IN CONST PRECT prcClient OPTIONAL)
|
2014-11-02 20:18:54 +00:00
|
|
|
{
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
RECT rcClient;
|
|
|
|
if (prcClient != NULL)
|
|
|
|
rcClient = *prcClient;
|
|
|
|
else
|
|
|
|
GetClientRect(&rcClient);
|
|
|
|
|
|
|
|
rcClient.left += ContentMargin.cxLeftWidth;
|
|
|
|
rcClient.top += ContentMargin.cyTopHeight;
|
|
|
|
rcClient.right -= ContentMargin.cxRightWidth;
|
|
|
|
rcClient.bottom -= ContentMargin.cyBottomHeight;
|
|
|
|
|
|
|
|
CONST UINT swpFlags = SWP_DRAWFRAME | SWP_NOCOPYBITS | SWP_NOZORDER;
|
|
|
|
|
|
|
|
if (g_TaskbarSettings.bShowDesktopButton)
|
|
|
|
{
|
|
|
|
POINT ptShowDesktop =
|
|
|
|
{
|
|
|
|
rcClient.left,
|
|
|
|
rcClient.top
|
|
|
|
};
|
|
|
|
SIZE showDesktopSize =
|
|
|
|
{
|
|
|
|
rcClient.right - rcClient.left,
|
|
|
|
rcClient.bottom - rcClient.top
|
|
|
|
};
|
|
|
|
|
|
|
|
INT cxyShowDesktop = m_ShowDesktopButton.WidthOrHeight();
|
|
|
|
if (IsHorizontal)
|
|
|
|
{
|
|
|
|
if (!TrayTheme)
|
|
|
|
{
|
|
|
|
ptShowDesktop.y -= ContentMargin.cyTopHeight;
|
|
|
|
showDesktopSize.cy += ContentMargin.cyTopHeight + ContentMargin.cyBottomHeight;
|
|
|
|
}
|
|
|
|
|
|
|
|
rcClient.right -= (cxyShowDesktop - ContentMargin.cxRightWidth);
|
|
|
|
|
|
|
|
ptShowDesktop.x = rcClient.right;
|
|
|
|
showDesktopSize.cx = cxyShowDesktop;
|
|
|
|
|
|
|
|
// HACK: Clock has layout problems - remove this once addressed.
|
|
|
|
rcClient.right -= CLOCK_TEXT_HACK;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (!TrayTheme)
|
|
|
|
{
|
|
|
|
ptShowDesktop.x -= ContentMargin.cxLeftWidth;
|
|
|
|
showDesktopSize.cx += ContentMargin.cxLeftWidth + ContentMargin.cxRightWidth;
|
|
|
|
}
|
|
|
|
|
|
|
|
rcClient.bottom -= (cxyShowDesktop - ContentMargin.cyBottomHeight);
|
|
|
|
|
|
|
|
ptShowDesktop.y = rcClient.bottom;
|
|
|
|
showDesktopSize.cy = cxyShowDesktop;
|
|
|
|
|
|
|
|
// HACK: Clock has layout problems - remove this once addressed.
|
|
|
|
rcClient.bottom -= CLOCK_TEXT_HACK;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Resize and reposition the button */
|
|
|
|
::SetWindowPos(m_hwndShowDesktop,
|
|
|
|
NULL,
|
|
|
|
ptShowDesktop.x,
|
|
|
|
ptShowDesktop.y,
|
|
|
|
showDesktopSize.cx,
|
|
|
|
showDesktopSize.cy,
|
|
|
|
swpFlags);
|
|
|
|
}
|
|
|
|
|
2017-10-30 15:39:12 +00:00
|
|
|
if (!g_TaskbarSettings.sr.HideClock)
|
2014-11-02 20:18:54 +00:00
|
|
|
{
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
POINT ptClock = { rcClient.left, rcClient.top };
|
|
|
|
SIZE clockSize = { rcClient.right - rcClient.left, rcClient.bottom - rcClient.top };
|
2014-11-02 20:18:54 +00:00
|
|
|
|
|
|
|
if (IsHorizontal)
|
|
|
|
{
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
rcClient.right -= trayClockMinSize.cx;
|
|
|
|
|
|
|
|
ptClock.x = rcClient.right;
|
|
|
|
clockSize.cx = trayClockMinSize.cx;
|
2014-11-02 20:18:54 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
rcClient.bottom -= trayClockMinSize.cy;
|
|
|
|
|
|
|
|
ptClock.y = rcClient.bottom;
|
|
|
|
clockSize.cy = trayClockMinSize.cy;
|
2014-11-02 20:18:54 +00:00
|
|
|
}
|
|
|
|
|
2018-01-28 12:21:45 +00:00
|
|
|
::SetWindowPos(m_hwndClock,
|
2014-11-02 20:18:54 +00:00
|
|
|
NULL,
|
|
|
|
ptClock.x,
|
|
|
|
ptClock.y,
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
clockSize.cx,
|
|
|
|
clockSize.cy,
|
|
|
|
swpFlags);
|
2018-01-28 20:38:48 +00:00
|
|
|
}
|
2014-11-02 20:18:54 +00:00
|
|
|
|
2018-01-28 20:38:48 +00:00
|
|
|
POINT ptPager;
|
|
|
|
if (IsHorizontal)
|
|
|
|
{
|
|
|
|
ptPager.x = ContentMargin.cxLeftWidth;
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
ptPager.y = ((rcClient.bottom - rcClient.top) - trayNotifySize.cy) / 2;
|
|
|
|
if (g_TaskbarSettings.UseCompactTrayIcons())
|
|
|
|
ptPager.y += ContentMargin.cyTopHeight;
|
2014-11-02 20:18:54 +00:00
|
|
|
}
|
2018-01-28 20:38:48 +00:00
|
|
|
else
|
|
|
|
{
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
ptPager.x = ((rcClient.right - rcClient.left) - trayNotifySize.cx) / 2;
|
|
|
|
if (g_TaskbarSettings.UseCompactTrayIcons())
|
|
|
|
ptPager.x += ContentMargin.cxLeftWidth;
|
2018-01-28 20:38:48 +00:00
|
|
|
ptPager.y = ContentMargin.cyTopHeight;
|
|
|
|
}
|
|
|
|
|
|
|
|
::SetWindowPos(m_hwndPager,
|
|
|
|
NULL,
|
|
|
|
ptPager.x,
|
|
|
|
ptPager.y,
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
trayNotifySize.cx,
|
|
|
|
trayNotifySize.cy,
|
|
|
|
swpFlags);
|
|
|
|
|
|
|
|
if (prcClient != NULL)
|
|
|
|
{
|
|
|
|
prcClient->left = rcClient.left - ContentMargin.cxLeftWidth;
|
|
|
|
prcClient->top = rcClient.top - ContentMargin.cyTopHeight;
|
|
|
|
prcClient->right = rcClient.right + ContentMargin.cxRightWidth;
|
|
|
|
prcClient->bottom = rcClient.bottom + ContentMargin.cyBottomHeight;
|
|
|
|
}
|
2014-11-02 20:18:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
LRESULT OnEraseBackground(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
|
|
|
|
{
|
|
|
|
HDC hdc = (HDC) wParam;
|
|
|
|
|
|
|
|
if (!TrayTheme)
|
|
|
|
{
|
|
|
|
bHandled = FALSE;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-01-26 23:27:24 +00:00
|
|
|
RECT rect;
|
|
|
|
GetClientRect(&rect);
|
|
|
|
if (IsThemeBackgroundPartiallyTransparent(TrayTheme, TNP_BACKGROUND, 0))
|
|
|
|
DrawThemeParentBackground(m_hWnd, hdc, &rect);
|
2014-11-02 20:18:54 +00:00
|
|
|
|
2018-01-26 23:27:24 +00:00
|
|
|
DrawThemeBackground(TrayTheme, hdc, TNP_BACKGROUND, 0, &rect, 0);
|
2014-11-02 20:18:54 +00:00
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
LRESULT OnGetMinimumSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
|
|
|
|
{
|
2017-05-27 09:09:01 +00:00
|
|
|
BOOL Horizontal = (BOOL) wParam;
|
|
|
|
|
|
|
|
if (Horizontal != IsHorizontal)
|
|
|
|
IsHorizontal = Horizontal;
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
|
|
|
|
SetWindowTheme(m_hWnd,
|
|
|
|
IsHorizontal ? L"TrayNotifyHoriz" : L"TrayNotifyVert",
|
|
|
|
NULL);
|
|
|
|
m_ShowDesktopButton.m_bHorizontal = Horizontal;
|
|
|
|
|
|
|
|
return (LRESULT)GetMinimumSize((PSIZE)lParam);
|
|
|
|
}
|
|
|
|
|
|
|
|
LRESULT OnGetShowDesktopButton(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
|
|
|
|
{
|
|
|
|
if (wParam == NULL)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
CTrayShowDesktopButton** ptr = (CTrayShowDesktopButton**)wParam;
|
|
|
|
if (!m_ShowDesktopButton)
|
|
|
|
{
|
|
|
|
*ptr = NULL;
|
|
|
|
return 0;
|
2017-05-27 09:09:01 +00:00
|
|
|
}
|
|
|
|
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
*ptr = &m_ShowDesktopButton;
|
|
|
|
bHandled = TRUE;
|
|
|
|
return 0;
|
2014-11-02 20:18:54 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
LRESULT OnSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
|
|
|
|
{
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
SIZE clientSize;
|
2014-11-02 20:18:54 +00:00
|
|
|
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
clientSize.cx = LOWORD(lParam);
|
|
|
|
clientSize.cy = HIWORD(lParam);
|
2014-11-02 20:18:54 +00:00
|
|
|
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
Size(&clientSize);
|
2014-11-02 20:18:54 +00:00
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
LRESULT OnNcHitTest(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
|
|
|
|
{
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
POINT pt;
|
|
|
|
pt.x = GET_X_LPARAM(lParam);
|
|
|
|
pt.y = GET_Y_LPARAM(lParam);
|
|
|
|
|
|
|
|
if (m_ShowDesktopButton && m_ShowDesktopButton.PtInButton(&pt))
|
|
|
|
return HTCLIENT;
|
|
|
|
|
2014-11-02 20:18:54 +00:00
|
|
|
return HTTRANSPARENT;
|
|
|
|
}
|
|
|
|
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
LRESULT OnMouseMove(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
|
|
|
|
{
|
|
|
|
POINT pt;
|
|
|
|
::GetCursorPos(&pt);
|
|
|
|
|
|
|
|
if (m_ShowDesktopButton && m_ShowDesktopButton.PtInButton(&pt))
|
|
|
|
m_ShowDesktopButton.StartHovering();
|
|
|
|
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
2018-01-26 23:27:24 +00:00
|
|
|
LRESULT OnCtxMenu(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
|
2017-10-30 15:39:12 +00:00
|
|
|
{
|
2018-01-26 23:27:24 +00:00
|
|
|
bHandled = TRUE;
|
2019-10-08 23:18:36 +00:00
|
|
|
|
|
|
|
if (reinterpret_cast<HWND>(wParam) == m_hwndClock)
|
|
|
|
return GetParent().SendMessage(uMsg, wParam, lParam);
|
|
|
|
else
|
|
|
|
return 0;
|
2017-10-30 15:39:12 +00:00
|
|
|
}
|
|
|
|
|
2018-01-26 23:27:24 +00:00
|
|
|
LRESULT OnClockMessage(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
|
2014-11-02 20:18:54 +00:00
|
|
|
{
|
2018-01-28 12:21:45 +00:00
|
|
|
return SendMessageW(m_hwndClock, uMsg, wParam, lParam);
|
2014-11-02 20:18:54 +00:00
|
|
|
}
|
|
|
|
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
LRESULT OnTaskbarSettingsChanged(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
|
|
|
|
{
|
|
|
|
TaskbarSettings* newSettings = (TaskbarSettings*)lParam;
|
|
|
|
|
|
|
|
/* Toggle show desktop button */
|
|
|
|
if (newSettings->bShowDesktopButton != g_TaskbarSettings.bShowDesktopButton)
|
|
|
|
{
|
|
|
|
g_TaskbarSettings.bShowDesktopButton = newSettings->bShowDesktopButton;
|
|
|
|
::ShowWindow(m_hwndShowDesktop, g_TaskbarSettings.bShowDesktopButton ? SW_SHOW : SW_HIDE);
|
|
|
|
|
|
|
|
/* Ask the parent to resize */
|
|
|
|
NMHDR nmh = {m_hWnd, 0, NTNWM_REALIGN};
|
|
|
|
SendMessage(WM_NOTIFY, 0, (LPARAM) &nmh);
|
|
|
|
}
|
|
|
|
|
|
|
|
return OnClockMessage(uMsg, wParam, lParam, bHandled);
|
|
|
|
}
|
|
|
|
|
2018-01-26 23:27:24 +00:00
|
|
|
LRESULT OnPagerMessage(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
|
2014-12-23 01:13:05 +00:00
|
|
|
{
|
2018-01-28 12:21:45 +00:00
|
|
|
return SendMessageW(m_hwndPager, uMsg, wParam, lParam);
|
2014-12-23 01:13:05 +00:00
|
|
|
}
|
|
|
|
|
2018-01-26 23:27:24 +00:00
|
|
|
LRESULT OnRealign(INT uCode, LPNMHDR hdr, BOOL& bHandled)
|
2017-07-28 10:04:38 +00:00
|
|
|
{
|
2018-01-26 23:27:24 +00:00
|
|
|
hdr->hwndFrom = m_hWnd;
|
|
|
|
return GetParent().SendMessage(WM_NOTIFY, 0, (LPARAM)hdr);
|
2017-07-28 10:04:38 +00:00
|
|
|
}
|
|
|
|
|
2018-01-28 12:21:45 +00:00
|
|
|
HRESULT WINAPI GetWindow(HWND* phwnd)
|
|
|
|
{
|
|
|
|
if (!phwnd)
|
|
|
|
return E_INVALIDARG;
|
|
|
|
*phwnd = m_hWnd;
|
|
|
|
return S_OK;
|
|
|
|
}
|
|
|
|
|
|
|
|
HRESULT WINAPI ContextSensitiveHelp(BOOL fEnterMode)
|
|
|
|
{
|
|
|
|
return E_NOTIMPL;
|
|
|
|
}
|
|
|
|
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
HRESULT Initialize(IN HWND hwndParent)
|
|
|
|
{
|
|
|
|
const DWORD dwStyle = WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN;
|
|
|
|
Create(hwndParent, 0, NULL, dwStyle, WS_EX_STATICEDGE);
|
|
|
|
return m_hWnd ? S_OK : E_FAIL;
|
|
|
|
}
|
|
|
|
|
2018-01-28 12:21:45 +00:00
|
|
|
DECLARE_NOT_AGGREGATABLE(CTrayNotifyWnd)
|
|
|
|
|
|
|
|
DECLARE_PROTECT_FINAL_CONSTRUCT()
|
|
|
|
BEGIN_COM_MAP(CTrayNotifyWnd)
|
|
|
|
COM_INTERFACE_ENTRY_IID(IID_IOleWindow, IOleWindow)
|
|
|
|
END_COM_MAP()
|
|
|
|
|
2014-11-02 20:18:54 +00:00
|
|
|
DECLARE_WND_CLASS_EX(szTrayNotifyWndClass, CS_DBLCLKS, COLOR_3DFACE)
|
|
|
|
|
2017-06-05 22:01:09 +00:00
|
|
|
BEGIN_MSG_MAP(CTrayNotifyWnd)
|
2014-11-02 20:18:54 +00:00
|
|
|
MESSAGE_HANDLER(WM_CREATE, OnCreate)
|
|
|
|
MESSAGE_HANDLER(WM_THEMECHANGED, OnThemeChanged)
|
|
|
|
MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackground)
|
|
|
|
MESSAGE_HANDLER(WM_SIZE, OnSize)
|
|
|
|
MESSAGE_HANDLER(WM_NCHITTEST, OnNcHitTest)
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
MESSAGE_HANDLER(WM_MOUSEMOVE, OnMouseMove)
|
|
|
|
MESSAGE_HANDLER(WM_NCMOUSEMOVE, OnMouseMove)
|
2019-10-08 23:18:36 +00:00
|
|
|
MESSAGE_HANDLER(WM_CONTEXTMENU, OnCtxMenu)
|
2018-01-26 23:27:24 +00:00
|
|
|
MESSAGE_HANDLER(WM_NCLBUTTONDBLCLK, OnClockMessage)
|
|
|
|
MESSAGE_HANDLER(WM_SETFONT, OnClockMessage)
|
|
|
|
MESSAGE_HANDLER(WM_SETTINGCHANGE, OnPagerMessage)
|
|
|
|
MESSAGE_HANDLER(WM_COPYDATA, OnPagerMessage)
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
MESSAGE_HANDLER(TWM_SETTINGSCHANGED, OnTaskbarSettingsChanged)
|
2018-01-26 23:27:24 +00:00
|
|
|
NOTIFY_CODE_HANDLER(NTNWM_REALIGN, OnRealign)
|
2014-11-02 20:18:54 +00:00
|
|
|
MESSAGE_HANDLER(TNWM_GETMINIMUMSIZE, OnGetMinimumSize)
|
[EXPLORER] Improve appearance of Show Desktop button (#5744)
While functional, Katayama's show desktop button left much to be desired
in the realm of appearances. This commit brings improvements for it:
- When using the classic theme, the Show Desktop button now appears
more faithful to its Microsoft counterpart, emblazoned with an icon,
and encased in a border only when hovered or pressed.
- With a visual style applied, the button behaves in one of two ways:
- If present, the Show Desktop button now properly uses the relevant
information from the visual style, just like on Windows 7.
- Otherwise, the Show Desktop button uses an icon akin to when the
classic theme is used, but with the button background's appearance
repurposed from the taskbar toolbar buttons, which are guaranteed to
exist in any Windows XP or Vista visual style you can find out there.
ReactOS's own Lautus and Mizu visual styles will be updated in the
following commits to utilize these features, while Lunar and Modern visual
styles left untouched to display Show Desktop button with icon instead.
CORE-15369
2023-09-30 02:16:22 +00:00
|
|
|
MESSAGE_HANDLER(TNWM_GETSHOWDESKTOPBUTTON, OnGetShowDesktopButton)
|
2014-11-02 20:18:54 +00:00
|
|
|
END_MSG_MAP()
|
|
|
|
};
|
|
|
|
|
2018-01-28 12:21:45 +00:00
|
|
|
HRESULT CTrayNotifyWnd_CreateInstance(HWND hwndParent, REFIID riid, void **ppv)
|
2014-11-02 20:18:54 +00:00
|
|
|
{
|
2018-01-28 12:21:45 +00:00
|
|
|
return ShellObjectCreatorInit<CTrayNotifyWnd>(hwndParent, riid, ppv);
|
2014-11-02 20:18:54 +00:00
|
|
|
}
|