Browse Source
Merge branch 'master' into fixes/LineBreakCharacterTests
pull/3644/head
Benedikt Stebner
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
2 additions and
1 deletions
-
src/Avalonia.Controls/Presenters/TextPresenter.cs
-
src/Avalonia.Themes.Default/TabControl.xaml
|
|
@ -82,6 +82,7 @@ namespace Avalonia.Controls.Presenters |
|
|
SelectionStartProperty, SelectionEndProperty); |
|
|
SelectionStartProperty, SelectionEndProperty); |
|
|
|
|
|
|
|
|
Observable.Merge( |
|
|
Observable.Merge( |
|
|
|
|
|
TextProperty.Changed, |
|
|
SelectionStartProperty.Changed, |
|
|
SelectionStartProperty.Changed, |
|
|
SelectionEndProperty.Changed, |
|
|
SelectionEndProperty.Changed, |
|
|
PasswordCharProperty.Changed |
|
|
PasswordCharProperty.Changed |
|
|
|
|
|
@ -57,6 +57,6 @@ |
|
|
<Setter Property="Orientation" Value="Vertical"/> |
|
|
<Setter Property="Orientation" Value="Vertical"/> |
|
|
</Style> |
|
|
</Style> |
|
|
<Style Selector="TabControl[TabStripPlacement=Right]"> |
|
|
<Style Selector="TabControl[TabStripPlacement=Right]"> |
|
|
<Setter Property="Padding" Value="0 0 0 4"/> |
|
|
<Setter Property="Padding" Value="0 0 4 0"/> |
|
|
</Style> |
|
|
</Style> |
|
|
</Styles> |
|
|
</Styles> |
|
|
|
