prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #3683 from onesounds/250609-FixLaunguageLayout

Browse source 
Fix issue with multilingual display
This commit is contained in:
DB P 2025-06-09 16:59:54 +09:00 committed by GitHub
commit b0c3b714dc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 26 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Flow.Launcher/HotkeyControlDialog.xaml
View file

@ -125,12 +125,12 @@
BorderThickness="0 1 0 0" BorderThickness="0 1 0 0"
CornerRadius="0 0 8 8"> CornerRadius="0 0 8 8">
<StackPanel <StackPanel
Margin="10" Margin="10 9 10 10"
HorizontalAlignment="Center" HorizontalAlignment="Center"
Orientation="Horizontal"> Orientation="Horizontal">
<Button <Button
x:Name="OverwriteBtn" x:Name="OverwriteBtn"
Height="30" MinHeight="36"
MinWidth="100" MinWidth="100"
Margin="0 0 4 0" Margin="0 0 4 0"
Click="Overwrite" Click="Overwrite"
@ -139,26 +139,26 @@
Visibility="Collapsed" /> Visibility="Collapsed" />
<Button <Button
x:Name="SaveBtn" x:Name="SaveBtn"
Height="30" MinHeight="36"
MinWidth="100" MinWidth="100"
Margin="0 0 4 0" Margin="0 0 4 0"
Click="Save" Click="Save"
Content="{DynamicResource commonSave}" Content="{DynamicResource commonSave}"
Style="{StaticResource AccentButtonStyle}" /> Style="{StaticResource AccentButtonStyle}" />
<Button <Button
Height="30" MinHeight="36"
MinWidth="100" MinWidth="100"
Margin="4 0 4 0" Margin="4 0 4 0"
Click="Reset" Click="Reset"
Content="{DynamicResource commonReset}" /> Content="{DynamicResource commonReset}" />
<Button <Button
Height="30" MinHeight="36"
MinWidth="100" MinWidth="100"
Margin="4 0 4 0" Margin="4 0 4 0"
Click="Delete" Click="Delete"
Content="{DynamicResource commonDelete}" /> Content="{DynamicResource commonDelete}" />
<Button <Button
Height="30" MinHeight="36"
MinWidth="100" MinWidth="100"
Margin="4 0 0 0" Margin="4 0 0 0"
Click="Cancel" Click="Cancel"

6
Flow.Launcher/Resources/Pages/WelcomePage1.xaml
View file

@ -103,7 +103,7 @@
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="250" /> <RowDefinition Height="250" />
<RowDefinition /> <RowDefinition Height="340"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Border Grid.Row="0" HorizontalAlignment="Stretch"> <Border Grid.Row="0" HorizontalAlignment="Stretch">
@ -140,7 +140,7 @@
</Border> </Border>
<Canvas Grid.Row="1" Height="288"> <Canvas Grid.Row="1" Height="338">
<Image <Image
Name="wizard" Name="wizard"
Canvas.Right="30" Canvas.Right="30"
@ -156,7 +156,7 @@
<TextBlock <TextBlock
FontSize="20" FontSize="20"
FontWeight="SemiBold" FontWeight="SemiBold"
Text="{DynamicResource Welcome_Page1_Title}" /> Text="{DynamicResource Welcome_Page1_Title}" TextWrapping="WrapWithOverflow"/>
<TextBlock <TextBlock
Margin="0 10 24 0" Margin="0 10 24 0"
FontSize="14" FontSize="14"

10
Flow.Launcher/Resources/Pages/WelcomePage2.xaml
View file

@ -38,7 +38,7 @@
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="250" /> <RowDefinition Height="250" />
<RowDefinition /> <RowDefinition Height="340"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Border Grid.Row="0" HorizontalAlignment="Stretch"> <Border Grid.Row="0" HorizontalAlignment="Stretch">
@ -89,12 +89,12 @@
</StackPanel> </StackPanel>
</Border> </Border>
<StackPanel Grid.Row="1" Margin="24 20 24 20"> <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Visible">
<StackPanel> <StackPanel Margin="24 20 24 20">
<TextBlock <TextBlock
FontSize="20" FontSize="20"
FontWeight="SemiBold" FontWeight="SemiBold"
Text="{DynamicResource Welcome_Page2_Title}" /> Text="{DynamicResource Welcome_Page2_Title}" TextWrapping="WrapWithOverflow"/>
<TextBlock <TextBlock
Margin="0 10 0 0" Margin="0 10 0 0"
FontSize="14" FontSize="14"
@ -119,7 +119,7 @@
WindowTitle="{DynamicResource flowlauncherHotkey}" /> WindowTitle="{DynamicResource flowlauncherHotkey}" />
</StackPanel> </StackPanel>
</StackPanel> </ScrollViewer>
</Grid> </Grid>
</ScrollViewer> </ScrollViewer>
</ui:Page> </ui:Page>

2
Flow.Launcher/Resources/Pages/WelcomePage4.xaml
View file

@ -93,7 +93,7 @@
<TextBlock <TextBlock
FontSize="20" FontSize="20"
FontWeight="SemiBold" FontWeight="SemiBold"
Text="{DynamicResource Welcome_Page4_Title}" /> Text="{DynamicResource Welcome_Page4_Title}" TextWrapping="WrapWithOverflow"/>
<TextBlock <TextBlock
Margin="0 10 0 10" Margin="0 10 0 10"
FontSize="14" FontSize="14"

