Refactoring and localisation

Author: noraa-junker

src/modules/ShortcutGuide/ShortcutGuide/pch.h

@@ -1,9 +1,11 @@
 #pragma once
 #define NOMINMAX
+#include <vector>
 #include <winrt/base.h>
+#include <UIAutomation.h>
+#include <windows.h>
 #include <winrt/Windows.Foundation.h>
 #include <winrt/Windows.Foundation.Collections.h>
-#include <Windows.h>
 #include <dxgi1_3.h>
 #include <d3d11_2.h>
 #include <d2d1_3.h>
@@ -24,5 +26,4 @@
 #include <stdexcept>
 #include <tuple>
 #include <unordered_set>
-#include <string>
 #include <filesystem>

src/modules/ShortcutGuide/ShortcutGuide/tasklist_positions.cpp

@@ -1,17 +1,10 @@
 #include "pch.h"
 #include "tasklist_positions.h"
-#include <windows.h>
-#include <vector>
-#include <winrt/base.h>
-#include <UIAutomation.h>
+
+// Tried my hardest adapting this to C#, but FindWindowW didn't work properly in C#. ~Noraa Junker
 
 extern "C"
 {
-    winrt::com_ptr<IUIAutomation> automation;
-    winrt::com_ptr<IUIAutomationElement> element;
-    winrt::com_ptr<IUIAutomationCondition> true_condition;
-
-    // Helper to get the taskbar HWND for the monitor under the cursor
     HWND GetTaskbarHwndForCursorMonitor(HMONITOR monitor)
     {
         POINT pt;
@@ -124,7 +117,7 @@ extern "C"
             child = nullptr;
             if (elements->GetElement(i, child.put()) < 0)
                 return false;
-            TasklistButton button;
+            TasklistButton button = {};
             if (VARIANT var_rect; child->GetCurrentPropertyValue(UIA_BoundingRectanglePropertyId, &var_rect) >= 0)
             {
                 if (var_rect.vt == (VT_R8 | VT_ARRAY))

src/modules/ShortcutGuide/ShortcutGuide/tasklist_positions.h

@@ -1,9 +1,4 @@
 #pragma once
-#include <vector>
-#include <unordered_set>
-#include <string>
-#include <Windows.h>
-#include <UIAutomationClient.h>
 
 struct TasklistButton
 {
@@ -14,3 +9,15 @@ struct TasklistButton
     int height;
     int keynum;
 };
+
+extern "C"
+{
+    winrt::com_ptr<IUIAutomation> automation;
+    winrt::com_ptr<IUIAutomationElement> element;
+    winrt::com_ptr<IUIAutomationCondition> true_condition;
+
+    // Helper to get the taskbar HWND for the monitor under the cursor
+    HWND GetTaskbarHwndForCursorMonitor(HMONITOR monitor);
+    __declspec(dllexport) bool update_buttons(std::vector<TasklistButton>& buttons);
+    __declspec(dllexport) TasklistButton* get_buttons(HMONITOR monitor, int* size);
+}

src/modules/ShortcutGuideV2/ShortcutGuide.IndexYmlGenerator/ShortcutGuide.IndexYmlGenerator/IndexYmlGenerator.cs

@@ -4,6 +4,7 @@
 
 using System.Collections.Generic;
 using System.IO;
+using ShortcutGuide.Helpers;
 using ShortcutGuide.Models;
 using YamlDotNet.Serialization;
 

src/modules/ShortcutGuideV2/ShortcutGuide.Ui/DisplayHelper.cs

@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using Windows.Foundation;
+using WinUIEx;
+
+namespace ShortcutGuide.Helpers
+{
+    public static partial class DisplayHelper
+    {
+        private enum MonitorFromWindowDwFlags : int
+        {
+            MONITOR_DEFAULTTONEAREST = 2,
+        }
+
+        public static Rect GetWorkAreaForDisplayWithWindow(nint hwnd)
+        {
+            foundMonitorIndex = -1;
+            monitorIndex = 0;
+            var monitor = NativeMethods.MonitorFromWindow(hwnd, (int)MonitorFromWindowDwFlags.MONITOR_DEFAULTTONEAREST);
+            NativeMethods.EnumDisplayMonitors(nint.Zero, nint.Zero, MonitorEnumProc, new NativeMethods.LPARAM(monitor));
+            return MonitorInfo.GetDisplayMonitors()[foundMonitorIndex].RectWork;
+        }
+
+        private static int foundMonitorIndex = -1;
+        private static int monitorIndex;
+
+        private static bool MonitorEnumProc(nint hMonitor, nint hdcMonitor, ref NativeMethods.RECT lprcMonitor, nint dwData)
+        {
+            nint targetMonitor = dwData;
+
+            if (hMonitor == targetMonitor)
+            {
+                foundMonitorIndex = monitorIndex;
+                return false;
+            }
+
+            monitorIndex++;
+            return true;
+        }
+    }
+}

src/modules/ShortcutGuideV2/ShortcutGuide.Ui/Helpers/DisplayHelper.cs

@@ -2,7 +2,7 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-namespace ShortcutGuide
+namespace ShortcutGuide.Helpers
 {
     // This class is rewritten from C++ to C# from the measure tool project
     internal static partial class DpiHelper

src/modules/ShortcutGuideV2/ShortcutGuide.Ui/DpiHelper.cs renamed to src/modules/ShortcutGuideV2/ShortcutGuide.Ui/Helpers/DpiHelper.cs

@@ -13,7 +13,7 @@
 using ShortcutGuide.Models;
 using YamlDotNet.Serialization;
 
-namespace ShortcutGuide
+namespace ShortcutGuide.Helpers
 {
     public class ManifestInterpreter
     {
@@ -26,17 +26,11 @@ public static ShortcutFile GetShortcutsOfApplication(string applicationName)
             IEnumerable<string> files = Directory.EnumerateFiles(path, applicationName + ".*.yml") ??
                 throw new FileNotFoundException($"The file for the application '{applicationName}' was not found in '{path}'.");
 
-            if (files.Any(f => f.EndsWith($".{Language}.yml", StringComparison.InvariantCulture)))
-            {
-                return YamlToShortcutList(File.ReadAllText(Path.Combine(path, applicationName + $".{Language}.yml")));
-            }
-
-            if (files.Any(f => f.EndsWith(".en-US.yml", StringComparison.InvariantCulture)))
-            {
-                return YamlToShortcutList(File.ReadAllText(files.First(f => f.EndsWith(".en-US.yml", StringComparison.InvariantCulture))));
-            }
-
-            throw new FileNotFoundException($"The file for the application '{applicationName}' was not found in '{path}' with the language '{Language}' or 'en-US'.");
+            return files.Any(f => f.EndsWith($".{Language}.yml", StringComparison.InvariantCulture))
+                ? YamlToShortcutList(File.ReadAllText(Path.Combine(path, applicationName + $".{Language}.yml")))
+                : files.Any(f => f.EndsWith(".en-US.yml", StringComparison.InvariantCulture))
+                ? YamlToShortcutList(File.ReadAllText(files.First(f => f.EndsWith(".en-US.yml", StringComparison.InvariantCulture))))
+                : throw new FileNotFoundException($"The file for the application '{applicationName}' was not found in '{path}' with the language '{Language}' or 'en-US'.");
         }
 
         public static ShortcutFile YamlToShortcutList(string content)
@@ -60,7 +54,7 @@ public static IndexFile GetIndexYamlFile()
 
         public static string[] GetAllCurrentApplicationIds()
         {
-            IntPtr handle = NativeMethods.GetForegroundWindow();
+            nint handle = NativeMethods.GetForegroundWindow();
 
             List<string> applicationIds = [];
 

src/modules/ShortcutGuideV2/ShortcutGuide.Ui/ManifestInterpreter.cs renamed to src/modules/ShortcutGuideV2/ShortcutGuide.Ui/Helpers/ManifestInterpreter.cs

@@ -7,6 +7,7 @@
 using System.IO;
 using System.Text.RegularExpressions;
 using Microsoft.PowerToys.Settings.UI.Library;
+using ShortcutGuide.Helpers;
 
 namespace ShortcutGuide
 {

src/modules/ShortcutGuideV2/ShortcutGuide.Ui/PowerToysShortcutsPopulator.cs renamed to src/modules/ShortcutGuideV2/ShortcutGuide.Ui/Helpers/PowerToysShortcutsPopulator.cs

@@ -0,0 +1,38 @@
+// Copyright (c) Microsoft Corporation
+// The Microsoft Corporation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Runtime.InteropServices;
+using TasklistButton = NativeMethods.TasklistButton;
+
+namespace ShortcutGuide.Helpers
+{
+    internal sealed partial class TasklistPositions
+    {
+        public static TasklistButton[] GetButtons()
+        {
+            var monitor = NativeMethods.MonitorFromWindow(MainWindow.WindowHwnd, 0);
+            nint ptr = NativeMethods.GetTasklistButtons(monitor, out int size);
+            if (ptr == nint.Zero)
+            {
+                return [];
+            }
+
+            if (size <= 0)
+            {
+                return [];
+            }
+
+            TasklistButton[] buttons = new TasklistButton[size];
+            nint currentPtr = ptr;
+            for (int i = 0; i < size; i++)
+            {
+                buttons[i] = Marshal.PtrToStructure<TasklistButton>(currentPtr);
+                currentPtr += Marshal.SizeOf<TasklistButton>();
+            }
+
+            return buttons;
+        }
+    }
+}