Skip to content

Layout corrections for RTL language environments, including flipped Grapher #2391

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Layout corrections for RTL language environments, including flipped Grapher #2391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6557485
Added FlowDirection override on Grapher
Avid29 Mar 24, 2022
ae0a347
Merge branch 'microsoft:main' into graph_flow-direction
Avid29 Oct 10, 2025
1ff5e07
Fixed GraphNumPad layout to ensure LTR FlowDirection
Avid29 Oct 10, 2025
0e9bbf2
Fixed EquationIInputArea to still show variables on the left hand sid…
Avid29 Oct 10, 2025
6ff9b8f
Reverted localization changes
Avid29 Oct 16, 2025
ebd8fd9
Merge branch 'microsoft:main' into graph_flow-direction
Avid29 Oct 16, 2025
4c563a6
Fixed encoding on Resources.resw
Avid29 Oct 17, 2025
f55f668
Fixed operator panel scroll button icon directions in RTL
Avid29 Oct 17, 2025
0b4b4f0
Adjusted RightToLeft layout for operators panels
Avid29 Oct 17, 2025
ad8edf8
Revised GraphNumPad to reduce layers of Grids
Avid29 Oct 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions src/Calculator/App.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2227,9 +2227,14 @@
Foreground="{ThemeResource SystemAltMediumHighColor}"
FontFamily="{ThemeResource CalculatorFontFamily}"
FontSize="12"
Content=""
IsTabStop="False"
Visibility="Collapsed"/>
Visibility="Collapsed">
<FontIcon x:Name="ScrollLeftText"
FontFamily="{ThemeResource CalculatorFontFamily}"
FontSize="12"
MirroredWhenRightToLeft="True"
Glyph="&#xE96F;"/>
</Button>
<Button x:Name="ScrollRight"
Grid.Row="1"
MinWidth="20"
Expand All @@ -2240,9 +2245,14 @@
Foreground="{ThemeResource SystemAltMediumHighColor}"
FontFamily="{ThemeResource CalculatorFontFamily}"
FontSize="12"
Content="&#xE970;"
IsTabStop="False"
Visibility="Collapsed"/>
Visibility="Collapsed">
<FontIcon x:Name="ScrollRightText"
FontFamily="{ThemeResource CalculatorFontFamily}"
FontSize="12"
MirroredWhenRightToLeft="True"
Glyph="&#xE970;"/>
</Button>
</Grid>
</ControlTemplate>
</Setter.Value>
Expand Down
56 changes: 31 additions & 25 deletions src/Calculator/Views/Calculator.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@
</VisualStateGroup>
</VisualStateManager.VisualStateGroups>

<Grid FlowDirection="LeftToRight">
<Grid>
<Grid.RowDefinitions>
<RowDefinition x:Name="RowHamburger" Height="{StaticResource HamburgerHeightGridLength}"/>
<RowDefinition x:Name="RowExpression"
Expand All @@ -623,6 +623,7 @@
Grid.Row="1"
Margin="6,0,6,0"
VerticalAlignment="Bottom"
FlowDirection="LeftToRight"
Style="{StaticResource NormalStyle}"
AutomationProperties.AutomationId="CalculatorExpression"
AutomationProperties.Name="{x:Bind Model.CalculationExpressionAutomationName, Mode=OneWay}"
Expand All @@ -633,6 +634,7 @@
x:Uid="CalculatorResults"
Grid.Row="2"
Margin="0,0,0,0"
FlowDirection="LeftToRight"
Style="{StaticResource ResultsStyle}"
AutomationProperties.AutomationId="CalculatorResults"
AutomationProperties.HeadingLevel="Level1"
Expand All @@ -649,6 +651,7 @@
Grid.Row="2"
Margin="6,0,6,0"
HorizontalContentAlignment="Right"
FlowDirection="LeftToRight"
Style="{StaticResource AOTResultsStyle}"
FontSize="40"
AutomationProperties.AutomationId="CalculatorAlwaysOnTopResults"
Expand All @@ -662,6 +665,33 @@
UseSystemFocusVisuals="True"
Visibility="{x:Bind Model.IsAlwaysOnTop, Mode=OneWay}"/>

