mirror of
https://github.com/reactos/reactos.git
synced 2024-07-03 03:04:22 +00:00
77653462a9
Automatically adjusts the spacing of the tray icons according to the small or large taskbar icons setting. Also, a minor bug fix to the clock spacing when switching between taskbar icon sizes. CORE-19380 Update the ROS-specific CompactTrayIcons registry value from a binary yes/no to have three states. The three states are as follows: 0 (default) - Automatic. When small taskbar icons are used, the notification area will use compact tray icon spacing. When large taskbar icons are used, the notification area will use larger tray icon spacing. While no version of Windows behaves this way, I believe this is a smart default choice for ReactOS since users wanting large taskbar icons will generally expect larger tray icon spacing, while users with small taskbar icons may want more compact spacing. 1 - Never Compact. Regardless of the taskbar icon size setting, the notification area will always use the larger spacing. This follows the behavior of Windows 7 and newer versions. 2 - Always Compact. Regardless of the taskbar icon size setting, the notification area will always use the compact spacing. This follows the behavior of Windows Vista and older versions. Fix a clock spacing bug that occurs when changing the taskbar size before advancing to the next minute. The taskbar clock now adjusts its spacing when the size of the taskbar changes.
99 lines
4.1 KiB
C++
99 lines
4.1 KiB
C++
/*
|
|
* ReactOS Explorer
|
|
*
|
|
* Copyright 2013 - Edijs Kolesnikovics
|
|
*
|
|
* 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"
|
|
|
|
TaskbarSettings g_TaskbarSettings;
|
|
|
|
BOOL TaskbarSettings::Save()
|
|
{
|
|
SHSetValueW(hkExplorer, NULL, L"EnableAutotray", REG_DWORD, &bHideInactiveIcons, sizeof(bHideInactiveIcons));
|
|
SHSetValueW(hkExplorer, L"Advanced", L"PreferDateOverWeekday", REG_DWORD, &bPreferDate, sizeof(bPreferDate));
|
|
SHSetValueW(hkExplorer, L"Advanced", L"ShowSeconds", REG_DWORD, &bShowSeconds, sizeof(bShowSeconds));
|
|
SHSetValueW(hkExplorer, L"Advanced", L"TaskbarGlomming", REG_DWORD, &bGroupButtons, sizeof(bGroupButtons));
|
|
BOOL bAllowSizeMove = !bLock;
|
|
SHSetValueW(hkExplorer, L"Advanced", L"TaskbarSizeMove", REG_DWORD, &bAllowSizeMove, sizeof(bAllowSizeMove));
|
|
sr.cbSize = sizeof(sr);
|
|
SHSetValueW(hkExplorer, L"Advanced", L"TaskbarSmallIcons", REG_DWORD, &bSmallIcons, sizeof(bSmallIcons));
|
|
SHSetValueW(hkExplorer, L"Advanced", L"TaskbarSd", REG_DWORD, &bShowDesktopButton, sizeof(bShowDesktopButton));
|
|
SHSetValueW(hkExplorer, L"StuckRects2", L"Settings", REG_BINARY, &sr, sizeof(sr));
|
|
|
|
/* TODO: AutoHide writes something to HKEY_CURRENT_USER\Software\Microsoft\Internet Explorer\Desktop\Components\0 figure out what and why */
|
|
return TRUE;
|
|
}
|
|
|
|
BOOL TaskbarSettings::Load()
|
|
{
|
|
DWORD dwRet, cbSize, dwValue = NULL;
|
|
|
|
cbSize = sizeof(dwValue);
|
|
dwRet = SHGetValueW(hkExplorer, L"Advanced", L"TaskbarSizeMove", NULL, &dwValue, &cbSize);
|
|
bLock = (dwRet == ERROR_SUCCESS) ? (dwValue == 0) : TRUE;
|
|
|
|
dwRet = SHGetValueW(hkExplorer, L"Advanced", L"PreferDateOverWeekday", NULL, &dwValue, &cbSize);
|
|
bPreferDate = (dwRet == ERROR_SUCCESS) ? (dwValue != 0) : FALSE; /* This is opt-in setting */
|
|
|
|
dwRet = SHGetValueW(hkExplorer, L"Advanced", L"ShowSeconds", NULL, &dwValue, &cbSize);
|
|
bShowSeconds = (dwRet == ERROR_SUCCESS) ? (dwValue != 0) : FALSE;
|
|
|
|
dwRet = SHGetValueW(hkExplorer, L"Advanced", L"TaskbarGlomming", NULL, &dwValue, &cbSize);
|
|
bGroupButtons = (dwRet == ERROR_SUCCESS) ? (dwValue != 0) : FALSE;
|
|
|
|
dwRet = SHGetValueW(hkExplorer, NULL, L"EnableAutotray", NULL, &dwValue, &cbSize);
|
|
bHideInactiveIcons = (dwRet == ERROR_SUCCESS) ? (dwValue != 0) : FALSE;
|
|
|
|
dwRet = SHGetValueW(hkExplorer, L"Advanced", L"TaskbarSmallIcons", NULL, &dwValue, &cbSize);
|
|
bSmallIcons = (dwRet == ERROR_SUCCESS) ? (dwValue != 0) : TRUE;
|
|
|
|
dwRet = SHGetValueW(hkExplorer, L"Advanced", L"CompactTrayIcons", NULL, &dwValue, &cbSize);
|
|
if (dwRet == ERROR_SUCCESS && dwValue <= TIM_Max)
|
|
eCompactTrayIcons = static_cast<TrayIconsMode>(dwValue);
|
|
else
|
|
eCompactTrayIcons = TIM_Default;
|
|
|
|
dwRet = SHGetValueW(hkExplorer, L"Advanced", L"TaskbarSd", NULL, &dwValue, &cbSize);
|
|
bShowDesktopButton = (dwRet == ERROR_SUCCESS) ? (dwValue != 0) : TRUE;
|
|
|
|
cbSize = sizeof(sr);
|
|
dwRet = SHGetValueW(hkExplorer, L"StuckRects2", L"Settings", NULL, &sr, &cbSize);
|
|
|
|
/* Make sure we have correct values here */
|
|
if (dwRet != ERROR_SUCCESS || sr.cbSize != sizeof(sr) || cbSize != sizeof(sr))
|
|
{
|
|
sr.Position = ABE_BOTTOM;
|
|
sr.AutoHide = FALSE;
|
|
sr.AlwaysOnTop = TRUE;
|
|
sr.SmallIcons = TRUE;
|
|
sr.HideClock = FALSE;
|
|
sr.Rect.left = sr.Rect.top = 0;
|
|
sr.Rect.bottom = sr.Rect.right = 1;
|
|
sr.Size.cx = sr.Size.cy = 0;
|
|
}
|
|
else
|
|
{
|
|
if (sr.Position > ABE_BOTTOM)
|
|
sr.Position = ABE_BOTTOM;
|
|
}
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
/* EOF */
|