Skip to content

Commit 95d336b

Browse files
committed
fix: move Styles.xaml to Application.Resources so dark ToolTip applies
WPF ToolTip popups open in their own top-level window and only inherit from Application.Resources, not from Window-scoped resource dictionaries. Moving the merge to App.xaml makes the dark ToolTip style apply globally.
1 parent 139bf1f commit 95d336b

2 files changed

Lines changed: 6 additions & 9 deletions

File tree

src/ClipHive/App.xaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,10 @@
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
44
<Application.Resources>
5+
<ResourceDictionary>
6+
<ResourceDictionary.MergedDictionaries>
7+
<ResourceDictionary Source="/ClipHive;component/Resources/Styles.xaml" />
8+
</ResourceDictionary.MergedDictionaries>
9+
</ResourceDictionary>
510
</Application.Resources>
611
</Application>

src/ClipHive/Views/SidebarWindow.xaml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,7 @@
1818
Deactivated="Window_Deactivated"
1919
PreviewKeyDown="Window_KeyDown">
2020

21-
<Window.Resources>
22-
<ResourceDictionary>
23-
<ResourceDictionary.MergedDictionaries>
24-
<ResourceDictionary Source="/ClipHive;component/Resources/Styles.xaml" />
25-
</ResourceDictionary.MergedDictionaries>
26-
</ResourceDictionary>
27-
</Window.Resources>
28-
29-
<Border x:Name="RootBorder"
21+
<Border x:Name="RootBorder"
3022
CornerRadius="8"
3123
Background="#CC1A1A1A"
3224
BorderBrush="#3A3A3A"

0 commit comments

Comments
 (0)