<!--History button-->
<Grid FlowDirection="LeftToRight">
<Button x:Name="HistoryButton"
Grid.Row="0"
Style="{StaticResource HistoryButtonStyle}"
common:KeyboardShortcutManager.VirtualKeyControlChord="{utils:ResourceVirtualKey Name=HistoryButton/[using:CalculatorApp.Common]KeyboardShortcutManager/VirtualKeyControlChord}"
AccessKey="{utils:ResourceString Name=HistoryButton/AccessKey}"
AutomationProperties.AutomationId="HistoryButton"
Command="{x:Bind HistoryButtonPressed, Mode=OneTime}"
Content="&#xe81c;"
ExitDisplayModeOnAccessKeyInvoked="False"
TabIndex="2"
ToolTipService.ToolTip="{utils:ResourceString Name=HistoryButton/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip}"
Visibility="{x:Bind local:Calculator.ShouldDisplayHistoryButton(Model.IsAlwaysOnTop, Model.IsProgrammer, DockPanel.Visibility), Mode=OneWay}"
IsEnabled="{x:Bind Model.IsAlwaysOnTop, Converter={StaticResource BooleanNegationConverter}, Mode=OneWay}">
<FlyoutBase.AttachedFlyout>
<Flyout x:Name="HistoryFlyout"
AutomationProperties.AutomationId="HistoryFlyout"
Closed="HistoryFlyout_Closed"
Closing="HistoryFlyout_Closing"
FlyoutPresenterStyle="{StaticResource HistoryFlyoutStyle}"
Opened="HistoryFlyout_Opened"
Placement="Full"/>
</FlyoutBase.AttachedFlyout>
</Button>
</Grid>

<!-- Programmer display panel controls -->
<local:CalculatorProgrammerOperators x:Name="ProgrammerOperators"
Grid.Row="3"
Expand All @@ -677,30 +707,6 @@
IsEnabled="{x:Bind Model.IsProgrammer, Mode=OneWay}"
x:Load="False"/>

<Button x:Name="HistoryButton"
Grid.Row="0"
Style="{StaticResource HistoryButtonStyle}"
common:KeyboardShortcutManager.VirtualKeyControlChord="{utils:ResourceVirtualKey Name=HistoryButton/[using:CalculatorApp.Common]KeyboardShortcutManager/VirtualKeyControlChord}"
AccessKey="{utils:ResourceString Name=HistoryButton/AccessKey}"
AutomationProperties.AutomationId="HistoryButton"
Command="{x:Bind HistoryButtonPressed, Mode=OneTime}"
Content="&#xe81c;"
ExitDisplayModeOnAccessKeyInvoked="False"
TabIndex="2"
ToolTipService.ToolTip="{utils:ResourceString Name=HistoryButton/[using:Windows.UI.Xaml.Controls]ToolTipService/ToolTip}"
Visibility="{x:Bind local:Calculator.ShouldDisplayHistoryButton(Model.IsAlwaysOnTop, Model.IsProgrammer, DockPanel.Visibility), Mode=OneWay}"
IsEnabled="{x:Bind Model.IsAlwaysOnTop, Converter={StaticResource BooleanNegationConverter}, Mode=OneWay}">
<FlyoutBase.AttachedFlyout>
<Flyout x:Name="HistoryFlyout"
AutomationProperties.AutomationId="HistoryFlyout"
Closed="HistoryFlyout_Closed"
Closing="HistoryFlyout_Closing"
FlyoutPresenterStyle="{StaticResource HistoryFlyoutStyle}"
Opened="HistoryFlyout_Opened"
Placement="Full"/>
</FlyoutBase.AttachedFlyout>
</Button>

<!-- Scientific angle buttons -->
<local:CalculatorScientificAngleButtons x:Name="ScientificAngleButtons"
Grid.Row="3"
Expand Down
1 change: 1 addition & 0 deletions src/Calculator/Views/CalculatorProgrammerBitFlipPanel.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@
</UserControl.Resources>
<Grid x:Name="BitFlipPanel"
Margin="0,1,0,1"
FlowDirection="LeftToRight"
AutomationProperties.HeadingLevel="Level1"
AutomationProperties.Name="{utils:ResourceString Name=BitFlipPanel/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}">
<Grid.RowDefinitions>
Expand Down
4 changes: 3 additions & 1 deletion src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<converters:BooleanToVisibilityNegationConverter x:Key="BooleanToVisibilityNegationConverter"/>
</UserControl.Resources>

<Grid x:Name="ProgRadixOps">
<Grid x:Name="ProgRadixOps" FlowDirection="LeftToRight">
<Grid.RowDefinitions>
<RowDefinition x:Name="OperatorPanelRow" Height="Auto"/>
<RowDefinition Height="1*"/>
Expand Down Expand Up @@ -230,6 +230,7 @@

<controls:OperatorPanelListView Grid.ColumnSpan="6"
Background="{ThemeResource AppOperatorPanelBackground}"
FlowDirection="{x:Bind FlowDirection}"
AutomationProperties.HeadingLevel="Level1"
AutomationProperties.Name="{utils:ResourceString Name=ProgrammerOperatorPanel/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}">

