[Thumbnail providers] Cover errors and edge cases (#23947 )

* [Thumbnail providers] Cover errors and edge cases * Add TODO comment * Fix tests
[FancyZones] Keep the same layouts on the new virtual desktops. (#23927 )
2025-12-29 08:29:10 +01:00 · 2023-02-07 20:18:50 +00:00 · 2023-02-07 12:07:23 +00:00 · 2023-02-07 12:07:17 +00:00 · 2023-02-06 17:16:12 +01:00 · 2023-02-06 16:49:31 +01:00
42 changed files with 520 additions and 230 deletions
--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
@@ -1479,6 +1479,7 @@ rescap
 resgen
 resheader
 resizers
+RESIZETOFIT
 resmimetype
 RESOURCEID
 resourcemanager
--- a/installer/PowerToysSetup/Core.wxs
+++ b/installer/PowerToysSetup/Core.wxs
@@ -14,7 +14,7 @@
    <DirectoryRef Id="INSTALLFOLDER" FileSource="$(var.BinDir)">
      <Component Id="powertoys_toast_clsid" Win64="yes">
        <RemoveFolder Id='Remove_powertoys_toast_clsid' On='uninstall' />
-        <RegistryKey Root="HKCU" Key="Software\Classes\CLSID\{DD5CACDA-7C2E-4997-A62A-04A597B58F76}">
+        <RegistryKey Root="HKCR" Key="Software\Classes\CLSID\{DD5CACDA-7C2E-4997-A62A-04A597B58F76}">
          <RegistryValue Type="string" Value="PowerToys Toast Notifications Background Activator" />
          <RegistryValue Type="string" Key="LocalServer32" Value="[INSTALLFOLDER]PowerToys.exe -ToastActivated" />
          <RegistryValue Type="string" Key="LocalServer32" Name="ThreadingModel" Value="Apartment" />
@@ -22,7 +22,7 @@
      </Component>
      <Component Id="powertoys_exe" Win64="yes" Guid="30261594-41A6-4509-AD09-FBC4E692F441">
        <File Id="PowerToys.exe" Checksum="yes" />
-        <RegistryKey Root="HKCU" Key="Software\Classes\powertoys">
+        <RegistryKey Root="HKLM" Key="Software\Classes\powertoys">
          <RegistryValue Type="string" Name="URL Protocol" Value="" KeyPath="yes"/>
          <RegistryValue Type="string" Value="URL:PowerToys custom internal URI protocol"/>
          <RegistryKey Key="DefaultIcon">
@@ -89,12 +89,12 @@

    <DirectoryRef Id="ModulesInstallFolder" FileSource="$(var.BinDir)modules\">
      <Component Id="Module_PowerPreview_Registry" Win64="yes">
-        <!-- Update Key to use IE11 for prevhost.exe -->
-        <RegistryKey Root="HKCU" Key="Software\Microsoft\Internet Explorer\Main\FeatureControl\FEATURE_BROWSER_EMULATION">
+        <!-- TODO: Remove this - Update Key to use IE11 for prevhost.exe -->
+        <RegistryKey Root="HKLM" Key="Software\Microsoft\Internet Explorer\Main\FeatureControl\FEATURE_BROWSER_EMULATION">
          <RegistryValue Type="integer" Name="prevhost.exe" Value="11000" />
        </RegistryKey>
-        <!-- Update Key to use IE11 for dllhost.exe -->
-        <RegistryKey Root="HKCU" Key="Software\Microsoft\Internet Explorer\Main\FeatureControl\FEATURE_BROWSER_EMULATION">
+        <!-- TODO: Remove this - Update Key to use IE11 for dllhost.exe -->
+        <RegistryKey Root="HKLM" Key="Software\Microsoft\Internet Explorer\Main\FeatureControl\FEATURE_BROWSER_EMULATION">
          <RegistryValue Type="integer" Name="dllhost.exe" Value="11000" />
        </RegistryKey>
      </Component>
--- a/installer/PowerToysSetup/FileLocksmith.wxs
+++ b/installer/PowerToysSetup/FileLocksmith.wxs
@@ -17,16 +17,16 @@
      <?endforeach?>
      <!-- !Warning! Make sure to change Component Guid if you update something here -->
      <Component Id="Module_FileLocksmith" Guid="108D3EC1-E6E0-4E81-88EF-25966133CB41" Win64="yes">
-        <RegistryKey Root="HKCU" Key="Software\Classes\CLSID\{84D68575-E186-46AD-B0CB-BAEB45EE29C0}">
+        <RegistryKey Root="HKLM" Key="Software\Classes\CLSID\{84D68575-E186-46AD-B0CB-BAEB45EE29C0}">
          <RegistryValue Type="string" Value="File Locksmith Shell Extension" />
          <RegistryValue Type="string" Name="ContextMenuOptIn" Value="" />
          <RegistryValue Type="string" Key="InprocServer32" Value="[FileLocksmithInstallFolder]PowerToys.FileLocksmithExt.dll" />
          <RegistryValue Type="string" Key="InprocServer32" Name="ThreadingModel" Value="Apartment" />
        </RegistryKey>
-        <RegistryKey Root="HKCU" Key="Software\Classes\AllFileSystemObjects\ShellEx\ContextMenuHandlers\FileLocksmithExt">
+        <RegistryKey Root="HKLM" Key="Software\Classes\AllFileSystemObjects\ShellEx\ContextMenuHandlers\FileLocksmithExt">
          <RegistryValue Type="string" Value="{84D68575-E186-46AD-B0CB-BAEB45EE29C0}"/>
        </RegistryKey>
-        <RegistryKey Root="HKCU" Key="Software\Classes\Drive\ShellEx\ContextMenuHandlers\FileLocksmithExt">
+        <RegistryKey Root="HKLM" Key="Software\Classes\Drive\ShellEx\ContextMenuHandlers\FileLocksmithExt">
          <RegistryValue Type="string" Value="{84D68575-E186-46AD-B0CB-BAEB45EE29C0}"/>
        </RegistryKey>
        </Component>
--- a/installer/PowerToysSetup/ImageResizer.wxs
+++ b/installer/PowerToysSetup/ImageResizer.wxs
@@ -17,73 +17,66 @@
      <?endforeach?>

      <Component Id="Module_ImageResizer_Registry" Win64="yes">
-        <RegistryKey Root="HKCU" Key="Software\Classes\CLSID\{51B4D7E5-7568-4234-B4BB-47FB3C016A69}\InprocServer32">
+        <RegistryKey Root="HKLM" Key="Software\Classes\CLSID\{51B4D7E5-7568-4234-B4BB-47FB3C016A69}\InprocServer32">
          <RegistryValue Value="[ImageResizerInstallFolder]PowerToys.ImageResizerExt.dll" Type="string" />
          <RegistryValue Name="ThreadingModel" Value="Apartment" Type="string" />
        </RegistryKey>

-        <!-- Registry Key for the drag and drop handler -->
-        <!-- To use later on when we want to install per user.
-                <RegistryValue Root="HKCU"
-                               Key="Software\Classes\Directory\ShellEx\DragDropHandlers\ImageResizer"
-                               Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
-                               Type="string" />
-                               -->
-        <RegistryValue Root="HKCU"
+        <RegistryValue Root="HKCR"
                       Key="SOFTWARE\Classes\Directory\ShellEx\DragDropHandlers\ImageResizer"
                       Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
                       Type="string" />
        <!-- Registry Keys for the context menu handler for each of the following image formats: bmp, dib, gif, jfif, jpe, jpeg, jpg, jxr, png, rle, tif, tiff, wdp  -->
-        <RegistryValue Root="HKCU"
-                         Key="SOFTWARE\Classes\SystemFileAssociations\.bmp\ShellEx\ContextMenuHandlers\ImageResizer"
+        <RegistryValue Root="HKCR"
+                         Key="SystemFileAssociations\.bmp\ShellEx\ContextMenuHandlers\ImageResizer"
                         Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
                         Type="string" />
-        <RegistryValue Root="HKCU"
-                       Key="SOFTWARE\Classes\SystemFileAssociations\.dib\ShellEx\ContextMenuHandlers\ImageResizer"
+        <RegistryValue Root="HKCR"
+                       Key="SystemFileAssociations\.dib\ShellEx\ContextMenuHandlers\ImageResizer"
                       Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
                       Type="string" />
-        <RegistryValue Root="HKCU"
-                       Key="SOFTWARE\Classes\SystemFileAssociations\.gif\ShellEx\ContextMenuHandlers\ImageResizer"
+        <RegistryValue Root="HKCR"
+                       Key="SystemFileAssociations\.gif\ShellEx\ContextMenuHandlers\ImageResizer"
                       Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
                       Type="string" />
-        <RegistryValue Root="HKCU"
-                       Key="SOFTWARE\Classes\SystemFileAssociations\.jfif\ShellEx\ContextMenuHandlers\ImageResizer"
+        <RegistryValue Root="HKCR"
+                       Key="SystemFileAssociations\.jfif\ShellEx\ContextMenuHandlers\ImageResizer"
                       Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
                       Type="string" />
-        <RegistryValue Root="HKCU"
-                       Key="SOFTWARE\Classes\SystemFileAssociations\.jpe\ShellEx\ContextMenuHandlers\ImageResizer"
+        <RegistryValue Root="HKCR"
+                       Key="SystemFileAssociations\.jpe\ShellEx\ContextMenuHandlers\ImageResizer"
                       Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
                       Type="string" />
-        <RegistryValue Root="HKCU"
-                       Key="SOFTWARE\Classes\SystemFileAssociations\.jpeg\ShellEx\ContextMenuHandlers\ImageResizer"
+        <RegistryValue Root="HKCR"
+                       Key="SystemFileAssociations\.jpeg\ShellEx\ContextMenuHandlers\ImageResizer"
                       Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
                       Type="string" />
-        <RegistryValue Root="HKCU"
-                       Key="SOFTWARE\Classes\SystemFileAssociations\.jpg\ShellEx\ContextMenuHandlers\ImageResizer"
+        <RegistryValue Root="HKCR"
+                       Key="SystemFileAssociations\.jpg\ShellEx\ContextMenuHandlers\ImageResizer"
                       Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
                       Type="string" />
-        <RegistryValue Root="HKCU"
-                       Key="SOFTWARE\Classes\SystemFileAssociations\.jxr\ShellEx\ContextMenuHandlers\ImageResizer"
+        <RegistryValue Root="HKCR"
+                       Key="SystemFileAssociations\.jxr\ShellEx\ContextMenuHandlers\ImageResizer"
                       Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
                       Type="string" />
-        <RegistryValue Root="HKCU"
-                       Key="SOFTWARE\Classes\SystemFileAssociations\.png\ShellEx\ContextMenuHandlers\ImageResizer"
+        <RegistryValue Root="HKCR"
+                       Key="SystemFileAssociations\.png\ShellEx\ContextMenuHandlers\ImageResizer"
                       Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
                       Type="string" />
-        <RegistryValue Root="HKCU"
-                       Key="SOFTWARE\Classes\SystemFileAssociations\.rle\ShellEx\ContextMenuHandlers\ImageResizer"
+        <RegistryValue Root="HKCR"
+                       Key="SystemFileAssociations\.rle\ShellEx\ContextMenuHandlers\ImageResizer"
                       Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
                       Type="string" />
-        <RegistryValue Root="HKCU"
-                       Key="SOFTWARE\Classes\SystemFileAssociations\.tif\ShellEx\ContextMenuHandlers\ImageResizer"
+        <RegistryValue Root="HKCR"
+                       Key="SystemFileAssociations\.tif\ShellEx\ContextMenuHandlers\ImageResizer"
                       Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
                       Type="string" />
-        <RegistryValue Root="HKCU"
-                       Key="SOFTWARE\Classes\SystemFileAssociations\.tiff\ShellEx\ContextMenuHandlers\ImageResizer"
+        <RegistryValue Root="HKCR"
+                       Key="SystemFileAssociations\.tiff\ShellEx\ContextMenuHandlers\ImageResizer"
                       Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
                       Type="string" />
-        <RegistryValue Root="HKCU"
-                       Key="SOFTWARE\Classes\SystemFileAssociations\.wdp\ShellEx\ContextMenuHandlers\ImageResizer"
+        <RegistryValue Root="HKCR"
+                       Key="SystemFileAssociations\.wdp\ShellEx\ContextMenuHandlers\ImageResizer"
                       Value="{51B4D7E5-7568-4234-B4BB-47FB3C016A69}"
                       Type="string" />
      </Component>
--- a/installer/PowerToysSetup/PowerRename.wxs
+++ b/installer/PowerToysSetup/PowerRename.wxs
@@ -19,13 +19,13 @@
      <?endforeach?>
      <!-- !Warning! Make sure to change Component Guid if you update something here -->
      <Component Id="Module_PowerRename" Guid="40D43079-240E-402D-8CE8-571BFFA71175" Win64="yes">
-        <RegistryKey Root="HKCU" Key="Software\Classes\CLSID\{0440049F-D1DC-4E46-B27B-98393D79486B}">
+        <RegistryKey Root="HKLM" Key="Software\Classes\CLSID\{0440049F-D1DC-4E46-B27B-98393D79486B}">
          <RegistryValue Type="string" Value="PowerRename Shell Extension" />
          <RegistryValue Type="string" Name="ContextMenuOptIn" Value="" />
          <RegistryValue Type="string" Key="InprocServer32" Value="[PowerRenameInstallFolder]PowerToys.PowerRenameExt.dll" />
          <RegistryValue Type="string" Key="InprocServer32" Name="ThreadingModel" Value="Apartment" />
        </RegistryKey>
-        <RegistryKey Root="HKCU" Key="SOFTWARE\Classes\AllFileSystemObjects\ShellEx\ContextMenuHandlers\PowerRenameExt">
+        <RegistryKey Root="HKLM" Key="SOFTWARE\Classes\AllFileSystemObjects\ShellEx\ContextMenuHandlers\PowerRenameExt">
          <RegistryValue Type="string" Value="{0440049F-D1DC-4E46-B27B-98393D79486B}"/>
        </RegistryKey>

--- a/installer/PowerToysSetup/Run.wxs
+++ b/installer/PowerToysSetup/Run.wxs
@@ -36,7 +36,7 @@
    <ComponentGroup Id="RunComponentGroup">
      <Component Id="launcherShortcutComponent" Directory="LauncherInstallFolder" >
        <!-- Toast Notification AUMID -->
-        <RegistryKey Root="HKCU" Key="SOFTWARE\Classes\AppUserModelId\PowerToysRun">
+        <RegistryKey Root="HKLM" Key="SOFTWARE\Classes\AppUserModelId\PowerToysRun">
          <RegistryValue Type="string" Name="DisplayName" Value="PowerToys Run" />
          <RegistryValue Type="string" Name="IconUri" Value="[LauncherImagesFolder]RunAsset.ico" />
        </RegistryKey>
--- a/src/modules/fancyzones/FancyZonesLib/FancyZones.cpp
+++ b/src/modules/fancyzones/FancyZonesLib/FancyZones.cpp
@@ -118,13 +118,13 @@ public:

    LRESULT WndProc(HWND, UINT, WPARAM, LPARAM) noexcept;
    void OnDisplayChange(DisplayChangeType changeType) noexcept;
-    void AddWorkArea(HMONITOR monitor, const FancyZonesDataTypes::WorkAreaId& id) noexcept;
+    void AddWorkArea(HMONITOR monitor, const FancyZonesDataTypes::WorkAreaId& id, bool updateWindowsPositions) noexcept;

 protected:
    static LRESULT CALLBACK s_WndProc(HWND, UINT, WPARAM, LPARAM) noexcept;

 private:
-    void UpdateWorkAreas() noexcept;
+    void UpdateWorkAreas(bool updateWindowPositions) noexcept;
    void CycleWindows(bool reverse) noexcept;
    bool OnSnapHotkeyBasedOnZoneNumber(HWND window, DWORD vkCode) noexcept;
    bool OnSnapHotkeyBasedOnPosition(HWND window, DWORD vkCode) noexcept;
@@ -139,8 +139,7 @@ private:
    void MoveWindowIntoZone(HWND window, WorkArea* const workArea, const ZoneIndexSet& zoneIndexSet) noexcept;
    bool MoveToAppLastZone(HWND window, HMONITOR active, HMONITOR primary) noexcept;
    
-    void OnEditorExitEvent() noexcept;
-    void UpdateZoneSets() noexcept;
+    void UpdateActiveLayouts() noexcept;
    bool ShouldProcessSnapHotkey(DWORD vkCode) noexcept;
    void ApplyQuickLayout(int key) noexcept;
    void FlashZones() noexcept;
@@ -618,15 +617,8 @@ LRESULT FancyZones::WndProc(HWND window, UINT message, WPARAM wparam, LPARAM lpa
        }
        else if (message == WM_PRIV_EDITOR)
        {
-            if (lparam == static_cast<LPARAM>(EditorExitKind::Exit))
-            {
-                OnEditorExitEvent();
-            }
-
-            {
-                // Clean up the event either way
-                m_terminateEditorEvent.release();
-            }
+            // Clean up the event either way
+            m_terminateEditorEvent.release();
        }
        else if (message == WM_PRIV_MOVESIZESTART)
        {
@@ -667,7 +659,7 @@ LRESULT FancyZones::WndProc(HWND window, UINT message, WPARAM wparam, LPARAM lpa
        else if (message == WM_PRIV_APPLIED_LAYOUTS_FILE_UPDATE)
        {
            AppliedLayouts::instance().LoadData();
-            UpdateZoneSets();
+            UpdateActiveLayouts();
        }
        else if (message == WM_PRIV_DEFAULT_LAYOUTS_FILE_UPDATE)
        {
@@ -711,10 +703,12 @@ void FancyZones::OnDisplayChange(DisplayChangeType changeType) noexcept
        }
    }

-    UpdateWorkAreas();
+    bool updateWindowsPositionsOnResolutionChange = FancyZonesSettings::settings().displayChange_moveWindows && changeType == DisplayChangeType::DisplayChange;
+    bool updateWindowsPositionsOnStart = FancyZonesSettings::settings().zoneSetChange_moveWindows && changeType == DisplayChangeType::Initialization;
+    UpdateWorkAreas(updateWindowsPositionsOnResolutionChange || updateWindowsPositionsOnStart);
 }

-void FancyZones::AddWorkArea(HMONITOR monitor, const FancyZonesDataTypes::WorkAreaId& id) noexcept
+void FancyZones::AddWorkArea(HMONITOR monitor, const FancyZonesDataTypes::WorkAreaId& id, bool updateWindowsPositions) noexcept
 {
    wil::unique_cotaskmem_string virtualDesktopIdStr;
    if (!SUCCEEDED(StringFromCLSID(VirtualDesktop::instance().GetCurrentVirtualDesktopId(), &virtualDesktopIdStr)))
@@ -722,13 +716,6 @@ void FancyZones::AddWorkArea(HMONITOR monitor, const FancyZonesDataTypes::WorkAr
        Logger::debug(L"Add new work area on virtual desktop {}", virtualDesktopIdStr.get());
    }

-    FancyZonesDataTypes::WorkAreaId parentId{};
-    auto parentArea = m_workAreaHandler.GetWorkArea(monitor);
-    if (parentArea)
-    {
-        parentId = parentArea->UniqueId();
-    }
-
    FancyZonesUtils::Rect rect{};
    if (monitor)
    {
@@ -739,11 +726,15 @@ void FancyZones::AddWorkArea(HMONITOR monitor, const FancyZonesDataTypes::WorkAr
        rect = FancyZonesUtils::GetAllMonitorsCombinedRect<&MONITORINFO::rcWork>();
    }
        
-    auto workArea = WorkArea::Create(m_hinstance, id, parentId, rect);
+    auto workArea = WorkArea::Create(m_hinstance, id, m_workAreaHandler.GetParent(monitor), rect);
    if (workArea)
    {
+        if (updateWindowsPositions)
+        {
+            workArea->UpdateWindowPositions();
+        }
+
        m_workAreaHandler.AddWorkArea(monitor, std::move(workArea));
-        AppliedLayouts::instance().SaveData();
    }
 }

@@ -761,8 +752,9 @@ LRESULT CALLBACK FancyZones::s_WndProc(HWND window, UINT message, WPARAM wparam,
                     DefWindowProc(window, message, wparam, lparam);
 }

-void FancyZones::UpdateWorkAreas() noexcept
+void FancyZones::UpdateWorkAreas(bool updateWindowPositions) noexcept
 {
+    m_workAreaHandler.SaveParentIds();
    m_workAreaHandler.Clear();

    if (FancyZonesSettings::settings().spanZonesAcrossMonitors)
@@ -771,7 +763,7 @@ void FancyZones::UpdateWorkAreas() noexcept
        workAreaId.virtualDesktopId = VirtualDesktop::instance().GetCurrentVirtualDesktopId();
        workAreaId.monitorId = { .deviceId = { .id = ZonedWindowProperties::MultiMonitorName, .instanceId = ZonedWindowProperties::MultiMonitorInstance } };

-        AddWorkArea(nullptr, workAreaId);
+        AddWorkArea(nullptr, workAreaId, updateWindowPositions);
    }
    else
    {
@@ -782,7 +774,7 @@ void FancyZones::UpdateWorkAreas() noexcept
            workAreaId.virtualDesktopId = VirtualDesktop::instance().GetCurrentVirtualDesktopId();
            workAreaId.monitorId = monitor;

-            AddWorkArea(monitor.monitor, workAreaId);
+            AddWorkArea(monitor.monitor, workAreaId, updateWindowPositions);
        }
    }
 }
@@ -896,7 +888,7 @@ bool FancyZones::OnSnapHotkeyBasedOnPosition(HWND window, DWORD vkCode) noexcept

        // If that didn't work, extract zones from all other monitors and target one of them
        std::vector<RECT> zoneRects;
-        std::vector<std::pair<ZoneIndex, std::shared_ptr<WorkArea>>> zoneRectsInfo;
+        std::vector<std::pair<ZoneIndex, WorkArea*>> zoneRectsInfo;
        RECT currentMonitorRect{ .top = 0, .bottom = -1 };

        for (const auto& [monitor, monitorRect] : allMonitors)
@@ -1117,19 +1109,18 @@ void FancyZones::SettingsUpdate(SettingId id)
    }
 }

