From fccdfba6e345b23d2885ffeed8dfc8ea55121f5b Mon Sep 17 00:00:00 2001
From: Michael Maltsev <4129781+m417z@users.noreply.github.com>
Date: Sun, 28 Jul 2024 21:04:41 +0300
Subject: [PATCH] Windows 11 Start Menu Styler v1.1.5

* Updated SideBySide2 theme with several fixes.
---
 mods/windows-11-start-menu-styler.wh.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/mods/windows-11-start-menu-styler.wh.cpp b/mods/windows-11-start-menu-styler.wh.cpp
index f27970c0b..c96ec3b27 100644
--- a/mods/windows-11-start-menu-styler.wh.cpp
+++ b/mods/windows-11-start-menu-styler.wh.cpp
@@ -2,7 +2,7 @@
 // @id              windows-11-start-menu-styler
 // @name            Windows 11 Start Menu Styler
 // @description     Customize the start menu with themes contributed by others or create your own
-// @version         1.1.4
+// @version         1.1.5
 // @author          m417z
 // @github          https://github.com/m417z
 // @twitter         https://twitter.com/m417z
@@ -336,13 +336,14 @@ const Theme g_themeSideBySide2 = {{
         L"Margin=2,0,0,0"}},
     ThemeTargetStyles{L"Windows.UI.Xaml.Controls.Button#HideMoreSuggestionsButton > Windows.UI.Xaml.Controls.ContentPresenter#ContentPresenter > Windows.UI.Xaml.Controls.StackPanel > Windows.UI.Xaml.Controls.FontIcon ", {
         L"FontSize=12"}},
-    ThemeTargetStyles{L"StartDocked.SearchBoxToggleButton#StartMenuSearchBox > Grid > Border#BorderElement", {
-        L"Background=White"}},
     ThemeTargetStyles{L"Windows.UI.Xaml.Controls.FlyoutPresenter[1]", {
-        L"Transform3D:=<CompositeTransform3D   TranslateX=\"-240\" TranslateY=\"-10\"/>",
-        L"Margin=0,-10,0,0"}},
+        L"Margin=-240,-20,0,0"}},
     ThemeTargetStyles{L"Windows.UI.Xaml.Controls.FlyoutPresenter > Grid", {
         L"Margin=-450,0,450,0"}},
+    ThemeTargetStyles{L"Panel", {
+        L"FlowDirection=1"}},
+    ThemeTargetStyles{L"Windows.UI.Xaml.Controls.FlyoutPresenter", {
+        L"Margin=-10,-8,0,0"}},
 }};
 
 const Theme g_themeSideBySideMinimal = {{
@@ -733,7 +734,7 @@ const Theme g_themeWindows10 = {{
         L"BorderBrush:=<RevealBorderBrush Color=\"Transparent\" TargetTheme=\"1\" Opacity=\"0.8\"/>"}},
 }};
 
-const Theme g_themeWindows10_24H2 = {{
+const Theme g_themeWindows10_variant_24H2 = {{
     ThemeTargetStyles{L"Grid", {
         L"RequestedTheme=2"}},
     ThemeTargetStyles{L"Grid#RootContent", {
@@ -2386,7 +2387,7 @@ void ProcessAllStylesFromSettings() {
         theme = &g_themeFluent2Inspired;
     } else if (wcscmp(themeName, L"Windows10") == 0) {
         if (IsVersionAtLeast(10, 0, 26100, 0)) {
-            theme = &g_themeWindows10_24H2;
+            theme = &g_themeWindows10_variant_24H2;
         } else {
             theme = &g_themeWindows10;
         }