Merge branch 'mgth:master' into master

mgfarmer · web-flow · commit f5c7d65423ce · 2024-03-06T17:53:43.000-08:00
diff --git a/HLab.Avalonia b/HLab.Avalonia
@@ -1 +1 @@
-Subproject commit 98c7d99fb75b67461079ed4421737bf5021762a9
+Subproject commit 266926be492d20861959320fe78d8319ab1a1619
diff --git a/HLab.Core b/HLab.Core
@@ -1 +1 @@
-Subproject commit d292dfeb8184f2b9153272cbbbaf865315a99c13
+Subproject commit 7272f4a86f975be3fb4f7ec515515efd9ab380a5
diff --git a/HLab.Sys/HLab.Sys.Argyll/HLab.Sys.Argyll.csproj b/HLab.Sys/HLab.Sys.Argyll/HLab.Sys.Argyll.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-	  <PackageReference Include="Avalonia" Version="11.0.6" />
-	  <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.6" />
+	  <PackageReference Include="Avalonia" Version="11.0.7" />
+	  <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.7" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/HLab.Sys/HLab.Sys.Windows.MonitorVcp.Avalonia/HLab.Sys.Windows.MonitorVcp.Avalonia.csproj b/HLab.Sys/HLab.Sys.Windows.MonitorVcp.Avalonia/HLab.Sys.Windows.MonitorVcp.Avalonia.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.0.6" />
+    <PackageReference Include="Avalonia" Version="11.0.7" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/HLab.Sys/HLab.Sys.Windows.Monitors/Factory/DeviceFactory.cs b/HLab.Sys/HLab.Sys.Windows.Monitors/Factory/DeviceFactory.cs
@@ -121,10 +121,9 @@ static DisplayDevice BuildDisplayDevice(DisplayDevice parent, WinGdi.DisplayDevi
             case "RdpIdd_IndirectDisplay":
             case string s when s.StartsWith("VID_DATRONICSOFT_PID_SPACEDESK_VIRTUAL_DISPLAY_"):
             case "PCI":
-
-                return BuildPhysicalAdapter(parent, device);
-
             default:
+                if(parent.Id=="ROOT")
+                    return BuildPhysicalAdapter(parent, device);
                 break;
         }
 
diff --git a/HLab.Sys/HLab.Sys.Windows.Monitors/HLab.Sys.Windows.Monitors.csproj b/HLab.Sys/HLab.Sys.Windows.Monitors/HLab.Sys.Windows.Monitors.csproj
@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.6" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.7" />
     <PackageReference Include="System.Management" Version="8.0.0" />
   </ItemGroup>
 
diff --git a/LittleBigMouse.Core/LittleBigMouse.DisplayLayout/LittleBigMouse.DisplayLayout.csproj b/LittleBigMouse.Core/LittleBigMouse.DisplayLayout/LittleBigMouse.DisplayLayout.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.6" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.7" />
     <PackageReference Include="H.Pipes" Version="2.0.59" />
     <PackageReference Include="MessageBox.Avalonia" Version="3.1.5.1" />
     <PackageReference Include="Microsoft.Win32.SystemEvents" Version="8.0.0" />
diff --git a/LittleBigMouse.Core/LittleBigMouse.Zones/LittleBigMouse.Zoning.csproj b/LittleBigMouse.Core/LittleBigMouse.Zones/LittleBigMouse.Zoning.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.0.6" />
+    <PackageReference Include="Avalonia" Version="11.0.7" />
     <PackageReference Include="Avalonia.MatrixExtensions" Version="3.0.0-preview6" />
     <PackageReference Include="System.Linq.Expressions" Version="4.3.0" />
   </ItemGroup>
