Syncing content from committish 1af696287a7dc82f30bd6368a2a818158a4e580a

microsoft · Oct 8, 2024 · 6471fbe · 6471fbe
1 parent 5cd9365
commit 6471fbe
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/dxaml/xcp/dxaml/lib/AppBar_Partial.cpp b/dxaml/xcp/dxaml/lib/AppBar_Partial.cpp
@@ -27,6 +27,12 @@
 #include "XamlRoot.g.h"
 #include "ElementSoundPlayerService_Partial.h"
 
+#include <FrameworkUdk/Containment.h>
+
+// Bug 53617690: [(GE)WCD_ON][2024.09A][Compat][OS Issue][File explorer]: The context menu appears upside when clicking "See more" in Windows File Explorer.
+// Bug 53845621: [1.5 servicing] [(GE)WCD_ON][2024.09A][Compat][OS Issue][File explorer]: The context menu appears upside when clicking "See more" in Windows File Explorer.
+#define WINAPPSDK_CHANGEID_53845621 53845621
+
 using namespace DirectUI;
 using namespace std::placeholders;
 
@@ -1435,7 +1441,17 @@ _Check_return_ HRESULT AppBar::HasSpaceForAppBarToOpenDown(bool* hasSpace)
     layoutBounds.X -= windowBounds.X;
     layoutBounds.Y -= windowBounds.Y;
 
-    *hasSpace = (bottomOfExpandedAppBar.Y <= layoutBounds.Y + layoutBounds.Height);
+    auto bottomOfLayout = layoutBounds.Y + layoutBounds.Height;
+
+    if (WinAppSdk::Containment::IsChangeEnabled<WINAPPSDK_CHANGEID_53845621>())
+    {
+        // Pixel rounding can sometimes cause the bounds and AppBar size to be off by a pixel when we expect them to be equal.
+        // To account for that possibility, we'll allow the AppBar to open down if its height is at most one pixel greater
+        // than the layout bounds height.
+        bottomOfLayout += 1;
+    }
+
+    *hasSpace = (bottomOfExpandedAppBar.Y <= bottomOfLayout);
     return S_OK;
 }
 

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -2,17 +2,17 @@
 <!-- Copyright (c) Microsoft Corporation. Licensed under the MIT License. See LICENSE in the project root for license information. -->
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.WindowsAppSDK.Foundation.TransportPackage" Version="1.5.0-20240625.0.release">
+    <Dependency Name="Microsoft.WindowsAppSDK.Foundation.TransportPackage" Version="1.5.0-20240929.0.release">
       <Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/WindowsAppSDK</Uri>
-      <Sha>ad621f84e7cc1b2c4e2409f82582cda4570f22d9</Sha>
+      <Sha>f51f55b53b094d28a8fb117fe79fa354a3287c3b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage" Version="1.5.4-CI-26105.1006.240730-1425.0">
+    <Dependency Name="Microsoft.ProjectReunion.InteractiveExperiences.TransportPackage" Version="1.5.4-CI-26105.1010.240927-1621.0">
       <Uri>https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP</Uri>
-      <Sha>534b0b3660f84e948237f93c52b11bb816fb985c</Sha>
+      <Sha>943a920dac1612ac395a09f42af287a08e6eddac</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Internal.InteractiveExperiences" Version="1.5.4-CI-26105.1006.240730-1425.0">
+    <Dependency Name="Microsoft.Internal.InteractiveExperiences" Version="1.5.4-CI-26105.1010.240927-1621.0">
       <Uri>https://dev.azure.com/microsoft/LiftedIXP/_git/DCPP</Uri>
-      <Sha>534b0b3660f84e948237f93c52b11bb816fb985c</Sha>
+      <Sha>943a920dac1612ac395a09f42af287a08e6eddac</Sha>
     </Dependency>
     <!-- Microsoft-WinUI-SDK repo (MSBuild and Visual Studio extensions for building, deploying, and debugging packaged applications.)  -->
     <Dependency Name="Microsoft.Build.Msix" Version="1.5.0-zmain.240510.2">