Expand All @@ -248,6 +249,7 @@
<Grid x:Name="BitwiseGrid"
MinWidth="258"
MinHeight="96"
FlowDirection="LeftToRight"
XYFocusKeyboardNavigation="Enabled">
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
Expand Down
5 changes: 4 additions & 1 deletion src/Calculator/Views/CalculatorScientificOperators.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
<converters:BooleanToVisibilityNegationConverter x:Key="BooleanToVisibilityNegationConverter"/>
</UserControl.Resources>
<Grid x:Name="ScientificOperators">
<Grid x:Name="ScientificOperators" FlowDirection="LeftToRight">
<Grid.RowDefinitions>
<RowDefinition x:Name="OperatorPanelRow" Height="Auto"/>
<RowDefinition Height="1*"/>
Expand Down Expand Up @@ -372,6 +372,7 @@

<controls:OperatorPanelListView Grid.ColumnSpan="5"
Background="{ThemeResource AppOperatorPanelBackground}"
FlowDirection="{x:Bind FlowDirection}"
AutomationProperties.HeadingLevel="Level1"
AutomationProperties.Name="{utils:ResourceString Name=ScientificOperatorPanel/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}">

Expand All @@ -390,6 +391,7 @@
<Grid x:Name="TrigGrid"
MinWidth="258"
MinHeight="96"
FlowDirection="LeftToRight"
XYFocusKeyboardNavigation="Enabled">
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
Expand Down Expand Up @@ -827,6 +829,7 @@
<Grid x:Name="FuncGrid"
MinWidth="194"
MinHeight="96"
FlowDirection="LeftToRight"
XYFocusKeyboardNavigation="Enabled">
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
Expand Down
2 changes: 1 addition & 1 deletion src/Calculator/Views/CalculatorStandardOperators.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
XYFocusKeyboardNavigation="Enabled"
mc:Ignorable="d">

<Grid x:Name="Root">
<Grid x:Name="Root" FlowDirection="LeftToRight">
<Grid.RowDefinitions>
<RowDefinition x:Name="R0" Height="1*"/>
<RowDefinition x:Name="R1" Height="1*"/>
Expand Down
3 changes: 2 additions & 1 deletion src/Calculator/Views/GraphingCalculator/EquationInputArea.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@
Style="{ThemeResource VariableContainerStyle}"
contract7Present:CornerRadius="{ThemeResource ControlCornerRadius}">
<StackPanel Padding="12,0,12,6">
<Grid HorizontalAlignment="Stretch">
<Grid HorizontalAlignment="Left"
FlowDirection="LeftToRight">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
Expand Down
1 change: 1 addition & 0 deletions src/Calculator/Views/GraphingCalculator/GraphingCalculator.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,7 @@
LosingFocus="GraphingControl_LosingFocus"
LostFocus="GraphingControl_LostFocus"
UseSystemFocusVisuals="True"
FlowDirection="LeftToRight"
VariablesUpdated="GraphingControl_VariablesUpdated">
<graphControl:Grapher.ContextFlyout>
<MenuFlyout Placement="Bottom">
Expand Down
7 changes: 6 additions & 1 deletion src/Calculator/Views/GraphingCalculator/GraphingNumPad.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
<converters:BooleanToVisibilityNegationConverter x:Key="BooleanToVisibilityNegationConverter"/>
</UserControl.Resources>

<Border Background="{ThemeResource AppOperatorPanelBackground}" PointerPressed="GraphingNumPad_PointerPressed">
<Border Background="{ThemeResource AppOperatorPanelBackground}" PointerPressed="GraphingNumPad_PointerPressed"
FlowDirection="LeftToRight">
<VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="SizeLayouts">
<VisualState x:Name="Large">
Expand Down Expand Up @@ -357,6 +358,7 @@
</Grid.ColumnDefinitions>

<controls:OperatorPanelListView Grid.ColumnSpan="5"
FlowDirection="{x:Bind FlowDirection}"
AutomationProperties.HeadingLevel="Level1"
AutomationProperties.Name="{utils:ResourceString Name=ScientificOperatorPanel/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}">

Expand All @@ -379,6 +381,7 @@
<Grid x:Name="TrigGrid"
MinWidth="258"
MinHeight="96"
FlowDirection="LeftToRight"
XYFocusKeyboardNavigation="Enabled">
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
Expand Down Expand Up @@ -793,6 +796,7 @@
Placement="Bottom">

<Grid x:Name="InequalityGrid"
FlowDirection="LeftToRight"
MinWidth="312"
MinHeight="48">
<Grid.RowDefinitions>
Expand Down Expand Up @@ -884,6 +888,7 @@
<Grid x:Name="FuncGrid"
MinWidth="194"
MinHeight="48"
FlowDirection="LeftToRight"
XYFocusKeyboardNavigation="Enabled">
<Grid.RowDefinitions>
<RowDefinition Height="1*"/>
Expand Down