Skip to content

Commit 2719d46

Browse files
[Windows] Fix RightToLeft is not working for Shell (#28161)
* [Windows] Fixed FlowDirection RightToLeft working for Shell * Changes on code formatting * Removed the UnShipped file changes * Testcase sample changes * Updating images for windows and mac
1 parent b6b2ddc commit 2719d46

File tree

7 files changed

+9
-4
lines changed

7 files changed

+9
-4
lines changed

src/Controls/src/Core/Handlers/Shell/ShellHandler.Windows.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,11 @@ public static void MapFlyout(ShellHandler handler, IFlyoutView flyoutView)
149149

150150
}
151151

152+
internal static void MapFlowDirection(ShellHandler handler, Shell view)
153+
{
154+
handler.PlatformView.UpdateFlowDirection(view);
155+
}
156+
152157
public static void MapIsPresented(ShellHandler handler, IFlyoutView flyoutView)
153158
{
154159
// WinUI Will close the pane inside of the apply template code

src/Controls/src/Core/Handlers/Shell/ShellHandler.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public partial class ShellHandler
3434
#if WINDOWS
3535
[nameof(Shell.FlyoutIcon)] = MapFlyoutIcon,
3636
[nameof(Shell.FlyoutContentTemplate)] = MapFlyout,
37+
[nameof(Shell.FlowDirection)] = MapFlowDirection,
3738
#endif
3839
};
3940

44 Bytes
Loading
-2.83 KB
Loading

src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue17057.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
#if TEST_FAILS_ON_WINDOWS // To fix the issue in windows https://github.com/dotnet/maui/issues/27947
2-
using NUnit.Framework;
1+
using NUnit.Framework;
32
using UITest.Appium;
43
using UITest.Core;
54

@@ -17,8 +16,8 @@ public Issue17057(TestDevice testDevice) : base(testDevice)
1716
public void ShellFlowDirectionUpdate()
1817
{
1918
App.WaitForElement("label");
19+
App.TapShellFlyoutIcon();
2020
VerifyScreenshot();
2121
}
2222
}
23-
}
24-
#endif
23+
}
5.67 KB
Loading
2.26 KB
Loading

0 commit comments

Comments
 (0)