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

Adjust Pane and Page Colors

Browse source
This commit is contained in:
DB p 2024-04-30 05:49:06 +09:00
parent ae95e07efe
commit 61c14109bc
4 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Flow.Launcher/Resources/CustomControlTemplate.xaml
View file

@ -4763,7 +4763,7 @@
IsPaneOpen="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=IsPaneOpen, Mode=TwoWay}"
IsTabStop="False"
OpenPaneLength="{TemplateBinding OpenPaneLength}"
PaneBackground="{DynamicResource NavigationViewDefaultPaneBackground}">
PaneBackground="Transparent">
<ui:SplitView.Pane>
<Grid

39
Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml
View file

@ -2,11 +2,11 @@
x:Class="Flow.Launcher.SettingPages.Views.SettingsPaneAbout"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:cc="clr-namespace:Flow.Launcher.Resources.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.modernwpf.com/2019"
xmlns:cc="clr-namespace:Flow.Launcher.Resources.Controls"
xmlns:settingsVm="clr-namespace:Flow.Launcher.SettingPages.ViewModels"
xmlns:ui="http://schemas.modernwpf.com/2019"
Title="About"
d:DataContext="{d:DesignInstance Type=settingsVm:SettingsPaneAboutViewModel}"
d:DesignHeight="450"
@ -14,9 +14,8 @@
mc:Ignorable="d">
<ScrollViewer
Margin="0,0,0,0"
Background="{DynamicResource Color01B}"
FontSize="14"
CanContentScroll="True"
FontSize="14"
VirtualizingStackPanel.IsVirtualizing="True"
VirtualizingStackPanel.ScrollUnit="Pixel">
<StackPanel Margin="5,14,25,30" Orientation="Vertical">
@ -28,7 +27,10 @@
TextAlignment="left" />
<cc:Card Title="{Binding Version}" Sub="{DynamicResource version}" Icon="&#xe946;">
<cc:Card
Title="{Binding Version}"
Icon="&#xe946;"
Sub="{DynamicResource version}">
<StackPanel Orientation="Horizontal">
<Button
Margin="0,0,10,0"
@ -56,7 +58,10 @@
</TextBlock>
</cc:Card>
<cc:Card Margin="0,14,0,0" Title="{DynamicResource website}" Icon="&#xeb41;">
<cc:Card
Title="{DynamicResource website}"
Margin="0,14,0,0"
Icon="&#xeb41;">
<StackPanel Orientation="Horizontal">
<TextBlock Margin="0,0,12,0">
<Hyperlink NavigateUri="{Binding Website, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
@ -87,7 +92,10 @@
</StackPanel>
</cc:Card>
<cc:Card Margin="0,14,0,0" Title="{DynamicResource icons}" Icon="&#xE8FE;">
<cc:Card
Title="{DynamicResource icons}"
Margin="0,14,0,0"
Icon="&#xE8FE;">
<TextBlock>
<Hyperlink NavigateUri="https://icons8.com/" RequestNavigate="OnRequestNavigate">
<Run Text="icons8.com" />
@ -101,28 +109,25 @@
Margin="0,0,12,0"
Command="{Binding AskClearLogFolderConfirmationCommand}"
Content="{Binding LogFolderSize, Mode=OneWay}" />
<Button Content="&#xec7a;" FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20">
<Button
Content="&#xec7a;"
FontFamily="/Resources/#Segoe Fluent Icons"
FontSize="20">
<ui:FlyoutService.Flyout>
<ui:MenuFlyout>
<MenuItem
Command="{Binding OpenWelcomeWindowCommand}"
Header="{DynamicResource welcomewindow}">
<MenuItem Command="{Binding OpenWelcomeWindowCommand}" Header="{DynamicResource welcomewindow}">
<MenuItem.Icon>
<ui:FontIcon Glyph="&#xe939;" />
</MenuItem.Icon>
</MenuItem>
<MenuItem
Command="{Binding OpenSettingsFolderCommand}"
Header="{DynamicResource settingfolder}">
<MenuItem Command="{Binding OpenSettingsFolderCommand}" Header="{DynamicResource settingfolder}">
<MenuItem.Icon>
<ui:FontIcon Glyph="&#xe8b7;" />
</MenuItem.Icon>
</MenuItem>
<MenuItem
Command="{Binding OpenLogsFolderCommand}"
Header="{DynamicResource logfolder}">
<MenuItem Command="{Binding OpenLogsFolderCommand}" Header="{DynamicResource logfolder}">
<MenuItem.Icon>
<ui:FontIcon Glyph="&#xe8b7;" />
</MenuItem.Icon>

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

@ -5,9 +5,9 @@
xmlns:cc="clr-namespace:Flow.Launcher.Resources.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:settingsViewModels="clr-namespace:Flow.Launcher.SettingPages.ViewModels"
xmlns:ui="http://schemas.modernwpf.com/2019"
xmlns:userSettings="clr-namespace:Flow.Launcher.Infrastructure.UserSettings;assembly=Flow.Launcher.Infrastructure"
xmlns:settingsViewModels="clr-namespace:Flow.Launcher.SettingPages.ViewModels"
Title="General"
d:DataContext="{d:DesignInstance settingsViewModels:SettingsPaneGeneralViewModel}"
d:DesignHeight="450"
@ -15,7 +15,6 @@
mc:Ignorable="d">
<ScrollViewer
Margin="0,0,0,0"
Background="{DynamicResource Color01B}"
CanContentScroll="False"
FontSize="14"
VirtualizingPanel.ScrollUnit="Pixel"

1
Flow.Launcher/SettingWindow.xaml
View file

@ -179,6 +179,7 @@
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
AlwaysShowHeader="False"
Background="{DynamicResource Color01B}"
ExpandedModeThresholdWidth="300"
IsBackButtonVisible="Collapsed"
IsPaneToggleButtonVisible="False"