-void FancyZones::OnEditorExitEvent() noexcept
-{
-    // Collect information about changes in zone layout after editor exited.
-    UpdateZoneSets();
-}
-
-void FancyZones::UpdateZoneSets() noexcept
+void FancyZones::UpdateActiveLayouts() noexcept
 {
    for (const auto& [_, workArea] : m_workAreaHandler.GetAllWorkAreas())
    {
        if (workArea)
        {
            workArea->UpdateActiveZoneSet();
+
+            if (FancyZonesSettings::settings().zoneSetChange_moveWindows)
+            {
+                workArea->UpdateWindowPositions();
+            }
        }
    }
 }
@@ -1197,7 +1188,7 @@ void FancyZones::ApplyQuickLayout(int key) noexcept
    {
        AppliedLayouts::instance().ApplyLayout(workArea->UniqueId(), layout.value());
        AppliedLayouts::instance().SaveData();
-        UpdateZoneSets();
+        UpdateActiveLayouts();
        FlashZones();
    }
 }
--- a/src/modules/fancyzones/FancyZonesLib/LayoutAssignedWindows.cpp
+++ b/src/modules/fancyzones/FancyZonesLib/LayoutAssignedWindows.cpp
@@ -69,6 +69,11 @@ void LayoutAssignedWindows::Dismiss(HWND window)
    FancyZonesWindowProperties::SetTabSortKeyWithinZone(window, std::nullopt);
 }

