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 Disabled ContextMenu Color

Browse source 
Adjust Alignment in About Panel
This commit is contained in:
DB p 2021-11-25 16:26:04 +09:00
parent c2887e285a
commit ffa7e92b56
4 changed files with 77 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2591,13 +2591,13 @@
<RepeatButton <RepeatButton
x:Name="PopupUpSpinButton" x:Name="PopupUpSpinButton"
Content="{StaticResource ChevronUp}" Content="{StaticResource ChevronUp}"
Style="{StaticResource NumberBoxPopupSpinButtonStyle}" /> Style="{DynamicResource NumberBoxPopupSpinButtonStyle}" />
<RepeatButton <RepeatButton
x:Name="PopupDownSpinButton" x:Name="PopupDownSpinButton"
Grid.Row="1" Grid.Row="1"
Content="{StaticResource ChevronDown}" Content="{StaticResource ChevronDown}"
Style="{StaticResource NumberBoxPopupSpinButtonStyle}" /> Style="{DynamicResource NumberBoxPopupSpinButtonStyle}" />
</Grid> </Grid>
</Border> </Border>
</ui:ThemeShadowChrome> </ui:ThemeShadowChrome>
@ -2692,4 +2692,68 @@
</Setter> </Setter>
</Style> </Style>
<!--#endregion--> <!--#endregion-->
<Thickness x:Key="MenuFlyoutScrollerMargin">0,4,0,4</Thickness>
<Style x:Key="ContextMenuStyleBase" TargetType="ContextMenu">
<Setter Property="Background" Value="{DynamicResource MenuFlyoutPresenterBackground}" />
<Setter Property="BorderBrush" Value="{DynamicResource MenuFlyoutPresenterBorderBrush}" />
<Setter Property="BorderThickness" Value="{DynamicResource MenuFlyoutPresenterBorderThemeThickness}" />
<Setter Property="Padding" Value="{DynamicResource MenuFlyoutPresenterThemePadding}" />
<Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
<Setter Property="FontStyle" Value="Normal" />
<Setter Property="FontWeight" Value="Normal" />
<Setter Property="Grid.IsSharedSizeScope" Value="true" />
<Setter Property="HasDropShadow" Value="{DynamicResource {x:Static SystemParameters.DropShadowKey}}" />
<!--<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />-->
<!--<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />-->
<!--<Setter Property="ScrollViewer.PanningMode" Value="VerticalOnly" />-->
<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
<Setter Property="MaxWidth" Value="{DynamicResource FlyoutThemeMaxWidth}" />
<Setter Property="MinHeight" Value="{DynamicResource MenuFlyoutThemeMinHeight}" />
<Setter Property="ui:ControlHelper.CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="ContextMenu">
<ui:ThemeShadowChrome
x:Name="Shdw"
IsShadowEnabled="{TemplateBinding HasDropShadow}"
CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}"
SnapsToDevicePixels="True">
<Border
Background="{TemplateBinding Background}"
CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}">
<Grid>
<ScrollViewer
x:Name="ContextMenuScrollViewer"
Style="{DynamicResource {ComponentResourceKey ResourceId=MenuScrollViewer,
TypeInTargetAssembly={x:Type FrameworkElement}}}"
Margin="{TemplateBinding Padding}"
MinWidth="{DynamicResource FlyoutThemeMinWidth}">
<ItemsPresenter
RenderOptions.ClearTypeHint="Enabled"
Margin="{StaticResource MenuFlyoutScrollerMargin}"
KeyboardNavigation.DirectionalNavigation="Cycle"
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
</ScrollViewer>
<Border
x:Name="ContextMenuBorder"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}" />
</Grid>
</Border>
</ui:ThemeShadowChrome>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="DefaultContextMenuStyle" TargetType="ContextMenu" BasedOn="{StaticResource ContextMenuStyleBase}">
<Setter Property="OverridesDefaultStyle" Value="True" />
</Style>
<Style TargetType="ContextMenu" BasedOn="{StaticResource DefaultContextMenuStyle}" />
</ResourceDictionary> </ResourceDictionary>

3
Flow.Launcher/Resources/Dark.xaml
View file

