- Change BlurAmount to Bool

- Adjust Theme List layout
This commit is contained in:
DB p 2024-06-02 22:42:40 +09:00
parent f78521ea16
commit 20b0db3f30
2 changed files with 27 additions and 14 deletions

View file

@ -262,12 +262,12 @@ namespace Flow.Launcher.Core.Resource
)
};
}
else if (line.StartsWith("BlurAmount:", StringComparison.OrdinalIgnoreCase))
else if (line.StartsWith("IsBlur:", StringComparison.OrdinalIgnoreCase))
{
themeData = themeData with
{
BlurAmount = int.Parse(
line.Remove(0, "BlurAmount:".Length).Trim()
IsBlur = bool.Parse(
line.Remove(0, "IsBlur:".Length).Trim()
)
};
}
@ -452,6 +452,6 @@ namespace Flow.Launcher.Core.Resource
}
#endregion
public record ThemeData(string FileNameWithoutExtension, string Name, bool? IsDark = null, int? BlurAmount = null);
public record ThemeData(string FileNameWithoutExtension, string Name, bool? IsDark = null, bool? IsBlur = null);
}
}

View file

@ -467,16 +467,29 @@
Width="Auto"
Height="34"
Margin="0">
<TextBlock
x:Name="ThemeName"
Margin="0"
Padding="14 12"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Focusable="True"
FontSize="12"
Text="{Binding Name}"
TextWrapping="Wrap" />
<StackPanel Margin="12 0" Orientation="Horizontal">
<TextBlock
x:Name="ThemeName"
Margin="0 0 0 0"
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="12"
Text="{Binding Name}"
TextWrapping="Wrap" />
<ui:FontIcon
Margin="8 0 0 0"
VerticalAlignment="Center"
FontSize="12"
Glyph="&#xED66;"
Visibility="{Binding IsDark, Converter={StaticResource BoolToVisibilityConverter}}" />
<ui:FontIcon
Margin="8 0 0 0"
VerticalAlignment="Center"
FontSize="8"
Glyph="&#xEB42;"
Visibility="{Binding IsBlur, Converter={StaticResource BoolToVisibilityConverter}}" />
</StackPanel>
</Grid>
</DataTemplate>
</ListBox.ItemTemplate>