Skip to content

Commit 1df4c73

Browse files
jjw24jjw24
committed
Merge pull request #3779 from onesounds/FixXamlError
Fix Card Control
1 parent 679dc3b commit 1df4c73

File tree

6 files changed

+63
-22
lines changed

6 files changed

+63
-22
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,21 @@
3838
<Setter Property="Background" Value="Transparent" />
3939
</DataTrigger>
4040

41-
<DataTrigger Binding="{Binding (local:CardGroup.Position), RelativeSource={RelativeSource AncestorType=local:Card}}" Value="First">
41+
<DataTrigger Binding="{Binding Type, RelativeSource={RelativeSource AncestorType=local:Card}}" Value="First">
4242
<Setter Property="Margin" Value="0" />
4343
<Setter Property="CornerRadius" Value="0" />
4444
<Setter Property="Background" Value="Transparent" />
4545
<Setter Property="BorderThickness" Value="0" />
4646
</DataTrigger>
4747

48-
<DataTrigger Binding="{Binding (local:CardGroup.Position), RelativeSource={RelativeSource AncestorType=local:Card}}" Value="Middle">
48+
<DataTrigger Binding="{Binding Type, RelativeSource={RelativeSource AncestorType=local:Card}}" Value="Middle">
4949
<Setter Property="Margin" Value="0" />
5050
<Setter Property="CornerRadius" Value="0" />
5151
<Setter Property="Background" Value="Transparent" />
5252
<Setter Property="BorderThickness" Value="0 1 0 0" />
5353
</DataTrigger>
5454

55-
<DataTrigger Binding="{Binding (local:CardGroup.Position), RelativeSource={RelativeSource AncestorType=local:Card}}" Value="Last">
55+
<DataTrigger Binding="{Binding Type, RelativeSource={RelativeSource AncestorType=local:Card}}" Value="Last">
5656
<Setter Property="Margin" Value="0" />
5757
<Setter Property="CornerRadius" Value="0" />
5858
<Setter Property="Background" Value="Transparent" />

‎Flow.Launcher/Resources/Controls/Card.xaml.cs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ public enum CardType
99
{
1010
Default,
1111
Inside,
12-
InsideFit
12+
InsideFit,
13+
First,
14+
Middle,
15+
Last
1316
}
1417

1518
public Card()

‎Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml‎

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<ui:Page
1+
<ui:Page
22
x:Class="Flow.Launcher.SettingPages.Views.SettingsPaneGeneral"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -77,8 +77,23 @@
7777
OnContent="{DynamicResource enable}" />
7878
</cc:Card>
7979

80-
<cc:CardGroup Margin="0 14 0 0">
81-
<cc:Card Title="{DynamicResource SearchWindowPosition}" Icon="&#xe7f4;">
80+
81+
<cc:Card
82+
Title="{DynamicResource showAtTopmost}"
83+
Margin="0 14 0 0"
84+
Icon="&#xf5ed;"
85+
Sub="{DynamicResource showAtTopmostToolTip}">
86+
<ui:ToggleSwitch
87+
IsOn="{Binding Settings.ShowAtTopmost}"
88+
OffContent="{DynamicResource disable}"
89+
OnContent="{DynamicResource enable}" />
90+
</cc:Card>
91+
92+
<cc:CardGroup Margin="0 4 0 0">
93+
<cc:Card
94+
Title="{DynamicResource SearchWindowPosition}"
95+
Icon="&#xe7f4;"
96+
Type="First">
8297
<StackPanel Orientation="Horizontal">
8398
<ComboBox
8499
MinWidth="220"
@@ -103,6 +118,7 @@
103118
<cc:Card
104119
Title="{DynamicResource SearchWindowAlign}"
105120
Icon="&#xe7f4;"
121+
Type="Last"
106122
Visibility="{ext:CollapsedWhen {Binding Settings.SearchWindowScreen},
107123
IsEqualTo={x:Static userSettings:SearchWindowScreens.RememberLastLaunchLocation}}">
108124
<StackPanel Orientation="Horizontal">
@@ -183,7 +199,10 @@
183199
</cc:Card>
184200

185201
<cc:CardGroup Margin="0 14 0 0">
186-
<cc:Card Title="{DynamicResource querySearchPrecision}" Sub="{DynamicResource querySearchPrecisionToolTip}">
202+
<cc:Card
203+
Title="{DynamicResource querySearchPrecision}"
204+
Sub="{DynamicResource querySearchPrecisionToolTip}"
205+
Type="First">
187206
<ComboBox
188207
MaxWidth="200"
189208
DisplayMemberPath="Display"
@@ -192,7 +211,10 @@
192211
SelectedValuePath="Value" />
193212
</cc:Card>
194213

195-
<cc:Card Title="{DynamicResource lastQueryMode}" Sub="{DynamicResource lastQueryModeToolTip}">
214+
<cc:Card
215+
Title="{DynamicResource lastQueryMode}"
216+
Sub="{DynamicResource lastQueryModeToolTip}"
217+
Type="Last">
196218
<ComboBox
197219
MinWidth="210"
198220
DisplayMemberPath="Display"
@@ -362,7 +384,8 @@
362384
<cc:Card
363385
Title="{DynamicResource KoreanImeRegistry}"
364386
Icon="&#xe88b;"
365-
Sub="{DynamicResource KoreanImeRegistryTooltip}">
387+
Sub="{DynamicResource KoreanImeRegistryTooltip}"
388+
Type="First">
366389
<ui:ToggleSwitch
367390
IsOn="{Binding LegacyKoreanIMEEnabled}"
368391
OffContent="{DynamicResource disable}"
@@ -371,7 +394,8 @@
371394
<cc:Card
372395
Title="{DynamicResource KoreanImeOpenLink}"
373396
Icon="&#xF210;"
374-
Sub="{DynamicResource KoreanImeOpenLinkToolTip}">
397+
Sub="{DynamicResource KoreanImeOpenLinkToolTip}"
398+
Type="Last">
375399
<Button Command="{Binding OpenImeSettingsCommand}" Content="{DynamicResource KoreanImeOpenLinkButton}" />
376400
</cc:Card>
377401
</cc:CardGroup>