@ -168,6 +168,7 @@
<Color x:Key="SystemBaseMediumColor">#99FFFFFF</Color> <Color x:Key="SystemBaseMediumColor">#99FFFFFF</Color>
<Color x:Key="SystemBaseMediumHighColor">#CCFFFFFF</Color> <Color x:Key="SystemBaseMediumHighColor">#CCFFFFFF</Color>
<Color x:Key="SystemBaseMediumLowColor">#66FFFFFF</Color> <Color x:Key="SystemBaseMediumLowColor">#66FFFFFF</Color>
<Color x:Key="SystemBaseMediumLowColor2">#45FFFFFF</Color>
<Color x:Key="SystemChromeAltLowColor">#FFF2F2F2</Color> <Color x:Key="SystemChromeAltLowColor">#FFF2F2F2</Color>
<Color x:Key="SystemChromeBlackHighColor">#FF000000</Color> <Color x:Key="SystemChromeBlackHighColor">#FF000000</Color>
<Color x:Key="SystemChromeBlackLowColor">#33000000</Color> <Color x:Key="SystemChromeBlackLowColor">#33000000</Color>
@ -208,7 +209,7 @@
<SolidColorBrush x:Key="SystemControlDisabledAccentBrush" Color="{m:DynamicColor SystemAccentColor}" /> <SolidColorBrush x:Key="SystemControlDisabledAccentBrush" Color="{m:DynamicColor SystemAccentColor}" />
<SolidColorBrush x:Key="SystemControlDisabledBaseHighBrush" Color="{m:StaticColor SystemBaseHighColor}" /> <SolidColorBrush x:Key="SystemControlDisabledBaseHighBrush" Color="{m:StaticColor SystemBaseHighColor}" />
<SolidColorBrush x:Key="SystemControlDisabledBaseLowBrush" Color="{m:StaticColor SystemBaseLowColor}" /> <SolidColorBrush x:Key="SystemControlDisabledBaseLowBrush" Color="{m:StaticColor SystemBaseLowColor}" />
<SolidColorBrush x:Key="SystemControlDisabledBaseMediumLowBrush" Color="{m:StaticColor SystemBaseMediumLowColor}" /> <SolidColorBrush x:Key="SystemControlDisabledBaseMediumLowBrush" Color="{m:StaticColor SystemBaseMediumLowColor2}" />
<SolidColorBrush x:Key="SystemControlDisabledChromeDisabledHighBrush" Color="{m:StaticColor SystemChromeDisabledHighColor}" /> <SolidColorBrush x:Key="SystemControlDisabledChromeDisabledHighBrush" Color="{m:StaticColor SystemChromeDisabledHighColor}" />
<SolidColorBrush x:Key="SystemControlDisabledChromeDisabledLowBrush" Color="{m:StaticColor SystemChromeDisabledLowColor}" /> <SolidColorBrush x:Key="SystemControlDisabledChromeDisabledLowBrush" Color="{m:StaticColor SystemChromeDisabledLowColor}" />
<SolidColorBrush x:Key="SystemControlDisabledChromeHighBrush" Color="{m:StaticColor SystemChromeHighColor}" /> <SolidColorBrush x:Key="SystemControlDisabledChromeHighBrush" Color="{m:StaticColor SystemChromeHighColor}" />

4
Flow.Launcher/Resources/Light.xaml
View file