+std::map<HWND, ZoneIndexSet> LayoutAssignedWindows::SnappedWindows() const noexcept
+{
+    return m_windowIndexSet;
+}
+
 ZoneIndexSet LayoutAssignedWindows::GetZoneIndexSetFromWindow(HWND window) const noexcept
 {
    auto it = m_windowIndexSet.find(window);
--- a/src/modules/fancyzones/FancyZonesLib/LayoutAssignedWindows.h
+++ b/src/modules/fancyzones/FancyZonesLib/LayoutAssignedWindows.h
@@ -19,6 +19,7 @@ public :
    void Extend(HWND window, const ZoneIndexSet& zones);
    void Dismiss(HWND window);

+    std::map<HWND, ZoneIndexSet> SnappedWindows() const noexcept;
    ZoneIndexSet GetZoneIndexSetFromWindow(HWND window) const noexcept;
    bool IsZoneEmpty(ZoneIndex zoneIndex) const noexcept;
    
--- a/src/modules/fancyzones/FancyZonesLib/MonitorWorkAreaMap.cpp
+++ b/src/modules/fancyzones/FancyZonesLib/MonitorWorkAreaMap.cpp
@@ -61,6 +61,28 @@ void MonitorWorkAreaMap::AddWorkArea(HMONITOR monitor, std::unique_ptr<WorkArea>
    m_workAreaMap.insert({ monitor, std::move(workArea) });
 }

+FancyZonesDataTypes::WorkAreaId MonitorWorkAreaMap::GetParent(HMONITOR monitor) const
+{
+    if (m_workAreaParents.contains(monitor))
+    {
+        return m_workAreaParents.at(monitor);
+    }
+    
+    return FancyZonesDataTypes::WorkAreaId{};
+}
+
+void MonitorWorkAreaMap::SaveParentIds()
+{
+    m_workAreaParents.clear();
+    for (const auto& [monitor, workArea] : m_workAreaMap)
+    {
+        if (workArea)
+        {
+            m_workAreaParents.insert({ monitor, workArea->UniqueId() });
+        }
+    }
+}
+
 void MonitorWorkAreaMap::Clear() noexcept
 {
    m_workAreaMap.clear();
--- a/src/modules/fancyzones/FancyZonesLib/MonitorWorkAreaMap.h
+++ b/src/modules/fancyzones/FancyZonesLib/MonitorWorkAreaMap.h
@@ -1,6 +1,7 @@
 #pragma once

 #include "GuidUtils.h"
+#include <FancyZonesLib/FancyZonesDataTypes.h>

 class WorkArea;

@@ -48,6 +49,13 @@ public:
     */
    void AddWorkArea(HMONITOR monitor, std::unique_ptr<WorkArea> workArea);

+    FancyZonesDataTypes::WorkAreaId GetParent(HMONITOR monitor) const;
+
+    /**
+    * Saving current work area IDs as parents for later use.
+    */
+    void SaveParentIds();
+
    /**
     * Clear all persisted work area related data.
     */
@@ -55,4 +63,5 @@ public:
    
 private:
    std::unordered_map<HMONITOR, std::unique_ptr<WorkArea>> m_workAreaMap;
+    std::unordered_map<HMONITOR, FancyZonesDataTypes::WorkAreaId> m_workAreaParents{};
 };
--- a/src/modules/fancyzones/FancyZonesLib/WindowDrag.cpp
+++ b/src/modules/fancyzones/FancyZonesLib/WindowDrag.cpp
@@ -56,13 +56,15 @@ bool WindowDrag::MoveSizeStart(HMONITOR monitor, bool isSnapping)
        return false;
    }

-    if (isSnapping)
-    {
-        m_currentWorkArea = iter->second.get(); 
-    }
+    m_currentWorkArea = iter->second.get();

    SwitchSnappingMode(isSnapping);

+    if (m_currentWorkArea)
+    {
+        m_currentWorkArea->UnsnapWindow(m_window);
+    }
+    
    return true;
 }

@@ -169,7 +171,6 @@ void WindowDrag::SwitchSnappingMode(bool isSnapping)

        if (m_currentWorkArea)
        {
-            m_currentWorkArea->UnsnapWindow(m_window);
            Trace::WorkArea::MoveOrResizeStarted(m_currentWorkArea->GetLayout().get(), m_currentWorkArea->GetLayoutWindows().get());
        }
    }
@@ -213,22 +214,30 @@ void WindowDrag::SetWindowTransparency()
        if (!SetLayeredWindowAttributes(m_window, 0, (255 * 50) / 100, LWA_ALPHA))
        {
            Logger::error(L"Window transparency: SetLayeredWindowAttributes failed, {}", get_last_error_or_default(GetLastError()));
+            return;
        }
+
+        m_windowProperties.transparencySet = true;
    }
 }

 void WindowDrag::ResetWindowTransparency()
 {
-    if (FancyZonesSettings::settings().makeDraggedWindowTransparent)
+    if (FancyZonesSettings::settings().makeDraggedWindowTransparent && m_windowProperties.transparencySet)
    {
+        bool reset = true;
        if (!SetLayeredWindowAttributes(m_window, m_windowProperties.crKey, m_windowProperties.alpha, m_windowProperties.dwFlags))
        {
-            Logger::error(L"Window transparency: SetLayeredWindowAttributes failed");
+            Logger::error(L"Window transparency: SetLayeredWindowAttributes failed, {}", get_last_error_or_default(GetLastError()));
+            reset = false;
        }

        if (SetWindowLong(m_window, GWL_EXSTYLE, m_windowProperties.exstyle) == 0)
        {
            Logger::error(L"Window transparency: SetWindowLong failed, {}", get_last_error_or_default(GetLastError()));
+            reset = false;
        }
+
+        m_windowProperties.transparencySet = !reset;
    }
 }
--- a/src/modules/fancyzones/FancyZonesLib/WindowDrag.h
+++ b/src/modules/fancyzones/FancyZonesLib/WindowDrag.h
@@ -33,6 +33,7 @@ private:
        COLORREF crKey = RGB(0, 0, 0);
        DWORD dwFlags = 0;
        BYTE alpha = 0;
+        bool transparencySet{false};
    };

    const HWND m_window;
--- a/src/modules/fancyzones/FancyZonesLib/WorkArea.cpp
+++ b/src/modules/fancyzones/FancyZonesLib/WorkArea.cpp
@@ -144,8 +144,11 @@ void WorkArea::MoveWindowIntoZoneByIndexSet(HWND window, const ZoneIndexSet& ind
    if (updatePosition)
    {
        const auto rect = m_layout->GetCombinedZonesRect(indexSet);
-        const auto adjustedRect = FancyZonesWindowUtils::AdjustRectForSizeWindowToRect(window, rect, m_window);
-        FancyZonesWindowUtils::SizeWindowToRect(window, adjustedRect);
+        if (rect.bottom - rect.top > 0 && rect.right - rect.left > 0)
+        {
+            const auto adjustedRect = FancyZonesWindowUtils::AdjustRectForSizeWindowToRect(window, rect, m_window);
+            FancyZonesWindowUtils::SizeWindowToRect(window, adjustedRect);
+        }
    }

    SnapWindow(window, indexSet);
@@ -351,9 +354,7 @@ bool WorkArea::ExtendWindowByDirectionAndPosition(HWND window, DWORD vkCode)
        const auto adjustedRect = FancyZonesWindowUtils::AdjustRectForSizeWindowToRect(window, rect, m_window);
        FancyZonesWindowUtils::SizeWindowToRect(window, adjustedRect);

-        m_layoutWindows->Extend(window, resultIndexSet);
-
-        SnapWindow(window, resultIndexSet);
+        SnapWindow(window, resultIndexSet, true);

        return true;
    }
