Merge branch 'master' into development

samples/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
         <CodeAnalysisRuleSet>../Custom.ruleset</CodeAnalysisRuleSet>
-		    <AvaloniaVersion>11.3.0</AvaloniaVersion>
+		    <AvaloniaVersion>11.3.6</AvaloniaVersion>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" />

src/ColorPicker

@@ -1 +1 @@
-Subproject commit f39e02c617d9a4a57b1a911fc4f03bbf7a7fd987
+Subproject commit 61055feed27354e6be969055fc0ee5db3c7d3b94

src/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
         <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)Custom.ruleset</CodeAnalysisRuleSet>
-		    <AvaloniaVersion>11.3.5</AvaloniaVersion>
+		    <AvaloniaVersion>11.3.6</AvaloniaVersion>
     </PropertyGroup>
   
   <PropertyGroup Condition="$([MSBuild]::IsOsPlatform('Windows')) AND '$(Platform)' == 'x64'">

src/Drawie

@@ -1 +1 @@
-Subproject commit 9e5f6dc3ab03cd67fa157b0952e7bb510c465e8b
+Subproject commit b62a0dca915a92c020e9e9145fb287fa69da4e64

src/PixiDocks

@@ -1 +1 @@
-Subproject commit af479aac479fd1a0494cb61fa49a03a3713c96cf
+Subproject commit 1604a0bb1fdf1d0016bfc82752c85b3266bed2c2

src/PixiEditor.UI.Common/Controls/TextBox.axaml

@@ -156,7 +156,14 @@
                                    SelectionStart="{TemplateBinding SelectionStart}"
                                    Text="{TemplateBinding Text,Mode=TwoWay}"
                                    TextAlignment="{TemplateBinding TextAlignment}"
-                                   TextWrapping="{TemplateBinding TextWrapping}" />
+                                   TextWrapping="{TemplateBinding TextWrapping}">
+                        <TextPresenter.Margin>
+                            <OnPlatform>
+                                <OnPlatform.Default>0</OnPlatform.Default>
+                                <OnPlatform.macOS>2, 0</OnPlatform.macOS>
+                            </OnPlatform>
+                        </TextPresenter.Margin>
+                    </TextPresenter>
                   </Panel>
                 </ScrollViewer>
                 <ContentPresenter Grid.Column="2"

tests/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
     <PropertyGroup>
         <CodeAnalysisRuleSet>../Custom.ruleset</CodeAnalysisRuleSet>
-		<AvaloniaVersion>11.3.5</AvaloniaVersion>
+		<AvaloniaVersion>11.3.6</AvaloniaVersion>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" />