Skip to content

Commit d0955d0

Browse files
committed
moved Font Selection to Settings ContextMenu;
InfoWindow: made Button more appealing;
1 parent e5d66f0 commit d0955d0

File tree

2 files changed

+20
-15
lines changed

2 files changed

+20
-15
lines changed

QuickNoteWidget/InfoWindow.xaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</Window.Resources>
2525
<Border BorderBrush="Black"
2626
BorderThickness="1">
27-
<Grid x:Name="mainGrid">
27+
<Grid x:Name="mainGrid">
2828
<TextBlock Text="Github:"
2929
TextDecorations="Underline"
3030
Margin="10,16,0,0" />
@@ -53,12 +53,13 @@
5353
Margin="25,152,0,0" />
5454
<TextBlock Text="Microsoft.WindowsAPICCodePack"
5555
Margin="25,173,0,0" />
56-
<Button VerticalAlignment="Bottom"
56+
<Button VerticalAlignment="Top"
5757
Content="Close"
58-
Style="{DynamicResource MahApps.Styles.Button.Square.Accent}"
59-
Margin="10,0,10,10"
58+
Style="{DynamicResource MahApps.Styles.Button.MetroSquare.Accent}"
59+
Margin="10,203,0,0"
6060
x:Name="btnClose"
61-
Click="btnClose_Click" />
61+
Click="btnClose_Click"
62+
Width="314" />
6263
</Grid>
6364
</Border>
6465
</Window>

QuickNoteWidget/MainWindow.xaml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
<Grid.RowDefinitions>
5050
<RowDefinition Height="40" />
5151
<RowDefinition Height="40" />
52+
<RowDefinition Height="40" />
5253
</Grid.RowDefinitions>
5354
<Grid.ColumnDefinitions>
5455
<ColumnDefinition Width="13*" />
@@ -76,6 +77,18 @@
7677
Margin="5,0,5,0"
7778
Grid.Column="1"
7879
Grid.Row="1" />
80+
<TextBlock Text="Font: "
81+
Grid.Row="2"
82+
VerticalAlignment="Center" />
83+
<ComboBox Width="140"
84+
mahapps:TextBoxHelper.Watermark="Fonts"
85+
Grid.Row="2"
86+
Grid.Column="1"
87+
VerticalAlignment="Center"
88+
Margin="5,0,5,0"
89+
Height="23"
90+
ItemsSource="{Binding Fonts, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
91+
SelectedItem="{Binding Settings.CurrentFont, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
7992
</Grid>
8093
<CheckBox Content="On Top"
8194
IsChecked="{Binding Settings.OnTop}" />
@@ -127,16 +140,6 @@
127140
</StatusBarItem>
128141
<Separator Margin="10,0,10,0"
129142
HorizontalAlignment="Left" />
130-
<StatusBarItem VerticalAlignment="Center">
131-
<StackPanel Orientation="Horizontal">
132-
<TextBlock Text="Current Font: "
133-
VerticalAlignment="Center" />
134-
<ComboBox Width="140" VerticalAlignment="Center" Height="23"
135-
ItemsSource="{Binding Fonts, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
136-
SelectedItem="{Binding Settings.CurrentFont, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
137-
</StackPanel>
138-
</StatusBarItem>
139-
140143
</StatusBar>
141144
<avalonedit:TextEditor x:Name="tbxMultiLine"
142145
DockPanel.Dock="Top"
@@ -150,6 +153,7 @@
150153
Foreground="{Binding MultiLineTextForegroundColor, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
151154
ShowLineNumbers="True"
152155
WordWrap="True"
156+
FontSize="15"
153157
FontFamily="{Binding Settings.CurrentFont, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
154158
PreviewMouseWheel="tbxMultiLine_PreviewMouseWheel" />
155159
</DockPanel>

0 commit comments

Comments
 (0)