Skip to content

Commit 1e37350

Browse files
committed
feature: allow to disable auto-hide feature in ScrollBar (#1769)
Signed-off-by: leo <[email protected]>
1 parent ecfe914 commit 1e37350

File tree

6 files changed

+17
-1
lines changed

6 files changed

+17
-1
lines changed

src/Resources/Locales/en_US.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -547,6 +547,7 @@
547547
<x:String x:Key="Text.Preferences.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">Use monospace font only in text editor</x:String>
548548
<x:String x:Key="Text.Preferences.Appearance.Theme" xml:space="preserve">Theme</x:String>
549549
<x:String x:Key="Text.Preferences.Appearance.ThemeOverrides" xml:space="preserve">Theme Overrides</x:String>
550+
<x:String x:Key="Text.Preferences.Appearance.UseAutoHideScrollBars" xml:space="preserve">Use auto-hide scrollbars</x:String>
550551
<x:String x:Key="Text.Preferences.Appearance.UseFixedTabWidth" xml:space="preserve">Use fixed tab width in titlebar</x:String>
551552
<x:String x:Key="Text.Preferences.Appearance.UseNativeWindowFrame" xml:space="preserve">Use native window frame</x:String>
552553
<x:String x:Key="Text.Preferences.DiffMerge" xml:space="preserve">DIFF/MERGE TOOL</x:String>

src/Resources/Locales/zh_CN.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -551,6 +551,7 @@
551551
<x:String x:Key="Text.Preferences.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">仅在文本编辑器中使用等宽字体</x:String>
552552
<x:String x:Key="Text.Preferences.Appearance.Theme" xml:space="preserve">主题</x:String>
553553
<x:String x:Key="Text.Preferences.Appearance.ThemeOverrides" xml:space="preserve">主题自定义</x:String>
554+
<x:String x:Key="Text.Preferences.Appearance.UseAutoHideScrollBars" xml:space="preserve">允许滚动条自动隐藏</x:String>
554555
<x:String x:Key="Text.Preferences.Appearance.UseFixedTabWidth" xml:space="preserve">主标签使用固定宽度</x:String>
555556
<x:String x:Key="Text.Preferences.Appearance.UseNativeWindowFrame" xml:space="preserve">使用系统默认窗体样式</x:String>
556557
<x:String x:Key="Text.Preferences.DiffMerge" xml:space="preserve">对比/合并工具</x:String>

src/Resources/Locales/zh_TW.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -551,6 +551,7 @@
551551
<x:String x:Key="Text.Preferences.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">僅在文字編輯器中使用等寬字型</x:String>
552552
<x:String x:Key="Text.Preferences.Appearance.Theme" xml:space="preserve">佈景主題</x:String>
553553
<x:String x:Key="Text.Preferences.Appearance.ThemeOverrides" xml:space="preserve">自訂主題</x:String>
554+
<x:String x:Key="Text.Preferences.Appearance.UseAutoHideScrollBars" xml:space="preserve">允許滾動條自動隱藏</x:String>
554555
<x:String x:Key="Text.Preferences.Appearance.UseFixedTabWidth" xml:space="preserve">使用固定寬度的分頁標籤</x:String>
555556
<x:String x:Key="Text.Preferences.Appearance.UseNativeWindowFrame" xml:space="preserve">使用系統原生預設視窗樣式</x:String>
556557
<x:String x:Key="Text.Preferences.DiffMerge" xml:space="preserve">對比/合併工具</x:String>

src/Resources/Styles.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<x:Double x:Key="ScrollBarSize">12</x:Double>
1818
</Style.Resources>
1919

20+
<Setter Property="AllowAutoHide" Value="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseAutoHideScrollBars, Mode=OneWay}"/>
2021
<Setter Property="ShowDelay" Value="0:0:0.1"/>
2122
<Setter Property="HideDelay" Value="0:0:0.2"/>
2223
</Style>

src/ViewModels/Preferences.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,12 @@ public bool UseFixedTabWidth
158158
set => SetProperty(ref _useFixedTabWidth, value);
159159
}
160160

161+
public bool UseAutoHideScrollBars
162+
{
163+
get => _useAutoHideScrollBars;
164+
set => SetProperty(ref _useAutoHideScrollBars, value);
165+
}
166+
161167
public bool Check4UpdatesOnStartup
162168
{
163169
get => _check4UpdatesOnStartup;
@@ -706,6 +712,7 @@ private bool RemoveInvalidRepositoriesRecursive(List<RepositoryNode> collection)
706712
private int _maxHistoryCommits = 20000;
707713
private int _subjectGuideLength = 50;
708714
private bool _useFixedTabWidth = true;
715+
private bool _useAutoHideScrollBars = true;
709716
private bool _showAuthorTimeInGraph = false;
710717
private bool _showChildren = false;
711718

src/Views/Preferences.axaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@
169169
<TabItem.Header>
170170
<TextBlock Classes="tab_header" Text="{DynamicResource Text.Preferences.Appearance}"/>
171171
</TabItem.Header>
172-
<Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32,32,Auto" ColumnDefinitions="Auto,*">
172+
<Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32,32,32,Auto" ColumnDefinitions="Auto,*">
173173
<TextBlock Grid.Row="0" Grid.Column="0"
174174
Text="{DynamicResource Text.Preferences.Appearance.Theme}"
175175
HorizontalAlignment="Right"
@@ -276,6 +276,11 @@
276276
IsChecked="{Binding UseFixedTabWidth, Mode=TwoWay}"/>
277277

278278
<CheckBox Grid.Row="8" Grid.Column="1"
279+
Height="32"
280+
Content="{DynamicResource Text.Preferences.Appearance.UseAutoHideScrollBars}"
281+
IsChecked="{Binding UseAutoHideScrollBars, Mode=TwoWay}"/>
282+
283+
<CheckBox Grid.Row="9" Grid.Column="1"
279284
Height="32"
280285
Content="{DynamicResource Text.Preferences.Appearance.UseNativeWindowFrame}"
281286
IsChecked="{Binding UseSystemWindowFrame, Mode=OneTime}"

0 commit comments

Comments
 (0)