diff --git a/LittleBigMouse.Daemon/LittleBigMouse.Hook/HookerWinEvents.cpp b/LittleBigMouse.Daemon/LittleBigMouse.Hook/HookerWinEvents.cpp
@@ -69,25 +69,36 @@ void CALLBACK Hooker::WindowChangeHook(
     if (hWnd != nullptr) {
 	    const DWORD processId = GetProcessIdFromWindow(hWnd);
 	    const LONG style = GetWindowLong(hWnd, GWL_STYLE);
-        if (processId != 0) {
-	        auto exePath = GetExecutablePathFromProcessId(processId);
+        if (processId != 0) 
+        {
+	        const auto exePath = GetExecutablePathFromProcessId(processId);
 
             #if defined(_DEBUG)
             std::cout << "Window: " << (style & WS_MAXIMIZE) << '\n';
             #endif
 
-            if (!exePath.empty()) {
-                // Use the executable path as needed
-                wprintf(L"Executable Path: %s\n", exePath.c_str());
+            if (!exePath.empty()) 
+            {
+	            #if defined(_DEBUG)
+	                wprintf(L"Executable Path: %s\n", exePath.c_str());
+	            #endif
 
                 Instance()->OnFocusChanged.fire(to_string(exePath));
 
-            } else {
+            }
+	        #if defined(_DEBUG)
+        	else 
+            {
                 wprintf(L"Unable to retrieve the executable path.\n");
             }
-        } else {
+	        #endif
+        }
+	    #if defined(_DEBUG)
+    	else 
+        {
             wprintf(L"Unable to retrieve the process ID.\n");
         }
+	    #endif
     }
 }
 
diff --git a/LittleBigMouse.Plugins/LittleBigMouse.Plugin.Layout.Avalonia/LittleBigMouse.Plugin.Layout.Avalonia.csproj b/LittleBigMouse.Plugins/LittleBigMouse.Plugin.Layout.Avalonia/LittleBigMouse.Plugin.Layout.Avalonia.csproj
@@ -21,8 +21,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.0.6" />
-    <PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="11.0.6" />
+    <PackageReference Include="Avalonia" Version="11.0.7" />
+    <PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="11.0.7" />
   </ItemGroup>
 
 	<ItemGroup>
diff --git a/LittleBigMouse.Plugins/LittleBigMouse.Plugin.Vcp.Avalonia/LittleBigMouse.Plugin.Vcp.Avalonia.csproj b/LittleBigMouse.Plugins/LittleBigMouse.Plugin.Vcp.Avalonia/LittleBigMouse.Plugin.Vcp.Avalonia.csproj
@@ -21,9 +21,9 @@
   </ItemGroup>
 
   <ItemGroup>
-	  <PackageReference Include="Avalonia" Version="11.0.6" />
-	  <PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="11.0.6" />
-	  <PackageReference Include="ScottPlot.Avalonia" Version="5.0.10-beta" />
+	  <PackageReference Include="Avalonia" Version="11.0.7" />
+	  <PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="11.0.7" />
+	  <PackageReference Include="ScottPlot.Avalonia" Version="5.0.18" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/LittleBigMouse.Plugins/LittleBigMouse.Plugins.Avalonia/LittleBigMouse.Plugins.Avalonia.csproj b/LittleBigMouse.Plugins/LittleBigMouse.Plugins.Avalonia/LittleBigMouse.Plugins.Avalonia.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.6" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.7" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/LittleBigMouse.Ui/LittleBigMouse.Ui.Avalonia/Assets/Icon/Pnp/Hp.HPQ.HPD.HPC.svg b/LittleBigMouse.Ui/LittleBigMouse.Ui.Avalonia/Assets/Icon/Pnp/Hp.HPQ.HPD.HPC.svg
diff --git a/LittleBigMouse.Ui/LittleBigMouse.Ui.Avalonia/Assets/Icon/Pnp/LittleBigMouse.LBM.svg b/LittleBigMouse.Ui/LittleBigMouse.Ui.Avalonia/Assets/Icon/Pnp/LittleBigMouse.LBM.svg
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="760"
+   height="760"
+   viewBox="0 0 760 760"
+   enable-background="new 0 0 512 512"
+   xml:space="preserve"
+   inkscape:version="1.3.1 (91b66b0783, 2023-11-16)"
+   sodipodi:docname="LittleBigMouse.LBM.svg"
+   inkscape:export-filename="lbm-on.png"
+   inkscape:export-xdpi="2.0109527"
+   inkscape:export-ydpi="2.0109527"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
+     id="metadata19"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs17"><filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:label="Drop Shadow"
+       id="filter4878"
+       width="1.3712588"
+       height="1.2359195"
+       x="-0.15529261"
+       y="-0.10288574"><feFlood
+         flood-opacity="0.498039"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4880" /><feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite4882" /><feGaussianBlur
+         in="composite1"
+         stdDeviation="10.6"
+         result="blur"
+         id="feGaussianBlur4884" /><feOffset
+         dx="20"
+         dy="15"
+         result="offset"
+         id="feOffset4886" /><feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="composite2"
+         id="feComposite4888" /></filter></defs><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="3840"
+     inkscape:window-height="2054"
+     id="namedview15"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="0.12901622"
+     inkscape:cx="2693.4598"
+     inkscape:cy="-620.07707"
+     inkscape:window-x="1609"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:showpageshadow="2"><inkscape:grid
+       id="grid1"
+       units="px"
+       originx="0"
+       originy="0"
+       spacingx="1"
+       spacingy="1"
+       empcolor="#0099e5"
+       empopacity="0.30196078"
+       color="#0099e5"
+       opacity="0.14901961"
+       empspacing="5"
+       dotted="false"
+       gridanglex="30"
+       gridanglez="30"
+       visible="true" /></sodipodi:namedview><path
+     id="rect1"
+     style="fill:#000000;stroke-width:0.992644"
+     d="M 0,120 V 440 H 230 C 199.79186,233.40622 270.66134,149.98828 385.375,120 Z"
+     sodipodi:nodetypes="ccccc" /><path
+     id="rect1-2"
+     style="fill:#000000;stroke-width:0.996329"
+     d="m 535,320 c 17.87014,123.79023 42.3471,249.16654 -160.375,320 H 760 V 317.61914 Z"
+     sodipodi:nodetypes="ccccc" /><path
+     id="rect3"
+     style="fill:#000000;stroke-width:1.0235"
+     d="M 370 120 C 275.82009 120 200 195.82009 200 290 L 200 470 C 200 564.17991 275.82009 640 370 640 L 390 640 C 484.17991 640 560 564.17991 560 470 L 560 290 C 560 195.82009 484.17991 120 390 120 L 370 120 z M 372.98828 160 L 392.01172 160 C 465.68728 160 525 219.31272 525 292.98828 L 525 472.01172 C 525 545.68728 465.68728 605 392.01172 605 L 372.98828 605 C 299.31272 605 240 545.68728 240 472.01172 L 240 292.98828 C 240 219.31272 299.31272 160 372.98828 160 z " /><rect
+     style="fill:#000000;stroke-width:0.818766"
+     id="rect5"
+     width="40.000008"
+     height="69.999992"
+     x="360"
+     y="152.77344"
+     ry="0" /><path
+     id="rect4"
+     style="fill:#000000;stroke-width:0.929982"
+     d="M 375.45898,200 C 344.73447,200 320,224.73447 320,255.45898 v 69.08204 C 320,355.26553 344.73447,380 375.45898,380 h 9.08204 C 415.26553,380 440,355.26553 440,324.54102 V 255.45898 C 440,224.73447 415.26553,200 384.54102,200 Z"
+     sodipodi:nodetypes="sssssssss" /></svg>
diff --git a/LittleBigMouse.Ui/LittleBigMouse.Ui.Avalonia/Assets/Icon/Pnp/Windows.svg b/LittleBigMouse.Ui/LittleBigMouse.Ui.Avalonia/Assets/Icon/Pnp/Windows.svg
diff --git a/LittleBigMouse.Ui/LittleBigMouse.Ui.Avalonia/LittleBigMouse.Ui.Avalonia.csproj b/LittleBigMouse.Ui/LittleBigMouse.Ui.Avalonia/LittleBigMouse.Ui.Avalonia.csproj
@@ -50,17 +50,17 @@
 
   <ItemGroup>
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Include="Avalonia" Version="11.0.6" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.6" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.6" />
-    <PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="11.0.6" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.6" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.6" />
+    <PackageReference Include="Avalonia" Version="11.0.7" />
+    <PackageReference Include="Avalonia.Desktop" Version="11.0.7" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.7" />
+    <PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="11.0.7" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.7" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.7" />
     <PackageReference Include="Grace" Version="8.0.0-RC837" />
     <PackageReference Include="Live.Avalonia" Version="1.4.1" />
     <PackageReference Include="MessageBox.Avalonia" Version="3.1.5.1" />
     <PackageReference Include="Microsoft.NETCore.Platforms" Version="8.0.0-preview.7.23375.6" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.1" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.2" />
     <PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
   </ItemGroup>
 
diff --git a/LittleBigMouse.Ui/LittleBigMouse.Ui.Avalonia/Main/LayoutFactory.cs b/LittleBigMouse.Ui/LittleBigMouse.Ui.Avalonia/Main/LayoutFactory.cs
diff --git a/LittleBigMouse.Ui/LittleBigMouse.Ui.Avalonia/MonitorFrame/MonitorFrameViewModel.cs b/LittleBigMouse.Ui/LittleBigMouse.Ui.Avalonia/MonitorFrame/MonitorFrameViewModel.cs
