Merge branch 'master' into fixes/5924-copy-from-readonly-textbox

.github/PULL_REQUEST_TEMPLATE.md

@@ -18,7 +18,7 @@
 
 - [ ] Added unit tests (if possible)?
 - [ ] Added XML documentation to any related classes?
-- [ ] Consider submitting a PR to https://github.com/AvaloniaUI/Avaloniaui.net with user documentation
+- [ ] Consider submitting a PR to https://github.com/AvaloniaUI/Documentation with user documentation
 
 ## Breaking changes
 <!--- List any breaking changes here. When the PR is merged please add an entry to https://github.com/AvaloniaUI/Avalonia/wiki/Breaking-Changes -->

native/Avalonia.Native/src/OSX/window.h

@@ -34,6 +34,7 @@ class WindowBaseImpl;
 -(double) getScaling;
 -(double) getExtendedTitleBarHeight;
 -(void) setIsExtended:(bool)value;
+-(void) updateShadow;
 @end
 
 struct INSWindowHolder

native/Avalonia.Native/src/OSX/window.mm

@@ -124,7 +124,11 @@ public:
             [Window setTitle:_lastTitle];
             
             _shown = true;
-        
+            
+            dispatch_async(dispatch_get_main_queue(), ^{
+                [Window updateShadow];
+            });
+            
             return S_OK;
         }
     }
@@ -1838,6 +1842,19 @@ NSArray* AllLoopModes = [NSArray arrayWithObjects: NSDefaultRunLoopMode, NSEvent
     double _lastScaling;
 }
 
