reverted unintentional whitespace changes, and allowed offset to be used regardless of operating system

Author: hxmid

Src/StartMenu/StartMenuDLL/SettingsUI.cpp

@@ -5193,7 +5193,7 @@ static void UpdateButtons( bool bForce )
 	}
 	if (path==START_BUTTON_CUSTOM)
 		path=CalcFNVHash(GetSettingString(L"StartButtonPath"));
-	bool bRecreate = (g_bButtonEnable != GetSettingBool(L"EnableStartButton") || path != g_ButtonPath || g_ButtonSize != GetSettingInt(L"StartButtonSize") || g_ButtonOffset != GetSettingInt(L"StartButtonOffset")
+	bool bRecreate=(g_bButtonEnable!=GetSettingBool(L"EnableStartButton") || path!=g_ButtonPath || g_ButtonSize!=GetSettingInt(L"StartButtonSize") || g_ButtonOffset!=GetSettingInt(L"StartButtonOffset")
 		|| g_ButtonIcon!=icon || g_ButtonIconSize!=GetSettingInt(L"StartButtonIconSize") || g_ButtonText!=text || g_ButtonTip!=tip);
 	if ((g_bTaskbarsChanged && !g_bTaskbarsUpdated) || bForce || bRecreate)
 	{

Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp

@@ -498,8 +498,8 @@ class CStartMenuTarget: public IDropTarget
 		return E_NOINTERFACE;
 	}
 
-	virtual ULONG STDMETHODCALLTYPE AddRef( void )
-	{
+	virtual ULONG STDMETHODCALLTYPE AddRef( void ) 
+	{ 
 		return InterlockedIncrement(&m_RefCount);
 	}
 
@@ -1345,13 +1345,11 @@ static void UpdateStartButtonPosition(const TaskbarInfo* taskBar, const WINDOWPO
 
 		// Start button on Win11 is a bit shifted to the right
 		// We will shift our Aero button to cover original button
-		if (IsWin11() && (x == info.rcMonitor.left) && !g_epTaskbar) {
-			if (GetStartButtonType() == START_BUTTON_AERO)
-				x += ScaleForDpi(taskBar->taskBar, 6);
-			// we should also be able to shift our custom icon, as it's also incorrectly aligned to the left edge on Windows 11
-			else if (GetStartButtonType() == START_BUTTON_CUSTOM)
-				x += ScaleForDpi(taskBar->taskBar, GetSettingInt(L"StartButtonOffset"));
-		}
+		if (IsWin11() && (x == info.rcMonitor.left) && (GetStartButtonType() == START_BUTTON_AERO) && !g_epTaskbar)
+			x += ScaleForDpi(taskBar->taskBar, 6);
+
+		if (GetStartButtonType() == START_BUTTON_CUSTOM)
+			x += ScaleForDpi(taskBar->taskBar, GetSettingInt(L"StartButtonOffset"));
 	}
 
 	RECT rcButton = { x, y, x + taskBar->startButtonSize.cx, y + taskBar->startButtonSize.cy };
@@ -2394,7 +2392,7 @@ void UpdateTaskBars( TUpdateTaskbar update )
 			{
 				if (bDefColor && GetWinVersion()>WIN_VER_WIN7)
 				{
-					if (IsAppThemed())
+					if (IsAppThemed()) 
 					{
 						color=GetSystemGlassColor8();
 						color=((color&0xFF)<<16)|(color&0xFF00)|((color>>16)&0xFF);
@@ -4311,7 +4309,7 @@ HBITMAP GetStartScreenIcon( int size )
 	}
 	SelectObject(hDst,bmp0);
 	DeleteDC(hDst);
-
+	
 	int i=0;
 	int n=size*rc.top;
 	for (;i<n;i++)

Src/StartMenu/StartMenuDLL/StartMenuDLL.rc

@@ -53,7 +53,7 @@ END
 
 IDD_RENAME DIALOGEX 0, 0, 227, 54
 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_TOPMOST
+    EXSTYLE WS_EX_TOPMOST
 CAPTION "Rename"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
@@ -1073,7 +1073,7 @@ BEGIN
     IDS_MENU_GLASS          "Enable Aero Glass (requires Aero Glass mod)"
     IDS_MENU_GLASS_TIP      "Check this to use glass transparency (requires the Aero Glass mod to be installed)"
     IDS_MAIN_MENU_SETTINGS  "Main Menu"
-	IDS_BUTTON_OFFSET		"Button left offset"
+	IDS_BUTTON_OFFSET		"Button offset"
 	IDS_BUTTON_OFFSET_TIP	"Offset the start button horizontally by the amount of pixels specified"
 END