Skip to content

Commit ffa7e92

Browse files
onesoundsonesounds
committed
Adjust Disabled ContextMenu Color
Adjust Alignment in About Panel
1 parent c2887e2 commit ffa7e92

File tree

4 files changed

+77
-7
lines changed

4 files changed

+77
-7
lines changed

‎Flow.Launcher/Resources/CustomControlTemplate.xaml

Lines changed: 66 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2591,13 +2591,13 @@
25912591
<RepeatButton
25922592
x:Name="PopupUpSpinButton"
25932593
Content="{StaticResource ChevronUp}"
2594-
Style="{StaticResource NumberBoxPopupSpinButtonStyle}" />
2594+
Style="{DynamicResource NumberBoxPopupSpinButtonStyle}" />
25952595

25962596
<RepeatButton
25972597
x:Name="PopupDownSpinButton"
25982598
Grid.Row="1"
25992599
Content="{StaticResource ChevronDown}"
2600-
Style="{StaticResource NumberBoxPopupSpinButtonStyle}" />
2600+
Style="{DynamicResource NumberBoxPopupSpinButtonStyle}" />
26012601
</Grid>
26022602
</Border>
26032603
</ui:ThemeShadowChrome>
@@ -2692,4 +2692,68 @@
26922692
</Setter>
26932693
</Style>
26942694
<!--#endregion-->
2695+
2696+
<Thickness x:Key="MenuFlyoutScrollerMargin">0,4,0,4</Thickness>
2697+
2698+
<Style x:Key="ContextMenuStyleBase" TargetType="ContextMenu">
2699+
<Setter Property="Background" Value="{DynamicResource MenuFlyoutPresenterBackground}" />
2700+
<Setter Property="BorderBrush" Value="{DynamicResource MenuFlyoutPresenterBorderBrush}" />
2701+
<Setter Property="BorderThickness" Value="{DynamicResource MenuFlyoutPresenterBorderThemeThickness}" />
2702+
<Setter Property="Padding" Value="{DynamicResource MenuFlyoutPresenterThemePadding}" />
2703+
<Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
2704+
<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
2705+
<Setter Property="FontStyle" Value="Normal" />
2706+
<Setter Property="FontWeight" Value="Normal" />
2707+
<Setter Property="Grid.IsSharedSizeScope" Value="true" />
2708+
<Setter Property="HasDropShadow" Value="{DynamicResource {x:Static SystemParameters.DropShadowKey}}" />
2709+
<!--<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />-->
2710+
<!--<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />-->
2711+
<!--<Setter Property="ScrollViewer.PanningMode" Value="VerticalOnly" />-->
2712+
<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
2713+
<Setter Property="MaxWidth" Value="{DynamicResource FlyoutThemeMaxWidth}" />
2714+
<Setter Property="MinHeight" Value="{DynamicResource MenuFlyoutThemeMinHeight}" />
2715+
<Setter Property="ui:ControlHelper.CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
2716+
<Setter Property="Template">
2717+
<Setter.Value>
2718+
<ControlTemplate TargetType="ContextMenu">
2719+
<ui:ThemeShadowChrome
2720+
x:Name="Shdw"
2721+
IsShadowEnabled="{TemplateBinding HasDropShadow}"
2722+
CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}"
2723+
SnapsToDevicePixels="True">
2724+
<Border
2725+
Background="{TemplateBinding Background}"
2726+
CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}">
2727+
<Grid>
2728+
<ScrollViewer
2729+
x:Name="ContextMenuScrollViewer"
2730+
Style="{DynamicResource {ComponentResourceKey ResourceId=MenuScrollViewer,
2731+
TypeInTargetAssembly={x:Type FrameworkElement}}}"
2732+
Margin="{TemplateBinding Padding}"
2733+
MinWidth="{DynamicResource FlyoutThemeMinWidth}">
2734+
<ItemsPresenter
2735+
RenderOptions.ClearTypeHint="Enabled"
2736+
Margin="{StaticResource MenuFlyoutScrollerMargin}"
2737+
KeyboardNavigation.DirectionalNavigation="Cycle"
2738+
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
2739+
</ScrollViewer>
2740+
<Border
2741+
x:Name="ContextMenuBorder"
2742+
BorderBrush="{TemplateBinding BorderBrush}"
2743+
BorderThickness="{TemplateBinding BorderThickness}"
2744+
CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}" />
2745+
</Grid>
2746+
</Border>
2747+
</ui:ThemeShadowChrome>
2748+
</ControlTemplate>
2749+
</Setter.Value>
2750+
</Setter>
2751+
</Style>
2752+
2753+
<Style x:Key="DefaultContextMenuStyle" TargetType="ContextMenu" BasedOn="{StaticResource ContextMenuStyleBase}">
2754+
<Setter Property="OverridesDefaultStyle" Value="True" />
2755+
</Style>
2756+
2757+
<Style TargetType="ContextMenu" BasedOn="{StaticResource DefaultContextMenuStyle}" />
2758+
26952759
</ResourceDictionary>

