Skip to content

Fix Card Control in CardGroup #3779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 27, 2025
Merged

Fix Card Control in CardGroup #3779

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c9de2f0
Fix Card Error
onesounds Jun 27, 2025
059dcdf
Fix Card Error
onesounds Jun 27, 2025
c83921f
Add Proxy Card type
onesounds Jun 27, 2025
bafb5d7
Removed RenameFileHotkey
Jack251970 Jun 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Flow.Launcher/Resources/Controls/Card.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,21 +38,21 @@
<Setter Property="Background" Value="Transparent" />
</DataTrigger>

<DataTrigger Binding="{Binding (local:CardGroup.Position), RelativeSource={RelativeSource AncestorType=local:Card}}" Value="First">
<DataTrigger Binding="{Binding Type, RelativeSource={RelativeSource AncestorType=local:Card}}" Value="First">
<Setter Property="Margin" Value="0" />
<Setter Property="CornerRadius" Value="0" />
<Setter Property="Background" Value="Transparent" />
<Setter Property="BorderThickness" Value="0" />
</DataTrigger>

<DataTrigger Binding="{Binding (local:CardGroup.Position), RelativeSource={RelativeSource AncestorType=local:Card}}" Value="Middle">
<DataTrigger Binding="{Binding Type, RelativeSource={RelativeSource AncestorType=local:Card}}" Value="Middle">
<Setter Property="Margin" Value="0" />
<Setter Property="CornerRadius" Value="0" />
<Setter Property="Background" Value="Transparent" />
<Setter Property="BorderThickness" Value="0 1 0 0" />
</DataTrigger>

<DataTrigger Binding="{Binding (local:CardGroup.Position), RelativeSource={RelativeSource AncestorType=local:Card}}" Value="Last">
<DataTrigger Binding="{Binding Type, RelativeSource={RelativeSource AncestorType=local:Card}}" Value="Last">
<Setter Property="Margin" Value="0" />
<Setter Property="CornerRadius" Value="0" />
<Setter Property="Background" Value="Transparent" />
Expand Down
5 changes: 4 additions & 1 deletion Flow.Launcher/Resources/Controls/Card.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ public enum CardType
{
Default,
Inside,
InsideFit
InsideFit,
First,
Middle,
Last
}

public Card()
Expand Down
22 changes: 17 additions & 5 deletions Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,10 @@
</cc:Card>

<cc:CardGroup Margin="0 4 0 0">
<cc:Card Title="{DynamicResource SearchWindowPosition}" Icon="&#xe7f4;">
<cc:Card
Title="{DynamicResource SearchWindowPosition}"
Icon="&#xe7f4;"
Type="First">
<StackPanel Orientation="Horizontal">
<ComboBox
MinWidth="220"
Expand All @@ -116,6 +119,7 @@
<cc:Card
Title="{DynamicResource SearchWindowAlign}"
Icon="&#xe7f4;"
Type="Last"
Visibility="{ext:CollapsedWhen {Binding Settings.SearchWindowScreen},
IsEqualTo={x:Static userSettings:SearchWindowScreens.RememberLastLaunchLocation}}">
<StackPanel Orientation="Horizontal">
Expand Down Expand Up @@ -196,7 +200,10 @@
</cc:Card>

<cc:CardGroup Margin="0 14 0 0">
<cc:Card Title="{DynamicResource querySearchPrecision}" Sub="{DynamicResource querySearchPrecisionToolTip}">
<cc:Card
Title="{DynamicResource querySearchPrecision}"
Sub="{DynamicResource querySearchPrecisionToolTip}"
Type="First">
<ComboBox
MaxWidth="200"
DisplayMemberPath="Display"
Expand All @@ -205,7 +212,10 @@
SelectedValuePath="Value" />
</cc:Card>