@@ -361,15 +362,22 @@ bool WorkArea::ExtendWindowByDirectionAndPosition(HWND window, DWORD vkCode)
    return false;
 }

-void WorkArea::SnapWindow(HWND window, const ZoneIndexSet& zones)
+void WorkArea::SnapWindow(HWND window, const ZoneIndexSet& zones, bool extend)
 {
    if (!m_layoutWindows || !m_layout)
    {
        return;
    }

-    m_layoutWindows->Assign(window, zones);
-
+    if (extend)
+    {
+        m_layoutWindows->Extend(window, zones);
+    }
+    else
+    {
+        m_layoutWindows->Assign(window, zones);
+    }
+    
    auto guidStr = FancyZonesUtils::GuidToString(m_layout->Id());
    if (guidStr.has_value())
    {
@@ -462,6 +470,20 @@ void WorkArea::UpdateActiveZoneSet()
    }
 }

+void WorkArea::UpdateWindowPositions()
+{
+    if (!m_layoutWindows)
+    {
+        return;
+    }
+
+    const auto& snappedWindows = m_layoutWindows->SnappedWindows();
+    for (const auto& [window, zones] : snappedWindows)
+    {
+        MoveWindowIntoZoneByIndexSet(window, zones, true);
+    }
+}
+
 void WorkArea::CycleWindows(HWND window, bool reverse)
 {
    if (m_layoutWindows)
@@ -507,8 +529,7 @@ void WorkArea::InitLayout(const FancyZonesDataTypes::WorkAreaId& parentUniqueId)

 void WorkArea::InitSnappedWindows()
 {
-    static bool updatePositionOnceOnStartFlag = true;
-    Logger::info(L"Init work area windows, update positions = {}", updatePositionOnceOnStartFlag);
+    Logger::info(L"Init work area windows");

    for (const auto& window : VirtualDesktop::instance().GetWindowsFromCurrentDesktop())
    {
@@ -520,19 +541,17 @@ void WorkArea::InitSnappedWindows()

        if (!m_uniqueId.monitorId.monitor) // one work area across monitors
        {
-            MoveWindowIntoZoneByIndexSet(window, zoneIndexSet, updatePositionOnceOnStartFlag);
+            MoveWindowIntoZoneByIndexSet(window, zoneIndexSet, false);
        }
        else
        {
            const auto monitor = MonitorFromWindow(window, MONITOR_DEFAULTTONULL);
            if (monitor && m_uniqueId.monitorId.monitor == monitor)
            {
-                MoveWindowIntoZoneByIndexSet(window, zoneIndexSet, updatePositionOnceOnStartFlag);
+                MoveWindowIntoZoneByIndexSet(window, zoneIndexSet, false);
            }
        }
    }
-
-    updatePositionOnceOnStartFlag = false;
 }

 void WorkArea::CalculateZoneSet()
--- a/src/modules/fancyzones/FancyZonesLib/WorkArea.h
+++ b/src/modules/fancyzones/FancyZonesLib/WorkArea.h
@@ -51,10 +51,11 @@ public:
    bool MoveWindowIntoZoneByDirectionAndPosition(HWND window, DWORD vkCode, bool cycle);
    bool ExtendWindowByDirectionAndPosition(HWND window, DWORD vkCode);

-    void SnapWindow(HWND window, const ZoneIndexSet& zones);
+    void SnapWindow(HWND window, const ZoneIndexSet& zones, bool extend = false);
    void UnsnapWindow(HWND window);

    void UpdateActiveZoneSet();
+    void UpdateWindowPositions();

    void ShowZonesOverlay(const ZoneIndexSet& highlight, HWND draggedWindow = nullptr);
    void HideZonesOverlay();
--- a/src/modules/launcher/Wox.Infrastructure/Image/ImageLoader.cs
+++ b/src/modules/launcher/Wox.Infrastructure/Image/ImageLoader.cs
@@ -180,10 +180,17 @@ namespace Wox.Infrastructure.Image
                            image = WindowsThumbnailProvider.GetThumbnail(path, Constant.ThumbnailSize, Constant.ThumbnailSize, ThumbnailOptions.ThumbnailOnly);
                        }
                    }
+                    else if (extension == ".pdf" && WindowsThumbnailProvider.DoesPdfUseAcrobatAsProvider())
+                    {
+                        // The PDF thumbnail provider from Adobe Reader and Acrobat Pro lets crash PT Run with an Dispatcher exception. (https://github.com/microsoft/PowerToys/issues/18166)
+                        // To not run into the crash, we only request the icon of PDF files if the PDF thumbnail handler is set to Adobe Reader/Acrobat Pro.
+                        type = ImageType.File;
+                        image = WindowsThumbnailProvider.GetThumbnail(path, Constant.ThumbnailSize, Constant.ThumbnailSize, ThumbnailOptions.IconOnly);
+                    }
                    else
                    {
                        type = ImageType.File;
-                        image = WindowsThumbnailProvider.GetThumbnail(path, Constant.ThumbnailSize, Constant.ThumbnailSize, ThumbnailOptions.None);
+                        image = WindowsThumbnailProvider.GetThumbnail(path, Constant.ThumbnailSize, Constant.ThumbnailSize, ThumbnailOptions.RESIZETOFIT);
                    }
                }
                else
--- a/src/modules/launcher/Wox.Infrastructure/Image/WindowsThumbnailProvider.cs
+++ b/src/modules/launcher/Wox.Infrastructure/Image/WindowsThumbnailProvider.cs
@@ -4,17 +4,20 @@

 using System;
 using System.IO.Abstractions;
+using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Interop;
 using System.Windows.Media.Imaging;
+using Microsoft.Win32;
+using Wox.Plugin.Logger;

 namespace Wox.Infrastructure.Image
 {
    [Flags]
    public enum ThumbnailOptions
    {
-        None = 0x00,
+        RESIZETOFIT = 0x00,
        BiggerSizeOk = 0x01,
        InMemoryOnly = 0x02,
        IconOnly = 0x04,
@@ -125,5 +128,97 @@ namespace Wox.Infrastructure.Image

            throw new InvalidComObjectException($"Error while extracting thumbnail for {fileName}", Marshal.GetExceptionForHR((int)hr));
        }
+
+        private static bool logReportedAdobeReaderDetected; // Keep track if Adobe Reader detection has been logged yet.
+        private static bool logReportedErrorInDetectingAdobeReader; // Keep track if we reported an exception while trying to detect Adobe Reader yet.
+        private static bool adobeReaderDetectionLastResult; // The last result when Adobe Reader detection has read the registry.
+        private static DateTime adobeReaderDetectionLastTime; // The last time when Adobe Reader detection has read the registry.
+
+        // We have to evaluate this in real time to not crash, if the user switches to Adobe Reader/Acrobat Pro after starting PT Run.
+        // Adobe registers its thumbnail handler always in "HKCR\Acrobat.Document.*\shellex\{BB2E617C-0920-11d1-9A0B-00C04FC2D6C1}".
+        public static bool DoesPdfUseAcrobatAsProvider()
+        {
+            // If the last run is not more than five seconds ago use its result.
+            // Doing this we minimize the amount of Registry queries, if more than one new PDF file is shown in the results.
+            if ((DateTime.Now - adobeReaderDetectionLastTime).TotalSeconds < 5)
+            {
+                return adobeReaderDetectionLastResult;
+            }
+
+            // If cache condition is false, then query the registry.
+            try
+            {
+                // First detect if there is a provider other than Adobe. For example PowerToys.
+                // Generic GUIDs used by Explorer to identify the configured provider types: {E357FCCD-A995-4576-B01F-234630154E96} = File thumbnail, {BB2E617C-0920-11d1-9A0B-00C04FC2D6C1} = Image thumbnail.
+                RegistryKey key1 = Registry.ClassesRoot.OpenSubKey(".pdf\\shellex\\{E357FCCD-A995-4576-B01F-234630154E96}", false);
+                string value1 = (string)key1?.GetValue(string.Empty);
+                key1?.Close();
+                RegistryKey key2 = Registry.ClassesRoot.OpenSubKey(".pdf\\shellex\\{BB2E617C-0920-11d1-9A0B-00C04FC2D6C1}", false);
+                string value2 = (string)key2?.GetValue(string.Empty);
+                key2?.Close();
+                if (!string.IsNullOrEmpty(value1) || !string.IsNullOrEmpty(value2))
+                {
+                    // A provider other than Adobe is used. (For example the PowerToys PDF Thumbnail provider.)
+                    logReportedAdobeReaderDetected = false; // Reset log marker to report when Adobe is reused. (Example: Adobe -> Test PowerToys. -> Back to Adobe.)
+                    adobeReaderDetectionLastResult = false;
+                    adobeReaderDetectionLastTime = DateTime.Now;
+                    return false;
+                }
+
+                // Then detect if Adobe is the default PDF application.
+                // The global config can be found under "HKCR\.pdf", but the "UserChoice" key under HKCU has precedence.
+                RegistryKey pdfKeyUser = Registry.CurrentUser.OpenSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\FileExts\\.pdf\\UserChoice", false);
+                string pdfAppUser = (string)pdfKeyUser?.GetValue("ProgId");
+                pdfKeyUser?.Close();
+                RegistryKey pdfKeyGlobal = Registry.ClassesRoot.OpenSubKey(".pdf", false);
+                string pdfAppGlobal = (string)pdfKeyGlobal?.GetValue(string.Empty);
+                pdfKeyGlobal?.Close();
+                string pdfApp = !string.IsNullOrEmpty(pdfAppUser) ? pdfAppUser : pdfAppGlobal; // User choice has precedence.
+                if (string.IsNullOrEmpty(pdfApp) || !pdfApp.StartsWith("Acrobat.Document.", StringComparison.OrdinalIgnoreCase))
+                {
+                    // Adobe is not used as PDF application.
+                    logReportedAdobeReaderDetected = false; // Reset log marker to report when Adobe is reused. (Example: Adobe -> Test PowerToys. -> Back to Adobe.)
+                    adobeReaderDetectionLastResult = false;
+                    adobeReaderDetectionLastTime = DateTime.Now;
+                    return false;
+                }
+
+                // Detect if the thumbnail handler from Adobe is disabled.
+                RegistryKey adobeAppKey = Registry.ClassesRoot.OpenSubKey(pdfApp + "\\shellex\\{BB2E617C-0920-11d1-9A0B-00C04FC2D6C1}", false);
+                string adobeAppProvider = (string)adobeAppKey?.GetValue(string.Empty);
+                adobeAppKey?.Close();
+                if (string.IsNullOrEmpty(adobeAppProvider))
+                {
+                    // No Adobe handler.
+                    logReportedAdobeReaderDetected = false; // Reset log marker to report when Adobe is reused. (Example: Adobe -> Test PowerToys. -> Back to Adobe.)
+                    adobeReaderDetectionLastResult = false;
+                    adobeReaderDetectionLastTime = DateTime.Now;
+                    return false;
+                }
+
+                // Thumbnail handler from Adobe is enabled and used.
+                if (!logReportedAdobeReaderDetected)
+                {
+                    logReportedAdobeReaderDetected = true;
+                    Log.Info("Adobe Reader / Adobe Acrobat Pro has been detected as the PDF thumbnail provider.", MethodBase.GetCurrentMethod().DeclaringType);
+                }
+
+                adobeReaderDetectionLastResult = true;
+                adobeReaderDetectionLastTime = DateTime.Now;
+                return true;
+            }
+            catch (System.Exception ex)
+            {
+                if (!logReportedErrorInDetectingAdobeReader)
+                {
+                    logReportedErrorInDetectingAdobeReader = true;
+                    Log.Exception("Got an exception while trying to detect Adobe Reader / Adobe Acrobat Pro as PDF thumbnail provider. To prevent PT Run from a Dispatcher crash, we report that Adobe Reader / Adobe Acrobat Pro is used and show only the PDF icon in the results.", ex, MethodBase.GetCurrentMethod().DeclaringType);
+                }
+
+                // If we fail to detect it, we return that Adobe is used. Otherwise we could run into the Dispatcher crash.
+                // (This only results in showing the icon instead of a thumbnail. It has no other functional impact.)
+                return true;
+            }
+        }
    }
 }
