Skip to content

Commit d867875

Browse files
Jack251970Jack251970
committed
Format xaml styles
1 parent 82f23e5 commit d867875

File tree

15 files changed

+196
-201
lines changed

15 files changed

+196
-201
lines changed

‎Flow.Launcher/ActionKeywords.xaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@
5353
</Button>
5454
</Grid>
5555
</StackPanel>
56-
<StackPanel Margin="26,12,26,0">
57-
<StackPanel Grid.Row="0" Margin="0,0,0,12">
56+
<StackPanel Margin="26 12 26 0">
57+
<StackPanel Grid.Row="0" Margin="0 0 0 12">
5858
<TextBlock
5959
Grid.Column="0"
60-
Margin="0,0,0,0"
60+
Margin="0 0 0 0"
6161
FontSize="20"
6262
FontWeight="SemiBold"
6363
Text="{DynamicResource actionKeywordsTitle}"
@@ -71,7 +71,7 @@
7171
TextWrapping="WrapWithOverflow" />
7272
</StackPanel>
7373

74-
<StackPanel Margin="0,18,0,0" Orientation="Horizontal">
74+
<StackPanel Margin="0 18 0 0" Orientation="Horizontal">
7575
<TextBlock
7676
Grid.Row="0"
7777
Grid.Column="1"
@@ -83,14 +83,14 @@
8383
x:Name="tbOldActionKeyword"
8484
Grid.Row="0"
8585
Grid.Column="1"
86-
Margin="14,10,10,10"
86+
Margin="14 10 10 10"
8787
HorizontalAlignment="Left"
8888
VerticalAlignment="Center"
8989
FontSize="14"
9090
FontWeight="SemiBold"
9191
Foreground="{DynamicResource Color05B}" />
9292
</StackPanel>
93-
<StackPanel Margin="0,0,0,10" Orientation="Horizontal">
93+
<StackPanel Margin="0 0 0 10" Orientation="Horizontal">
9494
<TextBlock
9595
Grid.Row="1"
9696
Grid.Column="1"
@@ -101,7 +101,7 @@
101101
<TextBox
102102
x:Name="tbAction"
103103
Width="105"
104-
Margin="10,10,15,10"
104+
Margin="10 10 15 10"
105105
HorizontalAlignment="Left"
106106
VerticalAlignment="Center" />
107107
</StackPanel>
@@ -112,20 +112,20 @@
112112
Grid.Row="1"
113113
Background="{DynamicResource PopupButtonAreaBGColor}"
114114
BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
115-
BorderThickness="0,1,0,0">
115+
BorderThickness="0 1 0 0">
116116
<StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
117117
<Button
118118
x:Name="btnCancel"
119119
Width="145"
120120
Height="30"
121-
Margin="10,0,5,0"
121+
Margin="10 0 5 0"
122122
Click="BtnCancel_OnClick"
123123
Content="{DynamicResource cancel}" />
124124
<Button
125125
x:Name="btnDone"
126126
Width="145"
127127
Height="30"
128-
Margin="5,0,10,0"
128+
Margin="5 0 10 0"
129129
Click="btnDone_OnClick"
130130
Style="{StaticResource AccentButtonStyle}">
131131
<TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />

‎Flow.Launcher/HotkeyControl.xaml

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
mc:Ignorable="d">
88
<Button
99
Width="Auto"
10+
Click="GetNewHotkey"
1011
FontSize="13"
1112
FontWeight="Bold"
12-
Foreground="{DynamicResource Color01B}"
13-
Click="GetNewHotkey">
13+
Foreground="{DynamicResource Color01B}">
1414
<Button.Template>
1515
<ControlTemplate TargetType="Button">
1616
<Border
1717
x:Name="ButtonBorder"
18-
Padding="5,0,5,0"
18+
Padding="5 0 5 0"
1919
Background="{DynamicResource ButtonBackgroundColor}"
2020
BorderBrush="{DynamicResource ButtonInsideBorder}"
2121
BorderThickness="1"
@@ -28,26 +28,21 @@
2828
<Condition Property="IsMouseOver" Value="True" />
2929
<Condition Property="IsPressed" Value="True" />
3030
</MultiTrigger.Conditions>
31-
<Setter TargetName="ButtonBorder" Property="Background"
32-
Value="{DynamicResource ButtonMousePressed}" />
33-
<Setter TargetName="ButtonBorder" Property="BorderBrush"
34-
Value="{DynamicResource ButtonMousePressedInsideBorder}" />
31+
<Setter TargetName="ButtonBorder" Property="Background" Value="{DynamicResource ButtonMousePressed}" />
32+
<Setter TargetName="ButtonBorder" Property="BorderBrush" Value="{DynamicResource ButtonMousePressedInsideBorder}" />
3533
</MultiTrigger>
3634
<MultiTrigger>
3735
<MultiTrigger.Conditions>
3836
<Condition Property="IsMouseOver" Value="True" />
3937
</MultiTrigger.Conditions>
40-
<Setter TargetName="ButtonBorder" Property="Background"
41-
Value="{DynamicResource ButtonMouseOver}" />
38+
<Setter TargetName="ButtonBorder" Property="Background" Value="{DynamicResource ButtonMouseOver}" />
4239
</MultiTrigger>
4340
<MultiTrigger>
4441
<MultiTrigger.Conditions>
4542
<Condition Property="IsPressed" Value="True" />
4643
</MultiTrigger.Conditions>
47-
<Setter TargetName="ButtonBorder" Property="Background"
48-
Value="{DynamicResource ButtonMousePressed}" />
49-
<Setter TargetName="ButtonBorder" Property="BorderBrush"
50-
Value="{DynamicResource CustomContextHover}" />
44+
<Setter TargetName="ButtonBorder" Property="Background" Value="{DynamicResource ButtonMousePressed}" />
45+
<Setter TargetName="ButtonBorder" Property="BorderBrush" Value="{DynamicResource CustomContextHover}" />
5146
</MultiTrigger>
5247
</ControlTemplate.Triggers>
5348
</ControlTemplate>
@@ -62,8 +57,8 @@
6257
<ItemsControl.ItemTemplate>
6358
<DataTemplate>
6459
<Border
65-
Margin="2,5,2,5"
66-
Padding="10,5,10,5"
60+
Margin="2 5 2 5"
61+
Padding="10 5 10 5"
6762
Background="{DynamicResource AccentButtonBackground}"
6863
BorderThickness="1"
6964
CornerRadius="5">

‎Flow.Launcher/HotkeyControlDialog.xaml

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
xmlns:ui="http://schemas.modernwpf.com/2019"
66
Background="{DynamicResource PopuBGColor}"
77
BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
8-
BorderThickness="0,1,0,0"
8+
BorderThickness="0 1 0 0"
99
CornerRadius="8"
1010
DataContext="{Binding RelativeSource={RelativeSource Self}}"
1111
Foreground="{DynamicResource PopupTextColor}"
@@ -24,14 +24,14 @@
2424
</Grid.RowDefinitions>
2525

