Browse Source

Merge branch 'master' into feature/flowDirectionImpl

pull/7810/head
daniel mayost 5 years ago
parent
commit
baf77db493
  1. 2
      samples/ControlCatalog/Pages/ScreenPage.cs
  2. 2
      src/Avalonia.Controls/Control.cs

2
samples/ControlCatalog/Pages/ScreenPage.cs

@ -78,5 +78,7 @@ namespace ControlCatalog.Pages
return new FormattedText(textToFormat, CultureInfo.CurrentCulture, FlowDirection.LeftToRight, return new FormattedText(textToFormat, CultureInfo.CurrentCulture, FlowDirection.LeftToRight,
Typeface.Default, 12, Brushes.Green); Typeface.Default, 12, Brushes.Green);
} }
protected override bool ShouldBeMirroredIfRightToLeft() => false;
} }
} }

2
src/Avalonia.Controls/Control.cs

@ -346,7 +346,7 @@ namespace Avalonia.Controls
if (shouldBeMirroredIfRightToLeft) if (shouldBeMirroredIfRightToLeft)
{ {
shouldMirror = ShuoldApplyMirrorTransform(parentFD, thisFD); shouldMirror = ShuoldApplyMirrorTransform(parentFD, thisFD);
if (this is PopupRoot && thisFD == FlowDirection.RightToLeft) if (Parent is Popup && thisFD == FlowDirection.RightToLeft)
{ {
shouldMirror = true; shouldMirror = true;
} }

Loading…
Cancel
Save