--- a/src/modules/previewpane/GcodeThumbnailProvider/GcodeThumbnailProvider.cs
+++ b/src/modules/previewpane/GcodeThumbnailProvider/GcodeThumbnailProvider.cs
@@ -159,12 +159,10 @@ namespace Microsoft.PowerToys.ThumbnailHandler.Gcode

            using (var reader = new StreamReader(this.Stream))
            {
-                using (Bitmap thumbnail = GetThumbnail(reader, cx))
+                Bitmap thumbnail = GetThumbnail(reader, cx);
+                if (thumbnail != null && thumbnail.Size.Width > 0 && thumbnail.Size.Height > 0)
                {
-                    if (thumbnail != null && thumbnail.Size.Width > 0 && thumbnail.Size.Height > 0)
-                    {
-                        return (Bitmap)thumbnail.Clone();
-                    }
+                    return thumbnail;
                }
            }

--- a/src/modules/previewpane/GcodeThumbnailProvider/Program.cs
+++ b/src/modules/previewpane/GcodeThumbnailProvider/Program.cs
@@ -26,8 +26,11 @@ namespace Microsoft.PowerToys.ThumbnailHandler.Gcode

                    _thumbnailProvider = new GcodeThumbnailProvider(filePath);
                    Bitmap thumbnail = _thumbnailProvider.GetThumbnail(cx);