2626
<!-- Window title and the keys in the hotkey -->
27-
<Grid Grid.Row="0" Margin="26,12,26,0">
27+
<Grid Grid.Row="0" Margin="26 12 26 0">
2828
<Grid.RowDefinitions>
2929
<RowDefinition Height="Auto" />
3030
<RowDefinition Height="*" />
3131
</Grid.RowDefinitions>
3232
<StackPanel>
3333
<TextBlock
34-
Margin="0,0,0,0"
34+
Margin="0 0 0 0"
3535
FontSize="20"
3636
FontWeight="SemiBold"
3737
Text="{Binding WindowTitle}"
@@ -42,8 +42,8 @@
4242
Grid.Row="1"
4343
Width="450"
4444
Height="100"
45-
Margin="0,100,0,0"
46-
Padding="26,12,26,0">
45+
Margin="0 100 0 0"
46+
Padding="26 12 26 0">
4747
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
4848
<ItemsControl ItemsSource="{Binding KeysToDisplay}">
4949
<ItemsControl.ItemsPanel>
@@ -56,12 +56,12 @@
5656
<Border
5757
MinWidth="50"
5858
MinHeight="50"
59-
Margin="5,0,5,0"
59+
Margin="5 0 5 0"
6060
Padding="8"
6161
Background="{DynamicResource AccentButtonBackground}"
6262
CornerRadius="6">
6363
<TextBlock
64-
Margin="5,0,5,0"
64+
Margin="5 0 5 0"
6565
HorizontalAlignment="Center"
6666
VerticalAlignment="Center"
6767
FontSize="18"
@@ -82,9 +82,9 @@
8282
<Border
8383
x:Name="Alert"
8484
Width="420"
85-
Padding="0, 10"
86-
VerticalAlignment="Center"
85+
Padding="0 10"
8786
HorizontalAlignment="Center"
87+
VerticalAlignment="Center"
8888
Background="{DynamicResource InfoBarWarningBG}"
8989
BorderBrush="{DynamicResource InfoBarBD}"
9090
BorderThickness="1"
@@ -97,21 +97,21 @@
9797
</Grid.ColumnDefinitions>
9898
<ui:FontIcon
9999
Grid.Column="0"
100-
Margin="20,0,14,0"
100+
Margin="20 0 14 0"
101101
VerticalAlignment="Center"
102102
FontSize="15"
103103
Foreground="{DynamicResource InfoBarWarningIcon}"
104104
Glyph="&#xf167;" />
105105
<TextBlock
106-
Grid.Column="1"
107106
x:Name="tbMsg"
108-
Margin="0,0,0,2"
109-
Padding="0,0,8,0"
107+
Grid.Column="1"
108+
Margin="0 0 0 2"
109+
Padding="0 0 8 0"
110110
HorizontalAlignment="Left"
111111
FontSize="13"
112112
FontWeight="SemiBold"
113-
TextWrapping="Wrap"
114-
Foreground="{DynamicResource Color05B}" />
113+
Foreground="{DynamicResource Color05B}"
114+
TextWrapping="Wrap" />
115115
</Grid>
116116
</Border>
117117

@@ -122,7 +122,7 @@
122122
Grid.Row="2"
123123
Background="{DynamicResource PopupButtonAreaBGColor}"
124124
BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
125-
BorderThickness="0,1,0,0"
125+
BorderThickness="0 1 0 0"
126126
CornerRadius="0 0 8 8">
127127
<StackPanel
128128
Margin="10"
@@ -132,35 +132,35 @@
132132
x:Name="OverwriteBtn"
133133
Height="30"
134134
MinWidth="100"
135-
Margin="0,0,4,0"
135+
Margin="0 0 4 0"
136136
Click="Overwrite"
137137
Content="{DynamicResource commonOverwrite}"
138-
Visibility="Collapsed"
139-
Style="{StaticResource AccentButtonStyle}" />
138+
Style="{StaticResource AccentButtonStyle}"
139+
Visibility="Collapsed" />
140140
<Button
141141
x:Name="SaveBtn"
142142
Height="30"
143143
MinWidth="100"
144-
Margin="0,0,4,0"
144+
Margin="0 0 4 0"
145145
Click="Save"
146146
Content="{DynamicResource commonSave}"
147147
Style="{StaticResource AccentButtonStyle}" />
148148
<Button
149149
Height="30"
150150
MinWidth="100"
151-
Margin="4,0,4,0"
151+
Margin="4 0 4 0"
152152
Click="Reset"
153153
Content="{DynamicResource commonReset}" />
154154
<Button
155155
Height="30"
156156
MinWidth="100"
157-
Margin="4,0,4,0"
157+
Margin="4 0 4 0"
158158
Click="Delete"
159159
Content="{DynamicResource commonDelete}" />
160160
<Button
161161
Height="30"
162162
MinWidth="100"
163-
Margin="4,0,0,0"
163+
Margin="4 0 0 0"
164164
Click="Cancel"
165165
Content="{DynamicResource commonCancel}" />
166166
</StackPanel>

