Skip to content

Commit c31b04d

Browse files
Copilotbrianrob
andcommitted
Revert theme changes and fix menu bar high contrast support
Co-authored-by: brianrob <6210322+brianrob@users.noreply.github.com>
1 parent 71fa941 commit c31b04d

3 files changed

Lines changed: 4 additions & 12 deletions

File tree

src/PerfView/MainWindow.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<ColumnDefinition Width="Auto"/>
7373
<ColumnDefinition Width="Auto"/>
7474
</Grid.ColumnDefinitions>
75-
<Menu Grid.Column="0" Background="{DynamicResource ControlDefaultBackground}" AutomationProperties.Name="Navigation">
75+
<Menu Grid.Column="0" Background="{DynamicResource {x:Static SystemColors.MenuBarBrushKey}}" AutomationProperties.Name="Navigation">
7676
<MenuItem Header="_File">
7777
<MenuItem Header="_Clear Temp Files" Click="DoClearTempFiles" ToolTip="Some operations create temporary files. This command clears all of these."/>
7878
<MenuItem Header="Clear User Config" Click="DoClearUserConfig" ToolTip="Reset all user preferences back to their defaults when PerfView was first installed."/>
@@ -149,7 +149,7 @@
149149
<MenuItem Header="_About" Click="DoAbout"/>
150150
</MenuItem>
151151
</Menu>
152-
<Rectangle Grid.Column="1" Grid.ColumnSpan="11" Fill="{DynamicResource ControlDefaultBackground}"/>
152+
<Rectangle Grid.Column="1" Grid.ColumnSpan="11" Fill="{DynamicResource {x:Static SystemColors.MenuBarBrushKey}}"/>
153153
<TextBlock Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="3,0" TextWrapping="Wrap">
154154
<Hyperlink Command="Help" CommandParameter="MainViewerQuickStart">Main View Help (F1)</Hyperlink>
155155
</TextBlock>

src/PerfView/Themes/DarkTheme.xaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2205,14 +2205,10 @@ SOFTWARE.
22052205
<Setter Property="OverridesDefaultStyle" Value="true" />
22062206
</Style>
22072207
<Style x:Key="{x:Type Hyperlink}" BasedOn="{StaticResource {x:Type Hyperlink}}" TargetType="{x:Type Hyperlink}">
2208-
<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}" />
22092208
<Style.Triggers>
22102209
<Trigger Property="IsMouseOver" Value="true">
22112210
<Setter Property="Foreground" Value="{StaticResource ControlBrightPrimaryColourBackground}" />
22122211
</Trigger>
2213-
<Trigger Property="IsFocused" Value="true">
2214-
<Setter Property="Foreground" Value="{StaticResource ControlBrightPrimaryColourBackground}" />
2215-
</Trigger>
22162212
<Trigger Property="IsEnabled" Value="false">
22172213
<Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
22182214
</Trigger>
@@ -2224,14 +2220,10 @@ SOFTWARE.
22242220
<Style x:Key="{x:Type Hyperlink}" TargetType="{x:Type Hyperlink}">
22252221
<Setter Property="Foreground" Value="{StaticResource ControlDefaultForeground}" />
22262222
<Setter Property="TextDecorations" Value="Underline" />
2227-
<Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}" />
22282223
<Style.Triggers>
22292224
<Trigger Property="IsMouseOver" Value="true">
22302225
<Setter Property="Foreground" Value="{StaticResource ControlBrightPrimaryColourBackground}" />
22312226
</Trigger>
2232-
<Trigger Property="IsFocused" Value="true">
2233-
<Setter Property="Foreground" Value="{StaticResource ControlBrightPrimaryColourBackground}" />
2234-
</Trigger>
22352227
<Trigger Property="IsEnabled" Value="false">
22362228
<Setter Property="Foreground" Value="{StaticResource ControlDisabledGlythColour}" />
22372229
</Trigger>

src/PerfView/Themes/LightTheme.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ SOFTWARE.
8585
<SolidColorBrush x:Key="Menu.Static.Separator" Color="#FFD7D7D7"/>
8686
<SolidColorBrush x:Key="Menu.Disabled.Foreground" Color="#FF707070"/>
8787
<SolidColorBrush x:Key="MenuItem.Selected.Background" Color="#3D26A0DA"/>
88-
<SolidColorBrush x:Key="MenuItem.Selected.Border" Color="#FF1F4E79"/>
88+
<SolidColorBrush x:Key="MenuItem.Selected.Border" Color="#FF2084E8"/>
8989
<SolidColorBrush x:Key="MenuItem.Highlight.Background" Color="#3D26A0DA"/>
90-
<SolidColorBrush x:Key="MenuItem.Highlight.Border" Color="#FF1F4E79"/>
90+
<SolidColorBrush x:Key="MenuItem.Highlight.Border" Color="#FF2084E8"/>
9191
<SolidColorBrush x:Key="MenuItem.Highlight.Disabled.Background" Color="#0A000000"/>
9292
<SolidColorBrush x:Key="MenuItem.Highlight.Disabled.Border" Color="#21000000"/>
9393
<MenuScrollingVisibilityConverter x:Key="MenuScrollingVisibilityConverter"/>

0 commit comments

Comments
 (0)