-                    filePath = filePath.Replace(".gcode", ".bmp");
-                    thumbnail.Save(filePath, System.Drawing.Imaging.ImageFormat.Bmp);
+                    if (thumbnail != null)
+                    {
+                        filePath = filePath.Replace(".gcode", ".bmp");
+                        thumbnail.Save(filePath, System.Drawing.Imaging.ImageFormat.Bmp);
+                    }
                }
                else
                {
--- a/src/modules/previewpane/GcodeThumbnailProviderCpp/GcodeThumbnailProvider.cpp
+++ b/src/modules/previewpane/GcodeThumbnailProviderCpp/GcodeThumbnailProvider.cpp
@@ -159,11 +159,19 @@ IFACEMETHODIMP GcodeThumbnailProvider::GetThumbnail(UINT cx, HBITMAP* phbmp, WTS
                WaitForSingleObject(m_process, INFINITE);
                std::filesystem::remove(fileName);

+
                std::wstring fileNameBmp = filePath + guid + L".bmp";
-                *phbmp = (HBITMAP)LoadImage(NULL, fileNameBmp.c_str(), IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE);
-                *pdwAlpha = WTS_ALPHATYPE::WTSAT_ARGB;
-                
-                std::filesystem::remove(fileNameBmp);
+                if (std::filesystem::exists(fileNameBmp))
+                {
+                    *phbmp = (HBITMAP)LoadImage(NULL, fileNameBmp.c_str(), IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE);
+                    *pdwAlpha = WTS_ALPHATYPE::WTSAT_ARGB;
+                    std::filesystem::remove(fileNameBmp);
+                }
+                else
+                {
+                    Logger::info(L"Bmp file not generated.");
+                    return E_FAIL;
+                }
            }
            catch (std::exception& e)
            {
--- a/src/modules/previewpane/GcodeThumbnailProviderCpp/GcodeThumbnailProvider.h
+++ b/src/modules/previewpane/GcodeThumbnailProviderCpp/GcodeThumbnailProvider.h
@@ -19,7 +19,7 @@ public:
    // IInitializeWithStream
    IFACEMETHODIMP Initialize(IStream* pstream, DWORD grfMode);

-    // IPreviewHandler
+    // IThumbnailProvider
    IFACEMETHODIMP GetThumbnail(UINT cx, HBITMAP* phbmp, WTS_ALPHATYPE* pdwAlpha);

    GcodeThumbnailProvider();
--- a/src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.cs
+++ b/src/modules/previewpane/PdfThumbnailProvider/PdfThumbnailProvider.cs
@@ -1,14 +1,8 @@
 // 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.Drawing;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.ComTypes;
-using Common.ComInterlop;
-using Common.Utilities;
 using Windows.Data.Pdf;
+using Windows.Storage;
 using Windows.Storage.Streams;

 namespace Microsoft.PowerToys.ThumbnailHandler.Pdf
@@ -21,7 +15,6 @@ namespace Microsoft.PowerToys.ThumbnailHandler.Pdf
        public PdfThumbnailProvider(string filePath)
        {
            FilePath = filePath;
-            Stream = new FileStream(filePath, FileMode.Open, FileAccess.Read);
        }

        /// <summary>
@@ -29,11 +22,6 @@ namespace Microsoft.PowerToys.ThumbnailHandler.Pdf
        /// </summary>
        public string FilePath { get; private set; }

-        /// <summary>
-        /// Gets the stream object to access file.
-        /// </summary>
-        public Stream Stream { get; private set; }
-
        /// <summary>
        ///  The maximum dimension (width or height) thumbnail we will generate.
        /// </summary>
@@ -45,6 +33,16 @@ namespace Microsoft.PowerToys.ThumbnailHandler.Pdf
        /// <param name="cx">Maximum thumbnail size, in pixels.</param>
        /// <returns>Generated bitmap</returns>
        public Bitmap GetThumbnail(uint cx)
+        {
+            return DoGetThumbnail(cx).Result;
+        }
+
+        /// <summary>
+        /// Generate thumbnail bitmap for provided Pdf file/stream.
+        /// </summary>
+        /// <param name="cx">Maximum thumbnail size, in pixels.</param>
+        /// <returns>Generated bitmap</returns>
+        private async Task<Bitmap> DoGetThumbnail(uint cx)
        {
            if (cx == 0 || cx > MaxThumbnailSize)
            {
@@ -57,26 +55,27 @@ namespace Microsoft.PowerToys.ThumbnailHandler.Pdf
                return null;
            }

-            using var memStream = new MemoryStream();
-
-            this.Stream.CopyTo(memStream);
-            memStream.Position = 0;
-
-            // AsRandomAccessStream() extension method from System.Runtime.WindowsRuntime
-            var pdf = PdfDocument.LoadFromStreamAsync(memStream.AsRandomAccessStream()).GetAwaiter().GetResult();
-
-            if (pdf.PageCount > 0)
+            Bitmap thumbnail = null;
+            try
            {
-                using var page = pdf.GetPage(0);
+                var file = await StorageFile.GetFileFromPathAsync(FilePath);
+                var pdf = await PdfDocument.LoadFromFileAsync(file);

-                var image = PageToImage(page, cx);
+                if (pdf.PageCount > 0)
+                {
+                    using var page = pdf.GetPage(0);

-                using Bitmap thumbnail = new Bitmap(image);
+                    var image = PageToImage(page, cx);

-                return (Bitmap)thumbnail.Clone();
+                    thumbnail = new Bitmap(image);
+                }
+            }
+            catch (Exception)
+            {
+                // TODO: add logger
            }

-            return null;
+            return thumbnail;
        }

        /// <summary>
--- a/src/modules/previewpane/PdfThumbnailProvider/Program.cs
+++ b/src/modules/previewpane/PdfThumbnailProvider/Program.cs
@@ -26,8 +26,11 @@ namespace Microsoft.PowerToys.ThumbnailHandler.Pdf

                    _thumbnailProvider = new PdfThumbnailProvider(filePath);
                    Bitmap thumbnail = _thumbnailProvider.GetThumbnail(cx);
-                    filePath = filePath.Replace(".pdf", ".bmp");
-                    thumbnail.Save(filePath, System.Drawing.Imaging.ImageFormat.Bmp);
+                    if (thumbnail != null)
+                    {
+                        filePath = filePath.Replace(".pdf", ".bmp");
+                        thumbnail.Save(filePath, System.Drawing.Imaging.ImageFormat.Bmp);
+                    }
                }
                else
                {
--- a/src/modules/previewpane/PdfThumbnailProviderCpp/PdfThumbnailProvider.cpp
+++ b/src/modules/previewpane/PdfThumbnailProviderCpp/PdfThumbnailProvider.cpp
@@ -158,10 +158,18 @@ IFACEMETHODIMP PdfThumbnailProvider::GetThumbnail(UINT cx, HBITMAP* phbmp, WTS_A
                std::filesystem::remove(fileName);

                std::wstring fileNameBmp = filePath + guid + L".bmp";
-                *phbmp = (HBITMAP)LoadImage(NULL, fileNameBmp.c_str(), IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE);
-                *pdwAlpha = WTS_ALPHATYPE::WTSAT_ARGB;
+                if (std::filesystem::exists(fileNameBmp))
+                {
+                    *phbmp = (HBITMAP)LoadImage(NULL, fileNameBmp.c_str(), IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE);
+                    *pdwAlpha = WTS_ALPHATYPE::WTSAT_ARGB;
+                    std::filesystem::remove(fileNameBmp);
+                }
+                else
+                {
+                    Logger::info(L"Bmp file not generated.");
+                    return E_FAIL;
+                }

-                std::filesystem::remove(fileNameBmp);
            }
            catch (std::exception& e)
            {
--- a/src/modules/previewpane/PdfThumbnailProviderCpp/PdfThumbnailProvider.h
+++ b/src/modules/previewpane/PdfThumbnailProviderCpp/PdfThumbnailProvider.h
@@ -19,7 +19,7 @@ public:
    // IInitializeWithStream
    IFACEMETHODIMP Initialize(IStream* pstream, DWORD grfMode);

-    // IPreviewHandler
+    // IThumbnailProvider
    IFACEMETHODIMP GetThumbnail(UINT cx, HBITMAP* phbmp, WTS_ALPHATYPE* pdwAlpha);

    PdfThumbnailProvider();
--- a/src/modules/previewpane/StlThumbnailProvider/Program.cs
+++ b/src/modules/previewpane/StlThumbnailProvider/Program.cs
@@ -25,8 +25,11 @@ namespace Microsoft.PowerToys.ThumbnailHandler.Stl

                    _thumbnailProvider = new StlThumbnailProvider(filePath);
                    Bitmap thumbnail = _thumbnailProvider.GetThumbnail(cx);
-                    filePath = filePath.Replace(".stl", ".bmp");
-                    thumbnail.Save(filePath, System.Drawing.Imaging.ImageFormat.Bmp);
+                    if (thumbnail != null)
+                    {
+                        filePath = filePath.Replace(".stl", ".bmp");
+                        thumbnail.Save(filePath, System.Drawing.Imaging.ImageFormat.Bmp);
+                    }
                }
                else
                {
--- a/src/modules/previewpane/StlThumbnailProvider/StlThumbnailProvider.cs
+++ b/src/modules/previewpane/StlThumbnailProvider/StlThumbnailProvider.cs
@@ -130,19 +130,10 @@ namespace Microsoft.PowerToys.ThumbnailHandler.Stl
                return null;
            }

-            using (var memStream = new MemoryStream())
+            Bitmap thumbnail = GetThumbnail(this.Stream, cx);
+            if (thumbnail != null && thumbnail.Size.Width > 0 && thumbnail.Size.Height > 0)
            {
-                this.Stream.CopyTo(memStream);
-
-                memStream.Position = 0;
-
-                using (Bitmap thumbnail = GetThumbnail(memStream, cx))
-                {
-                    if (thumbnail != null && thumbnail.Size.Width > 0 && thumbnail.Size.Height > 0)
-                    {
-                        return (Bitmap)thumbnail.Clone();
-                    }
-                }
+                return thumbnail;
            }

            return null;
--- a/src/modules/previewpane/StlThumbnailProviderCpp/StlThumbnailProvider.cpp
+++ b/src/modules/previewpane/StlThumbnailProviderCpp/StlThumbnailProvider.cpp
@@ -158,10 +158,17 @@ IFACEMETHODIMP StlThumbnailProvider::GetThumbnail(UINT cx, HBITMAP* phbmp, WTS_A
                std::filesystem::remove(fileName);

                std::wstring fileNameBmp = filePath + guid + L".bmp";
-                *phbmp = (HBITMAP)LoadImage(NULL, fileNameBmp.c_str(), IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE);
-                *pdwAlpha = WTS_ALPHATYPE::WTSAT_ARGB;
-
-                std::filesystem::remove(fileNameBmp);
+                if (std::filesystem::exists(fileNameBmp))
+                {
+                    *phbmp = (HBITMAP)LoadImage(NULL, fileNameBmp.c_str(), IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE);
+                    *pdwAlpha = WTS_ALPHATYPE::WTSAT_ARGB;
+                    std::filesystem::remove(fileNameBmp);
+                }
+                else
+                {
+                    Logger::info(L"Bmp file not generated.");
+                    return E_FAIL;
+                }
            }
            catch (std::exception& e)
            {
--- a/src/modules/previewpane/StlThumbnailProviderCpp/StlThumbnailProvider.h
+++ b/src/modules/previewpane/StlThumbnailProviderCpp/StlThumbnailProvider.h
@@ -19,7 +19,7 @@ public:
    // IInitializeWithStream
    IFACEMETHODIMP Initialize(IStream* pstream, DWORD grfMode);

-    // IPreviewHandler
+    // IThumbnailProvider
    IFACEMETHODIMP GetThumbnail(UINT cx, HBITMAP* phbmp, WTS_ALPHATYPE* pdwAlpha);

    StlThumbnailProvider();
--- a/src/modules/previewpane/SvgThumbnailProvider/Program.cs
+++ b/src/modules/previewpane/SvgThumbnailProvider/Program.cs
@@ -26,8 +26,11 @@ namespace Microsoft.PowerToys.ThumbnailHandler.Svg

                    _thumbnailProvider = new SvgThumbnailProvider(filePath);
                    Bitmap thumbnail = _thumbnailProvider.GetThumbnail(cx);
-                    filePath = filePath.Replace(".svg", ".bmp");
-                    thumbnail.Save(filePath, System.Drawing.Imaging.ImageFormat.Bmp);
+                    if (thumbnail != null )
+                    {
+                        filePath = filePath.Replace(".svg", ".bmp");
+                        thumbnail.Save(filePath, System.Drawing.Imaging.ImageFormat.Bmp);
+                    }
                }
                else
                {
--- a/src/modules/previewpane/SvgThumbnailProviderCpp/SvgThumbnailProvider.cpp
+++ b/src/modules/previewpane/SvgThumbnailProviderCpp/SvgThumbnailProvider.cpp
@@ -158,10 +158,18 @@ IFACEMETHODIMP SvgThumbnailProvider::GetThumbnail(UINT cx, HBITMAP* phbmp, WTS_A
                std::filesystem::remove(fileName);

                std::wstring fileNameBmp = filePath + guid + L".bmp";
-                *phbmp = (HBITMAP)LoadImage(NULL, fileNameBmp.c_str(), IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE);
-                *pdwAlpha = WTS_ALPHATYPE::WTSAT_ARGB;

-                std::filesystem::remove(fileNameBmp);
+                if (std::filesystem::exists(fileNameBmp))
+                {
+                    *phbmp = (HBITMAP)LoadImage(NULL, fileNameBmp.c_str(), IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE);
+                    *pdwAlpha = WTS_ALPHATYPE::WTSAT_ARGB;
+                    std::filesystem::remove(fileNameBmp);
+                }
+                else
+                {
+                    Logger::info(L"Bmp file not generated.");
+                    return E_FAIL;
+                }
            }
            catch (std::exception& e)
            {
--- a/src/modules/previewpane/SvgThumbnailProviderCpp/SvgThumbnailProvider.h
+++ b/src/modules/previewpane/SvgThumbnailProviderCpp/SvgThumbnailProvider.h
@@ -19,7 +19,7 @@ public:
    // IInitializeWithStream
    IFACEMETHODIMP Initialize(IStream* pstream, DWORD grfMode);

-    // IPreviewHandler
+    // IThumbnailProvider
    IFACEMETHODIMP GetThumbnail(UINT cx, HBITMAP* phbmp, WTS_ALPHATYPE* pdwAlpha);

    SvgThumbnailProvider();
--- a/src/modules/previewpane/UnitTests-PdfThumbnailProvider/PdfThumbnailProviderTests.cs
+++ b/src/modules/previewpane/UnitTests-PdfThumbnailProvider/PdfThumbnailProviderTests.cs
@@ -22,7 +22,7 @@ namespace PdfThumbnailProviderUnitTests
        public void GetThumbnailValidStreamPDF()
        {
            // Act
-            var filePath = "HelperFiles/sample.pdf";
+            var filePath = System.IO.Path.GetFullPath("HelperFiles/sample.pdf");

            PdfThumbnailProvider provider = new PdfThumbnailProvider(filePath);

@@ -35,7 +35,7 @@ namespace PdfThumbnailProviderUnitTests
        public void GetThumbnailInValidSizePDF()
        {
            // Act
-            var filePath = "HelperFiles/sample.pdf";
+            var filePath = System.IO.Path.GetFullPath("HelperFiles/sample.pdf");

            PdfThumbnailProvider provider = new PdfThumbnailProvider(filePath);

@@ -48,7 +48,7 @@ namespace PdfThumbnailProviderUnitTests
        public void GetThumbnailToBigPDF()
        {
            // Act
-            var filePath = "HelperFiles/sample.pdf";
+            var filePath = System.IO.Path.GetFullPath("HelperFiles/sample.pdf");

            PdfThumbnailProvider provider = new PdfThumbnailProvider(filePath);

--- a/src/runner/settings_window.cpp
+++ b/src/runner/settings_window.cpp
@@ -316,7 +316,7 @@ BOOL run_settings_non_elevated(LPCWSTR executable_path, LPWSTR executable_args,

 DWORD g_settings_process_id = 0;

-void run_settings_window(bool show_oobe_window, bool show_scoobe_window, std::optional<std::wstring> settings_window, bool show_flyout = false)
+void run_settings_window(bool show_oobe_window, bool show_scoobe_window, std::optional<std::wstring> settings_window, bool show_flyout = false, const std::optional<POINT>& flyout_position = std::nullopt)
 {
    g_isLaunchInProgress = true;

@@ -389,21 +389,31 @@ void run_settings_window(bool show_oobe_window, bool show_scoobe_window, std::op
    // Arg 10: should flyout be shown
    std::wstring settings_showFlyout = show_flyout ? L"true" : L"false";

+    // Arg 11: contains if there's a settings window argument. If true, will add one extra argument with the value to the call.
+    std::wstring settings_containsSettingsWindow = settings_window.has_value() ? L"true" : L"false";
+
+    // Arg 12: contains if there's flyout coordinates. If true, will add two extra arguments to the call containing the x and y coordinates.
+    std::wstring settings_containsFlyoutPosition = flyout_position.has_value() ? L"true" : L"false";
+
+    // Args 13, .... : Optional arguments depending on the options presented before. All by the same value.
+
    // create general settings file to initialize the settings file with installation configurations like :
    // 1. Run on start up.
    PTSettingsHelper::save_general_settings(save_settings.to_json());

-    std::wstring executable_args = fmt::format(L"\"{}\" {} {} {} {} {} {} {} {} {}",
-                                               executable_path,
-                                               powertoys_pipe_name,
-                                               settings_pipe_name,
-                                               std::to_wstring(powertoys_pid),
-                                               settings_theme,
-                                               settings_elevatedStatus,
-                                               settings_isUserAnAdmin,
-                                               settings_showOobe,
-                                               settings_showScoobe,
-                                               settings_showFlyout);
+    std::wstring executable_args = fmt::format(L"\"{}\" {} {} {} {} {} {} {} {} {} {} {}",
+                                                   executable_path,
+                                                   powertoys_pipe_name,
+                                                   settings_pipe_name,
+                                                   std::to_wstring(powertoys_pid),
+                                                   settings_theme,
+                                                   settings_elevatedStatus,
+                                                   settings_isUserAnAdmin,
+                                                   settings_showOobe,
+                                                   settings_showScoobe,
+                                                   settings_showFlyout,
+                                                   settings_containsSettingsWindow,
+                                                   settings_containsFlyoutPosition);

    if (settings_window.has_value())
    {
@@ -411,6 +421,14 @@ void run_settings_window(bool show_oobe_window, bool show_scoobe_window, std::op
        executable_args.append(settings_window.value());
    }

+    if (flyout_position)
+    {
+        executable_args.append(L" ");
+        executable_args.append(std::to_wstring(flyout_position.value().x));
+        executable_args.append(L" ");
+        executable_args.append(std::to_wstring(flyout_position.value().y));
+    }
+
    BOOL process_created = false;

    // Commented out to fix #22659
@@ -550,7 +568,7 @@ void bring_settings_to_front()
    EnumWindows(callback, 0);
 }

-void open_settings_window(std::optional<std::wstring> settings_window, bool show_flyout = false)
+void open_settings_window(std::optional<std::wstring> settings_window, bool show_flyout = false, const std::optional<POINT>& flyout_position)
 {
    if (g_settings_process_id != 0)
    {
@@ -558,7 +576,14 @@ void open_settings_window(std::optional<std::wstring> settings_window, bool show
        {
            if (current_settings_ipc)
            {
-                current_settings_ipc->send(L"{\"ShowYourself\":\"flyout\"}");
+                if (!flyout_position.has_value())
+                {
+                    current_settings_ipc->send(L"{\"ShowYourself\":\"flyout\"}");
+                }
+                else
+                {
+                    current_settings_ipc->send(fmt::format(L"{{\"ShowYourself\":\"flyout\", \"x_position\":{}, \"y_position\":{} }}", std::to_wstring(flyout_position.value().x), std::to_wstring(flyout_position.value().y)));
+                }
            }
        }
        else
@@ -575,8 +600,8 @@ void open_settings_window(std::optional<std::wstring> settings_window, bool show
    {
        if (!g_isLaunchInProgress)
        {
-            std::thread([settings_window, show_flyout]() {
-                run_settings_window(false, false, settings_window, show_flyout);
+            std::thread([settings_window, show_flyout, flyout_position]() {
+                run_settings_window(false, false, settings_window, show_flyout, flyout_position);
            }).detach();
        }
    }
@@ -608,13 +633,6 @@ void open_scoobe_window()
    }).detach();
 }

-void open_flyout()
-{
-    std::thread([]() {
-        run_settings_window(false, false, std::nullopt, true);
-    }).detach();
-}
-
 std::string ESettingsWindowNames_to_string(ESettingsWindowNames value)
 {
    switch (value)
--- a/src/runner/settings_window.h
+++ b/src/runner/settings_window.h
@@ -22,7 +22,7 @@ enum class ESettingsWindowNames
 std::string ESettingsWindowNames_to_string(ESettingsWindowNames value);
 ESettingsWindowNames ESettingsWindowNames_from_string(std::string value);

-void open_settings_window(std::optional<std::wstring> settings_window, bool show_flyout);
+void open_settings_window(std::optional<std::wstring> settings_window, bool show_flyout, const std::optional<POINT>& flyout_position);
 void close_settings_window();

 void open_oobe_window();
--- a/src/runner/tray_icon.cpp
+++ b/src/runner/tray_icon.cpp
@@ -32,6 +32,8 @@ namespace
    HMENU h_sub_menu = nullptr;
    bool double_click_timer_running = false;
    bool double_clicked = false;
+    POINT tray_icon_click_point;
+
 }

 // Struct to fill with callback and the data. The window_proc is responsible for cleaning it.
@@ -123,7 +125,7 @@ void click_timer_elapsed()
    double_click_timer_running = false;
    if (!double_clicked)
    {
-        open_settings_window(std::nullopt, true);
+        open_settings_window(std::nullopt, true, tray_icon_click_point);
    }
 }

@@ -212,6 +214,9 @@ LRESULT __stdcall tray_icon_window_proc(HWND window, UINT message, WPARAM wparam
                // ignore event if this is the second click of a double click
                if (!double_click_timer_running)
                {
+                    // save the cursor position for sending where to show the popup.
+                    GetCursorPos(&tray_icon_click_point);
+
                    // start timer for detecting single or double click
                    double_click_timer_running = true;
                    double_clicked = false;
--- a/src/runner/tray_icon.h
+++ b/src/runner/tray_icon.h
@@ -7,7 +7,7 @@ void start_tray_icon();
 // Stop the Tray Icon
 void stop_tray_icon();
 // Open the Settings Window
-void open_settings_window(std::optional<std::wstring> settings_window, bool show_flyout);
+void open_settings_window(std::optional<std::wstring> settings_window, bool show_flyout, const std::optional<POINT>& flyout_position = std::nullopt);
 // Callback type to be called by the tray icon loop
 typedef void (*main_loop_callback_function)(PVOID);
 // Calls a callback in _callback
--- a/src/settings-ui/Settings.UI/App.xaml.cs
+++ b/src/settings-ui/Settings.UI/App.xaml.cs
@@ -37,12 +37,12 @@ namespace Microsoft.PowerToys.Settings.UI
            ShowOobeWindow,
            ShowScoobeWindow,
            ShowFlyout,
-            SettingsWindow,
+            ContainsSettingsWindow,
+            ContainsFlyoutPosition,
        }

        // Quantity of arguments
-        private const int RequiredArgumentsQty = 10;
-        private const int RequiredAndOptionalArgumentsQty = 11;
+        private const int RequiredArgumentsQty = 12;

        // Create an instance of the  IPC wrapper.
        private static TwoWayPipeMessageIPCManaged ipcmanager;
@@ -122,11 +122,16 @@ namespace Microsoft.PowerToys.Settings.UI
                ShowOobe = cmdArgs[(int)Arguments.ShowOobeWindow] == "true";
                ShowScoobe = cmdArgs[(int)Arguments.ShowScoobeWindow] == "true";
                ShowFlyout = cmdArgs[(int)Arguments.ShowFlyout] == "true";
+                bool containsSettingsWindow = cmdArgs[(int)Arguments.ContainsSettingsWindow] == "true";
+                bool containsFlyoutPosition = cmdArgs[(int)Arguments.ContainsFlyoutPosition] == "true";

-                if (cmdArgs.Length == RequiredAndOptionalArgumentsQty)
+                // To keep track of variable arguments
+                int currentArgumentIndex = RequiredArgumentsQty;
+
+                if (containsSettingsWindow)
                {
                    // open specific window
-                    switch (cmdArgs[(int)Arguments.SettingsWindow])
+                    switch (cmdArgs[currentArgumentIndex])
                    {
                        case "Overview": StartupPage = typeof(Views.GeneralPage); break;
                        case "AlwaysOnTop": StartupPage = typeof(Views.AlwaysOnTopPage); break;
@@ -148,6 +153,17 @@ namespace Microsoft.PowerToys.Settings.UI
                        case "Hosts": StartupPage = typeof(Views.HostsPage); break;
                        default: Debug.Assert(false, "Unexpected SettingsWindow argument value"); break;
                    }
+
+                    currentArgumentIndex++;
+                }
+
+                int flyout_x = 0;
+                int flyout_y = 0;
+                if (containsFlyoutPosition)
+                {
+                    // get the flyout position arguments
+                    int.TryParse(cmdArgs[currentArgumentIndex++], out flyout_x);
+                    int.TryParse(cmdArgs[currentArgumentIndex++], out flyout_y);
                }

                RunnerHelper.WaitForPowerToysRunner(PowerToysPID, () =>
@@ -193,7 +209,13 @@ namespace Microsoft.PowerToys.Settings.UI
                    }
                    else if (ShowFlyout)
                    {
-                        ShellPage.OpenFlyoutCallback();
+                        POINT? p = null;
+                        if (containsFlyoutPosition)
+                        {
+                            p = new POINT(flyout_x, flyout_y);
+                        }
+
+                        ShellPage.OpenFlyoutCallback(p);
                    }
                }
            }
--- a/src/settings-ui/Settings.UI/FlyoutWindow.xaml.cs
+++ b/src/settings-ui/Settings.UI/FlyoutWindow.xaml.cs
@@ -1,11 +1,13 @@
 // 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 Microsoft.PowerToys.Settings.UI.Helpers;
 using Microsoft.PowerToys.Settings.UI.Library.Telemetry.Events;
 using Microsoft.PowerToys.Settings.UI.ViewModels.Flyout;
 using Microsoft.PowerToys.Telemetry;
 using Microsoft.UI;
 using Microsoft.UI.Windowing;
+using Windows.Graphics;
 using WinUIEx;

 namespace Microsoft.PowerToys.Settings.UI
@@ -21,23 +23,65 @@ namespace Microsoft.PowerToys.Settings.UI

        public FlyoutViewModel ViewModel { get; set; }

-        public FlyoutWindow()
+        public POINT? FlyoutAppearPosition { get; set; }
+
+        public FlyoutWindow(POINT? initialPosition)
        {
            this.InitializeComponent();
            this.Activated += FlyoutWindow_Activated;
-            var hwnd = WinRT.Interop.WindowNative.GetWindowHandle(this);
-            WindowId windowId = Win32Interop.GetWindowIdFromWindow(hwnd);
-            DisplayArea displayArea = DisplayArea.GetFromWindowId(windowId, DisplayAreaFallback.Nearest);
-            double dpiScale = (float)this.GetDpiForWindow() / 96;
-            double x = displayArea.WorkArea.Width - (dpiScale * (WindowWidth + WindowMargin));
-            double y = displayArea.WorkArea.Height - (dpiScale * (WindowHeight + WindowMargin));
-            this.MoveAndResize(x, y, WindowWidth, WindowHeight);
+            FlyoutAppearPosition = initialPosition;
            ViewModel = new FlyoutViewModel();
        }

        private void FlyoutWindow_Activated(object sender, Microsoft.UI.Xaml.WindowActivatedEventArgs args)
        {
            PowerToysTelemetry.Log.WriteEvent(new TrayFlyoutActivatedEvent());
+            if (args.WindowActivationState == Microsoft.UI.Xaml.WindowActivationState.CodeActivated)
+            {
+                var hwnd = WinRT.Interop.WindowNative.GetWindowHandle(this);
+                WindowId windowId = Win32Interop.GetWindowIdFromWindow(hwnd);
+                if (!FlyoutAppearPosition.HasValue)
+                {
+                    DisplayArea displayArea = DisplayArea.GetFromWindowId(windowId, DisplayAreaFallback.Nearest);
+                    double dpiScale = (float)this.GetDpiForWindow() / 96;
+                    double x = displayArea.WorkArea.Width - (dpiScale * (WindowWidth + WindowMargin));
+                    double y = displayArea.WorkArea.Height - (dpiScale * (WindowHeight + WindowMargin));
+                    this.MoveAndResize(x, y, WindowWidth, WindowHeight);
+                }
+                else
+                {
+                    DisplayArea displayArea = DisplayArea.GetFromPoint(new PointInt32(FlyoutAppearPosition.Value.X, FlyoutAppearPosition.Value.Y), DisplayAreaFallback.Nearest);
+
+                    // Move the window to the correct screen as a little blob, so we can get the accurate dpi for the screen to calculate the best position to show it.
+                    this.MoveAndResize(FlyoutAppearPosition.Value.X, FlyoutAppearPosition.Value.Y, 1, 1);
+                    double dpiScale = (float)this.GetDpiForWindow() / 96;
+
+                    // Position the window so that it's inside the display are closest to the point.
+                    POINT newPosition = new POINT(FlyoutAppearPosition.Value.X - (int)(dpiScale * WindowWidth / 2), FlyoutAppearPosition.Value.Y - (int)(dpiScale * WindowHeight / 2));
+                    if (newPosition.X < displayArea.WorkArea.X)
+                    {
+                        newPosition.X = displayArea.WorkArea.X;
+                    }
+
+                    if (newPosition.Y < displayArea.WorkArea.Y)
+                    {
+                        newPosition.Y = displayArea.WorkArea.Y;
+                    }
+
+                    if (newPosition.X + (dpiScale * WindowWidth) > displayArea.WorkArea.X + displayArea.WorkArea.Width)
+                    {
+                        newPosition.X = (int)(displayArea.WorkArea.X + displayArea.WorkArea.Width - (dpiScale * WindowWidth));
+                    }
+
+                    if (newPosition.Y + (dpiScale * WindowHeight) > displayArea.WorkArea.Y + displayArea.WorkArea.Height)
+                    {
+                        newPosition.Y = (int)(displayArea.WorkArea.Y + displayArea.WorkArea.Height - (dpiScale * WindowHeight));
+                    }
+
+                    this.MoveAndResize(newPosition.X, newPosition.Y, WindowWidth, WindowHeight);
+                }
+            }
+
            if (args.WindowActivationState == Microsoft.UI.Xaml.WindowActivationState.Deactivated)
            {
                if (ViewModel.CanHide)
--- a/src/settings-ui/Settings.UI/MainWindow.xaml.cs
+++ b/src/settings-ui/Settings.UI/MainWindow.xaml.cs
@@ -171,16 +171,17 @@ namespace Microsoft.PowerToys.Settings.UI
            });

            // open flyout
-            ShellPage.SetOpenFlyoutCallback(() =>
+            ShellPage.SetOpenFlyoutCallback((POINT? p) =>
            {
                this.DispatcherQueue.TryEnqueue(Microsoft.UI.Dispatching.DispatcherQueuePriority.Normal, () =>
                {
                    if (App.GetFlyoutWindow() == null)
                    {
-                        App.SetFlyoutWindow(new FlyoutWindow());
+                        App.SetFlyoutWindow(new FlyoutWindow(p));
                    }

                    FlyoutWindow flyout = App.GetFlyoutWindow();
+                    flyout.FlyoutAppearPosition = p;
                    flyout.Activate();

                    // https://github.com/microsoft/microsoft-ui-xaml/issues/7595 - Activate doesn't bring window to the foreground
@@ -196,7 +197,7 @@ namespace Microsoft.PowerToys.Settings.UI
                {
                    if (App.GetFlyoutWindow() == null)
                    {
-                        App.SetFlyoutWindow(new FlyoutWindow());
+                        App.SetFlyoutWindow(new FlyoutWindow(null));
                    }

                    App.GetFlyoutWindow().ViewModel.DisableHiding();
--- a/src/settings-ui/Settings.UI/Views/HostsPage.xaml
+++ b/src/settings-ui/Settings.UI/Views/HostsPage.xaml
@@ -9,7 +9,7 @@
    xmlns:ui="using:CommunityToolkit.WinUI.UI"
    mc:Ignorable="d">

-    <controls:SettingsPageControl x:Uid="Hosts" ModuleImageSource="ms-appx:///Assets/Modules/AlwaysOnTop.png">
+    <controls:SettingsPageControl x:Uid="Hosts" ModuleImageSource="ms-appx:///Assets/Modules/HostsFileEditor.png">
        <controls:SettingsPageControl.ModuleContent>
            <StackPanel Orientation="Vertical" ChildrenTransitions="{StaticResource SettingsCardsAnimations}">
                <labs:SettingsCard
--- a/src/settings-ui/Settings.UI/Views/ShellPage.xaml.cs
+++ b/src/settings-ui/Settings.UI/Views/ShellPage.xaml.cs
@@ -45,7 +45,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
        /// <summary>
        /// Declaration for the opening flyout window callback function.
        /// </summary>
-        public delegate void FlyoutOpeningCallback();
+        public delegate void FlyoutOpeningCallback(POINT? point);

        /// <summary>
        /// Declaration for the disabling hide of flyout window callback function.
@@ -330,13 +330,28 @@ namespace Microsoft.PowerToys.Settings.UI.Views
        {
            if (json != null)
            {
-                if (json.ToString().StartsWith("{\"ShowYourself\":"))
+                IJsonValue whatToShowJson;
+                if (json.TryGetValue("ShowYourself", out whatToShowJson))
                {
-                    if (json.ToString().EndsWith("\"flyout\"}"))
+                    if (whatToShowJson.ValueType == JsonValueType.String && whatToShowJson.GetString().Equals("flyout"))
                    {
-                        OpenFlyoutCallback();
+                        POINT? p = null;
+
+                        IJsonValue flyoutPointX;
+                        IJsonValue flyoutPointY;
+                        if (json.TryGetValue("x_position", out flyoutPointX) && json.TryGetValue("y_position", out flyoutPointY))
+                        {
+                            if (flyoutPointX.ValueType == JsonValueType.Number && flyoutPointY.ValueType == JsonValueType.Number)
+                            {
+                                int flyout_x = (int)flyoutPointX.GetNumber();
+                                int flyout_y = (int)flyoutPointY.GetNumber();
+                                p = new POINT(flyout_x, flyout_y);
+                            }
+                        }
+
+                        OpenFlyoutCallback(p);
                    }
-                    else if (json.ToString().EndsWith("\"main_page\"}"))
+                    else if (whatToShowJson.ValueType == JsonValueType.String && whatToShowJson.GetString().Equals("main_page"))
                    {
                        OpenMainWindowCallback();
                    }
Author	SHA1	Message	Date
Stefan Markovic	d986d2e421	[Thumbnail providers] Cover errors and edge cases (#23947 ) * [Thumbnail providers] Cover errors and edge cases * Add TODO comment * Fix tests	2023-02-07 20:18:50 +00:00
Seraphima Zykova	5e30d1e5aa	[FancyZones] Keep the same layouts on the new virtual desktops. (#23927 )	2023-02-07 12:07:23 +00:00
Seraphima Zykova	9ffaa0328b	[FancyZones] Remove app from app-zone-history when dragging starts (#23926 )	2023-02-07 12:07:17 +00:00
Seraphima Zykova	ca3b2563a8	[FancyZones] Fix window resize on layout change (#23829 )	2023-02-06 17:16:12 +01:00
sosssego	e24f6849d5	[Settings][Hosts]Correct Hosts image in settings (#23830 )	2023-02-06 16:49:31 +01:00
Heiko	cedb51bdad	[PTRun]Fix dispatcher crash on Adobe Reader (#23789 ) * improve thumbnail handling and fix dispatcher crash * spell check * fix spellcheck 2 * restore old code * add adobe thumbnail check * clean spell-check * fix reading of default reg value * switch to real time evaluation * fix spelling * add comment * improve comments * Add additional logs and exception handler * result cache, code improvements, comment improvements * reset log marker to report when switching back to Adobe * spell checker * Improve log text * fix bug where detection was incorrect * spell check * fix return on exception	2023-02-06 16:49:25 +01:00
Jaime Bernardo	1856052014	[Flyout][Hotfix]Appear next to the tray icon position (#23772 ) * [Flyout]Appear next to the tray icon position * fix spellchecker	2023-02-06 16:49:15 +01:00
Stefan Markovic	91998ef875	[Installer][Hotfix]Revert HKCU to HKLM (#23754 ) * Revert HKCU to HKLM * Update comments	2023-02-06 16:49:06 +01:00
Seraphima Zykova	6668ec40fc	[FancyZones][Hotfix]Opacity reset fix (#23818 )	2023-02-06 16:48:57 +01:00
Seraphima Zykova	2e27cac8c8	[FancyZones] Fix crashing on win + arrows usage (#23757 )	2023-02-06 16:48:42 +01:00