Skip to content

Commit a045daa

Browse files
committed
Corrected styles
1 parent fe23961 commit a045daa

2 files changed

Lines changed: 18 additions & 23 deletions

File tree

ZXBStudio/App.axaml

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -168,55 +168,50 @@
168168
<Setter Property="Margin" Value="0"></Setter>
169169
<Setter Property="CornerRadius" Value="5"></Setter>
170170
<Setter Property="Height" Value="24"></Setter>
171-
<Setter Property="Padding" Value="2"></Setter>
171+
<Setter Property="Padding" Value="5"></Setter>
172172
</Style>
173173
<Style Selector="TextBlock.dialog">
174174
<Setter Property="Foreground" Value="#ffffffff"></Setter>
175-
<Setter Property="Margin" Value="2"></Setter>
175+
<Setter Property="Margin" Value="5"></Setter>
176176
</Style>
177177
<Style Selector="TextBox.dialog">
178-
<Setter Property="Margin" Value="2"></Setter>
178+
<Setter Property="Margin" Value="5"></Setter>
179179
<Setter Property="CornerRadius" Value="5"></Setter>
180-
<Setter Property="Height" Value="24"></Setter>
180+
<Setter Property="Height" Value="32"></Setter>
181181
<Setter Property="MaxWidth" Value="140"></Setter>
182182
</Style>
183183
<Style Selector="Button.dialog">
184-
<Setter Property="Margin" Value="2"></Setter>
184+
<Setter Property="Margin" Value="5"></Setter>
185185
<Setter Property="CornerRadius" Value="5"></Setter>
186186
</Style>
187-
<Style Selector="ToggleButton.dialog">
188-
<Setter Property="Margin" Value="2"></Setter>
189-
<Setter Property="CornerRadius" Value="5"></Setter>
190-
<Setter Property="Height" Value="32"></Setter>
191-
</Style>
192187
<Style Selector="ComboBox.dialog">
193188
<Setter Property="Margin" Value="0"></Setter>
194189
<Setter Property="CornerRadius" Value="5"></Setter>
195-
<Setter Property="Height" Value="24"></Setter>
196-
<Setter Property="Padding" Value="2"></Setter>
190+
<Setter Property="Height" Value="32"></Setter>
191+
<Setter Property="Padding" Value="5"></Setter>
197192
</Style>
198193

199194
<Style Selector="NumericUpDown.dialog">
200195
<Setter Property="Margin" Value="0"></Setter>
201196
<Setter Property="CornerRadius" Value="5"></Setter>
202-
<Setter Property="Padding" Value="5,2,0,0"></Setter>
197+
<Setter Property="Padding" Value="5,7,0,0"></Setter>
203198
<Setter Property="VerticalAlignment" Value="Center"></Setter>
204199
<Setter Property="BorderThickness" Value="0"></Setter>
205200
<Setter Property="HorizontalContentAlignment" Value="Stretch"></Setter>
206201
</Style>
207202
<Style Selector="NumericUpDown.dialog TextBox">
208-
<Setter Property="Margin" Value="0"></Setter>
203+
<Setter Property="Margin" Value="5"></Setter>
209204
<Setter Property="CornerRadius" Value="5"></Setter>
210-
<Setter Property="Height" Value="24"></Setter>
205+
<Setter Property="Height" Value="32"></Setter>
211206
<Setter Property="MaxWidth" Value="140"></Setter>
212-
<Setter Property="HorizontalAlignment" Value="Right"></Setter>
207+
<Setter Property="HorizontalAlignment" Value="Left"></Setter>
213208
</Style>
214-
<Style Selector="Border.numericBorder">
209+
<Style Selector="Border.numericborder">
215210
<Setter Property="BorderBrush" Value="#ff909090" ></Setter>
216-
<Setter Property="BorderThickness" Value="1" ></Setter>
211+
<Setter Property="BorderThickness" Value="2" ></Setter>
217212
<Setter Property="CornerRadius" Value="5" ></Setter>
218213
<Setter Property="Padding" Value="-1" ></Setter>
219-
<Setter Property="Margin" Value="2,0,2,0"></Setter>
214+
<Setter Property="Margin" Value="5,0,5,0"></Setter>
220215
<Setter Property="Height" Value="32"></Setter>
221216
</Style>
222217
</Application.Styles>

ZXBStudio/Dialogs/ZXOptionsDialog.axaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
xmlns:wnd="using:ZXBasicStudio.Classes"
66
mc:Ignorable="d" d:DesignWidth="300" d:DesignHeight="300"
77
MinWidth="330" MaxWidth="330"
8-
MinHeight="420" MaxHeight="420"
8+
MinHeight="450" MaxHeight="450"
99
x:Class="ZXBasicStudio.Dialogs.ZXOptionsDialog"
1010
CanResize="False"
1111
Icon="/Assets/zxbs.ico"
1212
Title="General options" WindowStartupLocation="CenterOwner">
1313
<Grid ColumnDefinitions="*,7*,8*,2*,*" RowDefinitions="*,*,*,*,*,*,*,*,*,1.5*,1.5*,1.5*">
14-
<TextBlock Classes="dialog" Grid.Row="0" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Right">ZXBC path:</TextBlock>
14+
<TextBlock Classes="dialog" Grid.Row="0" Grid.Column="1" VerticalAlignment="Center" >ZXBC path:</TextBlock>
1515
<TextBox Classes="dialog" Grid.Row="0" Grid.Column="2" Name="txtZxbc" IsReadOnly="True"></TextBox>
1616
<Button Classes="dialog" Grid.Row="0" Grid.Column="3" VerticalAlignment="Center" Name="btnSelectZxbc">...</Button>
17-
<TextBlock Classes="dialog" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Right">ZXBASM path:</TextBlock>
17+
<TextBlock Classes="dialog" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" >ZXBASM path:</TextBlock>
1818
<TextBox Classes="dialog" Grid.Row="1" Grid.Column="2" Name="txtZxbasm" IsReadOnly="True"></TextBox>
1919
<Button Classes="dialog" Grid.Row="1" Grid.Column="3" VerticalAlignment="Center" Name="btnSelectZxbasm">...</Button>
2020
<TextBlock Classes="dialog" Grid.Row="2" Grid.Column="1" VerticalAlignment="Center">Editor font size:</TextBlock>
@@ -34,7 +34,7 @@
3434
<TextBlock Classes="dialog" Grid.Row="7" Grid.Column="1" VerticalAlignment="Center">Antialias rendering:</TextBlock>
3535
<CheckBox Classes="dialog" Name="ckAntiAlias" Grid.Column="2" Grid.Row="7"></CheckBox>
3636

37-
<TextBlock Classes="dialog" Grid.Row="8" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Right">Next emulator path:</TextBlock>
37+
<TextBlock Classes="dialog" Grid.Row="8" Grid.Column="1" VerticalAlignment="Center">Next emulator path:</TextBlock>
3838
<TextBox Classes="dialog" Grid.Row="8" Grid.Column="2" Name="txtNextEmulator" IsReadOnly="True"></TextBox>
3939
<Button Classes="dialog" Grid.Row="8" Grid.Column="3" VerticalAlignment="Center" Name="btnSelectNextEmulator">...</Button>
4040

0 commit comments

Comments
 (0)