Skip to content

Commit c76e0d7

Browse files
committed
change style to MetroWindow.Clean
1 parent d65ba8e commit c76e0d7

File tree

7 files changed

+297
-270
lines changed

7 files changed

+297
-270
lines changed

src/CodeSnip/App.xaml

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,18 @@
66
<Application.Resources>
77
<ResourceDictionary>
88
<ResourceDictionary.MergedDictionaries>
9-
<!-- MahApps.Metro resource dictionaries. Make sure that all file names are Case Sensitive! -->
10-
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
11-
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
12-
<!-- Theme setting -->
13-
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Dark.Sienna.xaml" />
14-
15-
<ResourceDictionary Source="pack://application:,,,/CodeSnip;component/Resources/Icons.xaml" />
16-
<ResourceDictionary Source="pack://application:,,,/CodeSnip;component/Resources/SearchReplace.xaml" />
17-
<ResourceDictionary Source="pack://application:,,,/CodeSnip;component/Resources/Themes/ScrollBarStyles.xaml" />
18-
<ResourceDictionary Source="pack://application:,,,/CodeSnip;component/Resources/Themes/ExpanderStyles.xaml" />
19-
</ResourceDictionary.MergedDictionaries>
20-
</ResourceDictionary>
9+
<!-- MahApps.Metro resource dictionaries. Make sure that all file names are Case Sensitive! -->
10+
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.xaml" />
11+
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Fonts.xaml" />
12+
<!-- Theme setting -->
13+
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Themes/Dark.Sienna.xaml" />
14+
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Clean/Controls.xaml" />
15+
16+
<ResourceDictionary Source="pack://application:,,,/CodeSnip;component/Resources/Icons.xaml" />
17+
<ResourceDictionary Source="pack://application:,,,/CodeSnip;component/Resources/SearchReplace.xaml" />
18+
<ResourceDictionary Source="pack://application:,,,/CodeSnip;component/Resources/Themes/ScrollBarStyles.xaml" />
19+
<ResourceDictionary Source="pack://application:,,,/CodeSnip;component/Resources/Themes/ExpanderStyles.xaml" />
20+
</ResourceDictionary.MergedDictionaries>
21+
</ResourceDictionary>
2122
</Application.Resources>
2223
</Application>

src/CodeSnip/MainViewModel.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public partial class MainViewModel : ObservableObject
7272
private string editorFontFamily = "Consolas";
7373

7474
[ObservableProperty]
75-
private double editorFontSize = 14;
75+
private double editorFontSize = 13;
7676

7777
[ObservableProperty]
7878
private bool isPaneOpen = true;
@@ -132,22 +132,22 @@ public partial class MainViewModel : ObservableObject
132132
private bool _isNotificationEnabled = true;
133133

134134
[ObservableProperty]
135-
private int _languageFontSize = 15;
135+
private int _languageFontSize = 14;
136136

137137
[ObservableProperty]
138138
private string _languageFontWeight = "SemiBold";
139139

140140
[ObservableProperty]
141-
private int _categoryFontSize = 14;
141+
private int _categoryFontSize = 13;
142142

143143
[ObservableProperty]
144144
private string _categoryFontWeight = "Medium";
145145

146146
[ObservableProperty]
147-
private int _snippetFontSize = 14;
147+
private int _snippetFontSize = 13;
148148

149149
[ObservableProperty]
150-
private string _snippetFontWeight = "Normal";
150+
private string _snippetFontWeight = "Light";
151151

152152
public enum SnippetFilterMode
153153
{
@@ -732,7 +732,7 @@ private void DecreaseFontSize()
732732
[RelayCommand]
733733
private void ResetFontSize()
734734
{
735-
EditorFontSize = 14;
735+
EditorFontSize = settingsService.EditorFontSize;
736736
}
737737

738738
[RelayCommand]

0 commit comments

Comments
 (0)