<cc:Card Title="{DynamicResource lastQueryMode}" Sub="{DynamicResource lastQueryModeToolTip}">
<cc:Card
Title="{DynamicResource lastQueryMode}"
Sub="{DynamicResource lastQueryModeToolTip}"
Type="Last">
<ComboBox
MinWidth="210"
DisplayMemberPath="Display"
Expand Down Expand Up @@ -375,7 +385,8 @@
<cc:Card
Title="{DynamicResource KoreanImeRegistry}"
Icon="&#xe88b;"
Sub="{DynamicResource KoreanImeRegistryTooltip}">
Sub="{DynamicResource KoreanImeRegistryTooltip}"
Type="First">
<ui:ToggleSwitch
IsOn="{Binding LegacyKoreanIMEEnabled}"
OffContent="{DynamicResource disable}"
Expand All @@ -384,7 +395,8 @@
<cc:Card
Title="{DynamicResource KoreanImeOpenLink}"
Icon="&#xF210;"
Sub="{DynamicResource KoreanImeOpenLinkToolTip}">
Sub="{DynamicResource KoreanImeOpenLinkToolTip}"
Type="Last">
<Button Command="{Binding OpenImeSettingsCommand}" Content="{DynamicResource KoreanImeOpenLinkButton}" />
</cc:Card>
</cc:CardGroup>
Expand Down
19 changes: 17 additions & 2 deletions Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,21 @@
</cc:Card>

<cc:CardGroup Margin="0 12 0 0">
<cc:Card Title="{DynamicResource openResultModifiers}" Sub="{DynamicResource openResultModifiersToolTip}">
<cc:Card
Title="{DynamicResource openResultModifiers}"
Sub="{DynamicResource openResultModifiersToolTip}"
Type="First">
<ComboBox
Width="120"
FontSize="14"
ItemsSource="{Binding OpenResultModifiersList}"
SelectedValue="{Binding Settings.OpenResultModifiers}" />
</cc:Card>

<cc:Card Title="{DynamicResource showOpenResultHotkey}" Sub="{DynamicResource showOpenResultHotkeyToolTip}">
<cc:Card
Title="{DynamicResource showOpenResultHotkey}"
Sub="{DynamicResource showOpenResultHotkeyToolTip}"
Type="Last">
<ui:ToggleSwitch
IsOn="{Binding Settings.ShowOpenResultHotkey}"
OffContent="{DynamicResource disable}"
Expand Down Expand Up @@ -204,6 +210,15 @@
<cc:HotkeyDisplay Margin="4 0 0 0" Keys="Ctrl+Minus" />
</StackPanel>
</cc:Card>
<cc:Card
Title="{DynamicResource RenameFileHotkey}"
Icon="&#xe70f;"
Type="Inside">
<flowlauncher:HotkeyControl
DefaultHotkey="F2"
Type="RenameFileHotkey"
ValidateKeyGesture="True" />
</cc:Card>
</StackPanel>
</cc:ExCard>

Expand Down
10 changes: 5 additions & 5 deletions Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,35 +32,35 @@
TextAlignment="left" />

<cc:CardGroup>
<cc:Card Title="{DynamicResource enableProxy}">
<cc:Card Title="{DynamicResource enableProxy}" Type="First">
<ui:ToggleSwitch
IsOn="{Binding Settings.Proxy.Enabled}"
OffContent="{DynamicResource disable}"
OnContent="{DynamicResource enable}" />
</cc:Card>

<cc:Card Title="{DynamicResource server}">
<cc:Card Title="{DynamicResource server}" Type="Middle">
<TextBox
Width="300"
IsEnabled="{Binding Settings.Proxy.Enabled}"
Text="{Binding Settings.Proxy.Server}" />
</cc:Card>

<cc:Card Title="{DynamicResource port}">
<cc:Card Title="{DynamicResource port}" Type="Middle">
<TextBox
Width="100"
IsEnabled="{Binding Settings.Proxy.Enabled}"
Text="{Binding Settings.Proxy.Port, TargetNullValue={x:Static sys:String.Empty}}" />
</cc:Card>