‎Flow.Launcher/Resources/Dark.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@
168168
<Color x:Key="SystemBaseMediumColor">#99FFFFFF</Color>
169169
<Color x:Key="SystemBaseMediumHighColor">#CCFFFFFF</Color>
170170
<Color x:Key="SystemBaseMediumLowColor">#66FFFFFF</Color>
171+
<Color x:Key="SystemBaseMediumLowColor2">#45FFFFFF</Color>
171172
<Color x:Key="SystemChromeAltLowColor">#FFF2F2F2</Color>
172173
<Color x:Key="SystemChromeBlackHighColor">#FF000000</Color>
173174
<Color x:Key="SystemChromeBlackLowColor">#33000000</Color>
@@ -208,7 +209,7 @@
208209
<SolidColorBrush x:Key="SystemControlDisabledAccentBrush" Color="{m:DynamicColor SystemAccentColor}" />
209210
<SolidColorBrush x:Key="SystemControlDisabledBaseHighBrush" Color="{m:StaticColor SystemBaseHighColor}" />
210211
<SolidColorBrush x:Key="SystemControlDisabledBaseLowBrush" Color="{m:StaticColor SystemBaseLowColor}" />
211-
<SolidColorBrush x:Key="SystemControlDisabledBaseMediumLowBrush" Color="{m:StaticColor SystemBaseMediumLowColor}" />
212+
<SolidColorBrush x:Key="SystemControlDisabledBaseMediumLowBrush" Color="{m:StaticColor SystemBaseMediumLowColor2}" />
212213
<SolidColorBrush x:Key="SystemControlDisabledChromeDisabledHighBrush" Color="{m:StaticColor SystemChromeDisabledHighColor}" />
213214
<SolidColorBrush x:Key="SystemControlDisabledChromeDisabledLowBrush" Color="{m:StaticColor SystemChromeDisabledLowColor}" />
214215
<SolidColorBrush x:Key="SystemControlDisabledChromeHighBrush" Color="{m:StaticColor SystemChromeHighColor}" />

‎Flow.Launcher/Resources/Light.xaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,8 @@
159159
<Color x:Key="SystemBaseMediumColor">#99000000</Color>
160160
<Color x:Key="SystemBaseMediumHighColor">#CC000000</Color>
161161
<Color x:Key="SystemBaseMediumLowColor">#66000000</Color>
162+
<!-- Context Menu Disabled -->
163+
<Color x:Key="SystemBaseMediumLowColor2">#3E000000</Color>
162164
<Color x:Key="SystemChromeAltLowColor">#FF171717</Color>
163165
<Color x:Key="SystemChromeBlackHighColor">#FF000000</Color>
164166
<Color x:Key="SystemChromeBlackLowColor">#33000000</Color>
@@ -199,7 +201,7 @@
199201
<SolidColorBrush x:Key="SystemControlDisabledAccentBrush" Color="{m:DynamicColor SystemAccentColor}" />
200202
<SolidColorBrush x:Key="SystemControlDisabledBaseHighBrush" Color="{m:StaticColor SystemBaseHighColor}" />
201203
<SolidColorBrush x:Key="SystemControlDisabledBaseLowBrush" Color="{m:StaticColor SystemBaseLowColor}" />
202-
<SolidColorBrush x:Key="SystemControlDisabledBaseMediumLowBrush" Color="{m:StaticColor SystemBaseMediumLowColor}" />
204+
<SolidColorBrush x:Key="SystemControlDisabledBaseMediumLowBrush" Color="{m:StaticColor SystemBaseMediumLowColor2}" />
203205
<SolidColorBrush x:Key="SystemControlDisabledChromeDisabledHighBrush" Color="{m:StaticColor SystemChromeDisabledHighColor}" />
204206
<SolidColorBrush x:Key="SystemControlDisabledChromeDisabledLowBrush" Color="{m:StaticColor SystemChromeDisabledLowColor}" />
205207
<SolidColorBrush x:Key="SystemControlDisabledChromeHighBrush" Color="{m:StaticColor SystemChromeHighColor}" />

‎Flow.Launcher/SettingWindow.xaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2354,7 +2354,7 @@
23542354
</StackPanel>
23552355
<StackPanel
23562356
Grid.Column="2"
2357-
Margin="0,0,18,0"
2357+
Margin="0,0,30,0"
23582358
VerticalAlignment="Center"
23592359
Orientation="Horizontal">
23602360
<TextBlock Margin="0,0,12,0">
@@ -2379,7 +2379,10 @@
23792379
<StackPanel Style="{StaticResource TextPanel}">
23802380
<TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource releaseNotes}" />
23812381
</StackPanel>
2382-
<TextBlock VerticalAlignment="Center" Style="{StaticResource SideTextAbout}">
2382+
<TextBlock
2383+
Margin="0,0,-12,0"
2384+
VerticalAlignment="Center"
2385+
Style="{StaticResource SideTextAbout}">
23832386
<Hyperlink NavigateUri="{Binding ReleaseNotes, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
23842387
<Run Text="{DynamicResource releaseNotes}" />
23852388
</Hyperlink>
@@ -2397,7 +2400,7 @@
23972400
</StackPanel>
23982401
<StackPanel
23992402
Grid.Column="2"
2400-
Margin="0,0,18,0"
2403+
Margin="0,0,30,0"
24012404
VerticalAlignment="Center"
24022405
Orientation="Horizontal">
24032406
<TextBlock Margin="0,0,12,0">

0 commit comments

Comments
 (0)