‎Flow.Launcher/Resources/Controls/HotkeyDisplay.xaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
<Border.Style>
2424
<Style TargetType="{x:Type Border}">
2525
<Setter Property="Background" Value="{DynamicResource Color12B}" />
26-
<Setter Property="Padding" Value="5,0,5,0" />
26+
<Setter Property="Padding" Value="5 0 5 0" />
2727
<Setter Property="BorderThickness" Value="1" />
2828
<Style.Triggers>
2929
<DataTrigger Binding="{Binding Type, RelativeSource={RelativeSource AncestorType=local:HotkeyDisplay}}" Value="Small">
3030
<Setter Property="Background" Value="Transparent" />
31-
<Setter Property="Padding" Value="0,0,0,0" />
31+
<Setter Property="Padding" Value="0 0 0 0" />
3232
<Setter Property="BorderThickness" Value="0" />
3333
</DataTrigger>
3434
</Style.Triggers>
@@ -51,14 +51,14 @@
5151
<Border.Style>
5252
<Style TargetType="{x:Type Border}">
5353
<Setter Property="Background" Value="{DynamicResource SystemControlBackgroundBaseLowBrush}" />
54-
<Setter Property="Padding" Value="10,5,10,5" />
55-
<Setter Property="Margin" Value="2,5,2,5" />
54+
<Setter Property="Padding" Value="10 5 10 5" />
55+
<Setter Property="Margin" Value="2 5 2 5" />
5656
<Setter Property="BorderThickness" Value="1" />
5757
<Style.Triggers>
5858
<DataTrigger Binding="{Binding Type, RelativeSource={RelativeSource AncestorType=local:HotkeyDisplay}}" Value="Small">
5959
<Setter Property="Background" Value="{DynamicResource AccentButtonBackground}" />
60-
<Setter Property="Padding" Value="10,5,10,5" />
61-
<Setter Property="Margin" Value="2,0,2,0" />
60+
<Setter Property="Padding" Value="10 5 10 5" />
61+
<Setter Property="Margin" Value="2 0 2 0" />
6262
</DataTrigger>
6363
</Style.Triggers>
6464
</Style>

‎Flow.Launcher/Resources/Pages/WelcomePage1.xaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
Style="{DynamicResource StyleImageFadeIn}" />
128128
<TextBlock
129129
Canvas.Left="205"
130-
Margin="12,0,0,0"
130+
Margin="12 0 0 0"
131131
VerticalAlignment="Center"
132132
FontSize="30"
133133
Foreground="White"
@@ -151,30 +151,30 @@
151151
Style="{DynamicResource WizardMove}" />
152152

153153

154-
<StackPanel Width="550" Margin="24,20,24,20">
155-
<StackPanel Margin="0,0,24,0">
154+
<StackPanel Width="550" Margin="24 20 24 20">
155+
<StackPanel Margin="0 0 24 0">
156156
<TextBlock
157157
FontSize="20"
158158
FontWeight="SemiBold"
159159
Text="{DynamicResource Welcome_Page1_Title}" />
160160
<TextBlock
161-
Margin="0,10,24,0"
161+
Margin="0 10 24 0"
162162
FontSize="14"
163163
Text="{DynamicResource Welcome_Page1_Text01}"
164164
TextWrapping="WrapWithOverflow" />
165165
<TextBlock
166-
Margin="0,10,24,0"
166+
Margin="0 10 24 0"
167167
FontSize="14"
168168
Text="{DynamicResource Welcome_Page1_Text02}"
169169
TextWrapping="WrapWithOverflow" />
170170
<TextBlock
171-
Margin="0,30,0,0"
171+
Margin="0 30 0 0"
172172
FontSize="14"
173173
FontWeight="SemiBold"
174174
Text="{DynamicResource language}" />
175175
<ComboBox
176176
Width="200"
177-
Margin="0,10,0,0"
177+
Margin="0 10 0 0"
178178
DisplayMemberPath="Display"
179179
ItemsSource="{Binding Languages}"
180180
SelectedValue="{Binding CustomLanguage, Mode=TwoWay}"

0 commit comments

Comments
 (0)