Skip to content

Commit 1881972

Browse files
committed
ux: enable word-wrap and disable horizontal scrollbar for text editor in notification window (#2127)
Signed-off-by: leo <longshuang@msn.cn>
1 parent a76a898 commit 1881972

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

src/Views/CommandLogContentPresenter.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Collections.Generic;
33

44
using Avalonia;
5-
using Avalonia.Controls.Primitives;
65
using Avalonia.Interactivity;
76
using Avalonia.Media;
87

@@ -87,8 +86,6 @@ public string PureText
8786
IsReadOnly = true;
8887
ShowLineNumbers = false;
8988
WordWrap = false;
90-
HorizontalScrollBarVisibility = ScrollBarVisibility.Auto;
91-
VerticalScrollBarVisibility = ScrollBarVisibility.Auto;
9289

9390
TextArea.TextView.Margin = new Thickness(4, 0);
9491
TextArea.TextView.Options.EnableHyperlinks = false;

src/Views/LauncherPage.axaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,12 @@
154154
</Grid>
155155

156156
<v:CommandLogContentPresenter Grid.Row="1"
157-
Margin="8"
158-
Padding="2"
157+
Margin="8" Padding="2"
159158
MaxHeight="200"
160-
PureText="{Binding Message}"/>
159+
PureText="{Binding Message}"
160+
WordWrap="True"
161+
HorizontalScrollBarVisibility="Disabled"
162+
VerticalScrollBarVisibility="Auto"/>
161163
</Grid>
162164
</Border>
163165
</Border>

src/Views/ViewLogs.axaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,9 @@
125125
BorderThickness="1"
126126
Background="{DynamicResource Brush.Contents}">
127127
<v:CommandLogContentPresenter Log="{Binding SelectedLog}"
128-
FontFamily="{DynamicResource Fonts.Monospace}"/>
128+
FontFamily="{DynamicResource Fonts.Monospace}"
129+
HorizontalScrollBarVisibility="Auto"
130+
VerticalScrollBarVisibility="Auto"/>
129131
</Border>
130132
</Grid>
131133

0 commit comments

Comments
 (0)