@ -159,6 +159,8 @@
<Color x:Key="SystemBaseMediumColor">#99000000</Color> <Color x:Key="SystemBaseMediumColor">#99000000</Color>
<Color x:Key="SystemBaseMediumHighColor">#CC000000</Color> <Color x:Key="SystemBaseMediumHighColor">#CC000000</Color>
<Color x:Key="SystemBaseMediumLowColor">#66000000</Color> <Color x:Key="SystemBaseMediumLowColor">#66000000</Color>
<!-- Context Menu Disabled -->
<Color x:Key="SystemBaseMediumLowColor2">#3E000000</Color>
<Color x:Key="SystemChromeAltLowColor">#FF171717</Color> <Color x:Key="SystemChromeAltLowColor">#FF171717</Color>
<Color x:Key="SystemChromeBlackHighColor">#FF000000</Color> <Color x:Key="SystemChromeBlackHighColor">#FF000000</Color>
<Color x:Key="SystemChromeBlackLowColor">#33000000</Color> <Color x:Key="SystemChromeBlackLowColor">#33000000</Color>
@ -199,7 +201,7 @@
<SolidColorBrush x:Key="SystemControlDisabledAccentBrush" Color="{m:DynamicColor SystemAccentColor}" /> <SolidColorBrush x:Key="SystemControlDisabledAccentBrush" Color="{m:DynamicColor SystemAccentColor}" />
<SolidColorBrush x:Key="SystemControlDisabledBaseHighBrush" Color="{m:StaticColor SystemBaseHighColor}" /> <SolidColorBrush x:Key="SystemControlDisabledBaseHighBrush" Color="{m:StaticColor SystemBaseHighColor}" />
<SolidColorBrush x:Key="SystemControlDisabledBaseLowBrush" Color="{m:StaticColor SystemBaseLowColor}" /> <SolidColorBrush x:Key="SystemControlDisabledBaseLowBrush" Color="{m:StaticColor SystemBaseLowColor}" />
<SolidColorBrush x:Key="SystemControlDisabledBaseMediumLowBrush" Color="{m:StaticColor SystemBaseMediumLowColor}" /> <SolidColorBrush x:Key="SystemControlDisabledBaseMediumLowBrush" Color="{m:StaticColor SystemBaseMediumLowColor2}" />
<SolidColorBrush x:Key="SystemControlDisabledChromeDisabledHighBrush" Color="{m:StaticColor SystemChromeDisabledHighColor}" /> <SolidColorBrush x:Key="SystemControlDisabledChromeDisabledHighBrush" Color="{m:StaticColor SystemChromeDisabledHighColor}" />
<SolidColorBrush x:Key="SystemControlDisabledChromeDisabledLowBrush" Color="{m:StaticColor SystemChromeDisabledLowColor}" /> <SolidColorBrush x:Key="SystemControlDisabledChromeDisabledLowBrush" Color="{m:StaticColor SystemChromeDisabledLowColor}" />
<SolidColorBrush x:Key="SystemControlDisabledChromeHighBrush" Color="{m:StaticColor SystemChromeHighColor}" /> <SolidColorBrush x:Key="SystemControlDisabledChromeHighBrush" Color="{m:StaticColor SystemChromeHighColor}" />

9
Flow.Launcher/SettingWindow.xaml
View file

@ -2354,7 +2354,7 @@
</StackPanel> </StackPanel>
<StackPanel <StackPanel
Grid.Column="2" Grid.Column="2"
Margin="0,0,18,0" Margin="0,0,30,0"
VerticalAlignment="Center" VerticalAlignment="Center"
Orientation="Horizontal"> Orientation="Horizontal">
<TextBlock Margin="0,0,12,0"> <TextBlock Margin="0,0,12,0">
@ -2379,7 +2379,10 @@
<StackPanel Style="{StaticResource TextPanel}"> <StackPanel Style="{StaticResource TextPanel}">
<TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource releaseNotes}" /> <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource releaseNotes}" />
</StackPanel> </StackPanel>
<TextBlock VerticalAlignment="Center" Style="{StaticResource SideTextAbout}"> <TextBlock
Margin="0,0,-12,0"
VerticalAlignment="Center"
Style="{StaticResource SideTextAbout}">
<Hyperlink NavigateUri="{Binding ReleaseNotes, Mode=OneWay}" RequestNavigate="OnRequestNavigate"> <Hyperlink NavigateUri="{Binding ReleaseNotes, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
<Run Text="{DynamicResource releaseNotes}" /> <Run Text="{DynamicResource releaseNotes}" />
</Hyperlink> </Hyperlink>
@ -2397,7 +2400,7 @@
</StackPanel> </StackPanel>
<StackPanel <StackPanel
Grid.Column="2" Grid.Column="2"
Margin="0,0,18,0" Margin="0,0,30,0"
VerticalAlignment="Center" VerticalAlignment="Center"
Orientation="Horizontal"> Orientation="Horizontal">
<TextBlock Margin="0,0,12,0"> <TextBlock Margin="0,0,12,0">