<cc:Card Title="{DynamicResource userName}">
<cc:Card Title="{DynamicResource userName}" Type="Middle">
<TextBox
Width="200"
IsEnabled="{Binding Settings.Proxy.Enabled}"
Text="{Binding Settings.Proxy.UserName}" />
</cc:Card>

<cc:Card Title="{DynamicResource password}">
<cc:Card Title="{DynamicResource password}" Type="Middle">
<TextBox
Width="200"
IsEnabled="{Binding Settings.Proxy.Enabled}"
Expand Down
16 changes: 12 additions & 4 deletions Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@
IsHitTestVisible="False"
Style="{DynamicResource ClockPanel}"
Visibility="Visible">
<!-- Because these two textblock follow SettingWindowFont, we need to revert their font family explictly -->

Check warning on line 340 in Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml

View workflow job for this annotation

GitHub Actions / Check Spelling 

`explictly` is not a recognized word. (unrecognized-spelling)

Check warning on line 340 in Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml

View workflow job for this annotation

GitHub Actions / Check Spelling 

`textblock` is not a recognized word. (unrecognized-spelling)
<TextBlock
x:Name="ClockBox"
FontFamily="{Binding ClockPanelFont, Mode=OneTime}"
Expand Down Expand Up @@ -489,7 +489,8 @@
Title="{DynamicResource BackdropType}"
Margin="0 0 0 0"
Icon="&#xeb42;"
Sub="{Binding BackdropSubText}">
Sub="{Binding BackdropSubText}"
Type="First">
<ComboBox
MinWidth="160"
VerticalAlignment="Center"
Expand All @@ -505,7 +506,8 @@
<cc:Card
Title="{DynamicResource queryWindowShadowEffect}"
Margin="0 0 0 0"
Icon="&#xeb91;">
Icon="&#xeb91;"
Type="Last">
<ui:ToggleSwitch
IsEnabled="{Binding IsDropShadowEnabled}"
IsOn="{Binding DropShadowEffect}"
Expand Down Expand Up @@ -546,7 +548,10 @@

<!-- Time and date -->
<cc:CardGroup Margin="0 14 0 0">
<cc:Card Title="{DynamicResource Clock}" Icon="&#xec92;">
<cc:Card
Title="{DynamicResource Clock}"
Icon="&#xec92;"
Type="First">
<StackPanel Orientation="Horizontal">
<TextBlock
VerticalAlignment="Center"
Expand All @@ -567,7 +572,10 @@
</StackPanel>
</cc:Card>

<cc:Card Title="{DynamicResource Date}" Icon="&#xe787;">
<cc:Card
Title="{DynamicResource Date}"
Icon="&#xe787;"
Type="Last">
<StackPanel Orientation="Horizontal">
<TextBlock
VerticalAlignment="Center"
Expand Down Expand Up @@ -684,7 +692,7 @@
</cc:Card>
</cc:ExCard>
<Border
Name="WMPWarning"

Check warning on line 695 in Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml

View workflow job for this annotation

GitHub Actions / Check Spelling 

`WMP` is not a recognized word. (unrecognized-spelling)
Padding="0 10"
HorizontalAlignment="Stretch"
VerticalAlignment="Center"
Expand All @@ -692,7 +700,7 @@
BorderBrush="{DynamicResource Color03B}"
BorderThickness="0 1 0 0"
CornerRadius="5 5 5 5"
Visibility="{Binding ShowWMPWarning, Converter={StaticResource BoolToVisibilityConverter}}">

Check warning on line 703 in Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml

View workflow job for this annotation

GitHub Actions / Check Spelling 

`WMP` is not a recognized word. (unrecognized-spelling)

Check warning on line 703 in Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml

View workflow job for this annotation

GitHub Actions / Check Spelling 

`WMP` is not a recognized word. (unrecognized-spelling)
<Grid VerticalAlignment="Center">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="58" />
Expand Down
Loading