+- (void)updateShadow
+{
+    // Common problem in Cocoa where [invalidateShadow] does work,
+    // This hack forces Cocoa to invalidate the shadow.
+    
+    NSRect frame = [self frame];
+    NSRect updatedFrame = NSMakeRect(frame.origin.x, frame.origin.y, frame.size.width + 1.0, frame.size.height + 1.0);
+    [self setFrame:updatedFrame display:YES];
+    [self setFrame:frame display:YES];
+    
+    [self invalidateShadow];
+}
+
 -(void) setIsExtended:(bool)value;
 {
     _isExtended = value;

src/Avalonia.Controls/DateTimePickers/TimePicker.cs

@@ -8,7 +8,7 @@ using System.Globalization;
 namespace Avalonia.Controls
 {
     /// <summary>
-    /// A control to allow the user to select a time
+    /// A control to allow the user to select a time.
     /// </summary>
     [PseudoClasses(":hasnotime")]
     public class TimePicker : TemplatedControl

src/Avalonia.Controls/Expander.cs

@@ -4,14 +4,35 @@ using Avalonia.Controls.Primitives;
 
 namespace Avalonia.Controls
 {
+    /// <summary>
+    /// Direction in which an <see cref="Expander"/> control opens.
+    /// </summary>
     public enum ExpandDirection
     {
+        /// <summary>
+        /// Opens down.
+        /// </summary>
         Down,
+
+        /// <summary>
+        /// Opens up.
+        /// </summary>
         Up,
+
+        /// <summary>
+        /// Opens left.
+        /// </summary>
         Left,
+
+        /// <summary>
+        /// Opens right.
+        /// </summary>
         Right
     }
 
+    /// <summary>
+    /// A control with a header that has a collapsible content section.
+    /// </summary>
     [PseudoClasses(":expanded", ":up", ":down", ":left", ":right")]
     public class Expander : HeaderedContentControl
     {

src/Avalonia.Controls/Grid.cs

@@ -17,7 +17,7 @@ using Avalonia.VisualTree;
 namespace Avalonia.Controls
 {
     /// <summary>
-    /// Grid
+    /// Defines a flexible grid area that consists of columns and rows.
     /// </summary>
     public class Grid : Panel
     {

src/Avalonia.Controls/Primitives/ScrollBarVisibility.cs

@@ -1,10 +1,28 @@
 namespace Avalonia.Controls.Primitives
 {
+    /// <summary>
+    /// Specifies the visibility of a <see cref="ScrollBar"/> for scrollable content.
+    /// </summary>
     public enum ScrollBarVisibility
     {
+        /// <summary>
+        /// No scrollbars and no scrolling in this dimension.
+        /// </summary>
         Disabled,
+
+        /// <summary>
+        /// The scrollbar should be visible only if there is more content than fits in the viewport.
+        /// </summary>
         Auto,
+
+        /// <summary>
+        /// The scrollbar should never be visible.  No space should ever be reserved for the scrollbar.
+        /// </summary>
         Hidden,
+
+        /// <summary>
+        /// The scrollbar should always be visible.  Space should always be reserved for the scrollbar.
+        /// </summary>
         Visible,
     }
 }

src/Avalonia.Controls/RadioButton.cs

@@ -8,6 +8,9 @@ using Avalonia.VisualTree;
 
 namespace Avalonia.Controls
 {
+    /// <summary>
+    /// Represents a button that allows a user to select a single option from a group of options.
+    /// </summary>
     public class RadioButton : ToggleButton
     {
         private class RadioButtonGroupManager

src/Avalonia.Controls/RelativePanel.cs

@@ -8,6 +8,9 @@ using Avalonia.Layout;
 
 namespace Avalonia.Controls
 {
+    /// <summary>
+    /// Defines an area within which you can position and align child objects in relation to each other or the parent panel.
+    /// </summary>
     public partial class RelativePanel : Panel
     {
         private readonly Graph _childGraph;

src/Avalonia.Controls/RepeatButton.cs

@@ -4,6 +4,9 @@ using Avalonia.Threading;
 
 namespace Avalonia.Controls
 {
+    /// <summary>
+    /// Represents a control that raises its <see cref="Button.Click"/> event repeatedly when it is pressed and held.
+    /// </summary>
     public class RepeatButton : Button
     {
         /// <summary>

src/Avalonia.Controls/TextBox.cs

@@ -17,6 +17,9 @@ using Avalonia.Controls.Metadata;
 
 namespace Avalonia.Controls
 {
+    /// <summary>
+    /// Represents a control that can be used to display or edit unformatted text.
+    /// </summary>
     [PseudoClasses(":empty")]
     public class TextBox : TemplatedControl, UndoRedoHelper<TextBox.UndoRedoState>.IUndoRedoHost
     {

src/Avalonia.Native/WindowImplBase.cs

@@ -414,9 +414,7 @@ namespace Avalonia.Native
 
         public Action<RawInputEventArgs> Input { get; set; }
 
-        Action<double> ScalingChanged { get; set; }
-
-        Action<double> ITopLevelImpl.ScalingChanged { get; set; }
+        public Action<double> ScalingChanged { get; set; }
 
         public Action<WindowTransparencyLevel> TransparencyLevelChanged { get; set; }
 

src/Avalonia.Visuals/Media/TextFormatting/ShapedTextCharacters.cs

@@ -109,7 +109,8 @@ namespace Avalonia.Media.TextFormatting
                 GlyphRun.GlyphAdvances.Take(glyphCount),
                 GlyphRun.GlyphOffsets.Take(glyphCount),
                 GlyphRun.Characters.Take(length),
-                GlyphRun.GlyphClusters.Take(glyphCount));
+                GlyphRun.GlyphClusters.Take(glyphCount),
+                GlyphRun.BiDiLevel);
 
             var firstTextRun = new ShapedTextCharacters(firstGlyphRun, Properties);
 
@@ -120,7 +121,8 @@ namespace Avalonia.Media.TextFormatting
                 GlyphRun.GlyphAdvances.Skip(glyphCount),
                 GlyphRun.GlyphOffsets.Skip(glyphCount),
                 GlyphRun.Characters.Skip(length),
-                GlyphRun.GlyphClusters.Skip(glyphCount));
+                GlyphRun.GlyphClusters.Skip(glyphCount),
+                GlyphRun.BiDiLevel);
 
             var secondTextRun = new ShapedTextCharacters(secondGlyphRun, Properties);
 

src/Avalonia.Visuals/Media/TextFormatting/TextCharacters.cs

@@ -135,20 +135,20 @@ namespace Avalonia.Media.TextFormatting
 
             count = 0;
             var script = Script.Common;
-            //var direction = BiDiClass.LeftToRight;
+            var direction = BiDiClass.LeftToRight;
 
             var font = typeface.GlyphTypeface;
             var defaultFont = defaultTypeface.GlyphTypeface;
-
+            
             var enumerator = new GraphemeEnumerator(text);
 
             while (enumerator.MoveNext())
             {
-                var grapheme = enumerator.Current;
+                var currentGrapheme = enumerator.Current;
 
-                var currentScript = grapheme.FirstCodepoint.Script;
+                var currentScript = currentGrapheme.FirstCodepoint.Script;
 
-                //var currentDirection = grapheme.FirstCodepoint.BiDiClass;
+                var currentDirection = currentGrapheme.FirstCodepoint.BiDiClass;
 
                 //// ToDo: Implement BiDi algorithm
                 //if (currentScript.HorizontalDirection != direction)
@@ -161,36 +161,44 @@ namespace Avalonia.Media.TextFormatting
 
                 if (currentScript != script)
                 {
-                    if (currentScript != Script.Inherited && currentScript != Script.Common)
+                    if (script == Script.Inherited || script == Script.Common)
                     {
-                        if (script == Script.Inherited || script == Script.Common)
-                        {
-                            script = currentScript;
-                        }
-                        else
+                        script = currentScript;
+                    }
+                    else
+                    {
+                        if (currentScript != Script.Inherited && currentScript != Script.Common)
                         {
                             break;
                         }
                     }
                 }
 
-                if (isFallback)
+                if (currentScript != Script.Common && currentScript != Script.Inherited)
                 {
-                    if (defaultFont.TryGetGlyph(grapheme.FirstCodepoint, out _))
+                    if (isFallback && defaultFont.TryGetGlyph(currentGrapheme.FirstCodepoint, out _))
                     {
                         break;
                     }
-                }
 
-                if (!font.TryGetGlyph(grapheme.FirstCodepoint, out _))
-                {
-                    if (!grapheme.FirstCodepoint.IsWhiteSpace)
+                    if (!font.TryGetGlyph(currentGrapheme.FirstCodepoint, out _))
                     {
                         break;
                     }
                 }
 
-                count += grapheme.Text.Length;
+                if (!currentGrapheme.FirstCodepoint.IsWhiteSpace && !font.TryGetGlyph(currentGrapheme.FirstCodepoint, out _))
+                {
+                    break;
+                }
+
+                if (direction == BiDiClass.RightToLeft && currentDirection  == BiDiClass.CommonSeparator)
+                {
+                    break;
+                }
+
+                count += currentGrapheme.Text.Length;
+                direction = currentDirection;
             }
 
             return count > 0;

tests/Avalonia.Skia.UnitTests/Media/TextFormatting/TextFormatterTests.cs

@@ -125,6 +125,27 @@ namespace Avalonia.Skia.UnitTests.Media.TextFormatting
             }
         }
 
+        [Fact]
+        public void Should_Produce_A_Single_Fallback_Run()
+        {
+            using (Start())
+            {
+                var defaultProperties = new GenericTextRunProperties(Typeface.Default);
+
+                const string text = "👍 👍 👍 👍";
+                
+                var textSource = new SingleBufferTextSource(text, defaultProperties);
+
+                var formatter = new TextFormatterImpl();
+
+                var textLine =
+                    formatter.FormatLine(textSource, 0, double.PositiveInfinity,
+                        new GenericTextParagraphProperties(defaultProperties));
+
+                Assert.Equal(1, textLine.TextRuns.Count);
+            } 
+        }
+
         [Fact]
         public void Should_Split_Run_On_Script()
         {