10
Flow.Launcher/Resources/Pages/WelcomePage5.xaml
View file

@ -53,7 +53,7 @@
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="250" /> <RowDefinition Height="250" />
<RowDefinition /> <RowDefinition Height="340"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Border Grid.Row="0" HorizontalAlignment="Stretch"> <Border Grid.Row="0" HorizontalAlignment="Stretch">
@ -79,18 +79,18 @@
</StackPanel> </StackPanel>
</Border> </Border>
<StackPanel Grid.Row="1" Margin="24 20 24 20"> <StackPanel Grid.Row="1" Margin="24 20 24 20" >
<StackPanel> <StackPanel>
<TextBlock <TextBlock
FontSize="20" FontSize="20"
FontWeight="SemiBold" FontWeight="SemiBold"
Text="{DynamicResource Welcome_Page5_Title}" /> Text="{DynamicResource Welcome_Page5_Title}" TextWrapping="WrapWithOverflow"/>
<TextBlock <TextBlock
Margin="0 10 0 0" Margin="0 10 0 0"
FontSize="14" FontSize="14"
Text="{DynamicResource Welcome_Page5_Text01}" Text="{DynamicResource Welcome_Page5_Text01}"
TextWrapping="WrapWithOverflow" /> TextWrapping="WrapWithOverflow" />
<StackPanel Margin="0 30 0 0" Orientation="Horizontal"> <StackPanel Margin="0 20 0 0" Orientation="Horizontal">
<CheckBox <CheckBox
Checked="OnAutoStartupChecked" Checked="OnAutoStartupChecked"
Content="{DynamicResource startFlowLauncherOnSystemStartup}" Content="{DynamicResource startFlowLauncherOnSystemStartup}"
@ -109,7 +109,7 @@
<Button <Button
Width="150" Width="150"
Height="40" Height="40"
Margin="0 60 0 0" Margin="0 102 0 0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
Click="BtnCancel_OnClick" Click="BtnCancel_OnClick"
Content="{DynamicResource done}" Content="{DynamicResource done}"

2
Flow.Launcher/SettingPages/ViewModels/SettingsPaneGeneralViewModel.cs
View file

@ -177,6 +177,8 @@ public partial class SettingsPaneGeneralViewModel : BaseModel
DropdownDataGeneric<SearchWindowAligns>.UpdateLabels(SearchWindowAligns); DropdownDataGeneric<SearchWindowAligns>.UpdateLabels(SearchWindowAligns);
DropdownDataGeneric<SearchPrecisionScore>.UpdateLabels(SearchPrecisionScores); DropdownDataGeneric<SearchPrecisionScore>.UpdateLabels(SearchPrecisionScores);
DropdownDataGeneric<LastQueryMode>.UpdateLabels(LastQueryModes); DropdownDataGeneric<LastQueryMode>.UpdateLabels(LastQueryModes);
// Since we are using Binding instead of DynamicResource, we need to manually trigger the update
OnPropertyChanged(nameof(AlwaysPreviewToolTip));
} }
public string Language public string Language

3
Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml
View file

@ -154,7 +154,7 @@
Title="{DynamicResource AlwaysPreview}" Title="{DynamicResource AlwaysPreview}"
Margin="0 14 0 0" Margin="0 14 0 0"
Icon="&#xe8a1;" Icon="&#xe8a1;"
Sub="{DynamicResource AlwaysPreviewToolTip}"> Sub="{Binding AlwaysPreviewToolTip}">
<ui:ToggleSwitch <ui:ToggleSwitch
IsOn="{Binding Settings.AlwaysPreview}" IsOn="{Binding Settings.AlwaysPreview}"
OffContent="{DynamicResource disable}" OffContent="{DynamicResource disable}"
@ -352,7 +352,6 @@
Title="{DynamicResource KoreanImeTitle}" Title="{DynamicResource KoreanImeTitle}"
Margin="0 14 0 0" Margin="0 14 0 0"
Closable="False" Closable="False"
DataContext="{Binding RelativeSource={RelativeSource AncestorType=Border}, Path=DataContext}"
IsIconVisible="True" IsIconVisible="True"
Length="Long" Length="Long"
Message="{DynamicResource KoreanImeGuide}" Message="{DynamicResource KoreanImeGuide}"

6
Flow.Launcher/WelcomeWindow.xaml
View file

@ -10,11 +10,11 @@
Name="FlowWelcomeWindow" Name="FlowWelcomeWindow"
Title="{DynamicResource Welcome_Page1_Title}" Title="{DynamicResource Welcome_Page1_Title}"
Width="550" Width="550"
Height="650" Height="700"
MinWidth="550" MinWidth="550"
MinHeight="650" MinHeight="700"
MaxWidth="550" MaxWidth="550"
MaxHeight="650" MaxHeight="700"
d:DataContext="{d:DesignInstance Type=vm:WelcomeViewModel}" d:DataContext="{d:DesignInstance Type=vm:WelcomeViewModel}"
Activated="OnActivated" Activated="OnActivated"
Background="{DynamicResource Color00B}" Background="{DynamicResource Color00B}"