‎Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,21 @@
5151
</cc:Card>
5252

5353
<cc:CardGroup Margin="0 12 0 0">
54-
<cc:Card Title="{DynamicResource openResultModifiers}" Sub="{DynamicResource openResultModifiersToolTip}">
54+
<cc:Card
55+
Title="{DynamicResource openResultModifiers}"
56+
Sub="{DynamicResource openResultModifiersToolTip}"
57+
Type="First">
5558
<ComboBox
5659
Width="120"
5760
FontSize="14"
5861
ItemsSource="{Binding OpenResultModifiersList}"
5962
SelectedValue="{Binding Settings.OpenResultModifiers}" />
6063
</cc:Card>
6164

62-
<cc:Card Title="{DynamicResource showOpenResultHotkey}" Sub="{DynamicResource showOpenResultHotkeyToolTip}">
65+
<cc:Card
66+
Title="{DynamicResource showOpenResultHotkey}"
67+
Sub="{DynamicResource showOpenResultHotkeyToolTip}"
68+
Type="Last">
6369
<ui:ToggleSwitch
6470
IsOn="{Binding Settings.ShowOpenResultHotkey}"
6571
OffContent="{DynamicResource disable}"

‎Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,35 +32,35 @@
3232
TextAlignment="left" />
3333

3434
<cc:CardGroup>
35-
<cc:Card Title="{DynamicResource enableProxy}">
35+
<cc:Card Title="{DynamicResource enableProxy}" Type="First">
3636
<ui:ToggleSwitch
3737
IsOn="{Binding Settings.Proxy.Enabled}"
3838
OffContent="{DynamicResource disable}"
3939
OnContent="{DynamicResource enable}" />
4040
</cc:Card>
4141

42-
<cc:Card Title="{DynamicResource server}">
42+
<cc:Card Title="{DynamicResource server}" Type="Middle">
4343
<TextBox
4444
Width="300"
4545
IsEnabled="{Binding Settings.Proxy.Enabled}"
4646
Text="{Binding Settings.Proxy.Server}" />
4747
</cc:Card>
4848

49-
<cc:Card Title="{DynamicResource port}">
49+
<cc:Card Title="{DynamicResource port}" Type="Middle">
5050
<TextBox
5151
Width="100"
5252
IsEnabled="{Binding Settings.Proxy.Enabled}"
5353
Text="{Binding Settings.Proxy.Port, TargetNullValue={x:Static sys:String.Empty}}" />
5454
</cc:Card>
5555

56-
<cc:Card Title="{DynamicResource userName}">
56+
<cc:Card Title="{DynamicResource userName}" Type="Middle">
5757
<TextBox
5858
Width="200"
5959
IsEnabled="{Binding Settings.Proxy.Enabled}"
6060
Text="{Binding Settings.Proxy.UserName}" />
6161
</cc:Card>
6262

63-
<cc:Card Title="{DynamicResource password}">
63+
<cc:Card Title="{DynamicResource password}" Type="Last">
6464
<TextBox
6565
Width="200"
6666
IsEnabled="{Binding Settings.Proxy.Enabled}"

‎Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,8 @@
489489
Title="{DynamicResource BackdropType}"
490490
Margin="0 0 0 0"
491491
Icon="&#xeb42;"
492-
Sub="{Binding BackdropSubText}">
492+
Sub="{Binding BackdropSubText}"
493+
Type="First">
493494
<ComboBox
494495
MinWidth="160"
495496
VerticalAlignment="Center"
@@ -505,7 +506,8 @@
505506
<cc:Card
506507
Title="{DynamicResource queryWindowShadowEffect}"
507508
Margin="0 0 0 0"
508-
Icon="&#xeb91;">
509+
Icon="&#xeb91;"
510+
Type="Last">
509511
<ui:ToggleSwitch
510512
IsEnabled="{Binding IsDropShadowEnabled}"
511513
IsOn="{Binding DropShadowEffect}"
@@ -546,7 +548,10 @@
546548

547549
<!-- Time and date -->
548550
<cc:CardGroup Margin="0 14 0 0">
549-
<cc:Card Title="{DynamicResource Clock}" Icon="&#xec92;">
551+
<cc:Card
552+
Title="{DynamicResource Clock}"
553+
Icon="&#xec92;"
554+
Type="First">
550555
<StackPanel Orientation="Horizontal">
551556
<TextBlock
552557
VerticalAlignment="Center"
@@ -567,7 +572,10 @@
567572
</StackPanel>
568573
</cc:Card>
569574

570-
<cc:Card Title="{DynamicResource Date}" Icon="&#xe787;">
575+
<cc:Card
576+
Title="{DynamicResource Date}"
577+
Icon="&#xe787;"
578+
Type="Last">
571579
<StackPanel Orientation="Horizontal">
572580
<TextBlock
573581
VerticalAlignment="Center"

0 commit comments

Comments
 (0)