Meik/CustomerPanel-Test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make mark-all-read hover subtler using navbar hover brush

Browse Source
This commit is contained in:
Meik
2026-03-05 13:45:49 +01:00
parent 4e86ebbe3e
commit 92731c33c2
5 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
MainWindow.xaml.cs
View File

@@ -540,6 +540,8 @@ namespace C4IT_CustomerPanel
Application.Current.Resources.MergedDictionaries.Insert(1, themes[1]); Application.Current.Resources.MergedDictionaries.Insert(1, themes[1]);
} }
UpdateNavigationHoverResource();
ComputerInfoCtrl.SetAppearence(); ComputerInfoCtrl.SetAppearence();
if (TryFindResource("navForeground") is SolidColorBrush navForeground) if (TryFindResource("navForeground") is SolidColorBrush navForeground)
@@ -557,6 +559,14 @@ namespace C4IT_CustomerPanel
} }
} }
private void UpdateNavigationHoverResource()
{
if (Application.Current?.Resources == null)
return;
Application.Current.Resources["navigationHoverColor"] = GetNavigationHoverBrush();
}
private void ApplyWindowDraggableState() private void ApplyWindowDraggableState()
{ {
bool draggable = ConfigSettings?.GetConfig()?._isDraggable ?? true; bool draggable = ConfigSettings?.GetConfig()?._isDraggable ?? true;

16
UserControls/Announcements.xaml
View File

@@ -11,26 +11,24 @@
<Style x:Key="ReadAllButtonChromeStyle" <Style x:Key="ReadAllButtonChromeStyle"
TargetType="{x:Type Border}"> TargetType="{x:Type Border}">
<Setter Property="Width" <Setter Property="Width"
Value="30" /> Value="28" />
<Setter Property="Height" <Setter Property="Height"
Value="30" /> Value="28" />
<Setter Property="CornerRadius" <Setter Property="CornerRadius"
Value="8" /> Value="7" />
<Setter Property="Background" <Setter Property="Background"
Value="Transparent" /> Value="Transparent" />
<Setter Property="BorderBrush" <Setter Property="BorderBrush"
Value="Transparent" /> Value="Transparent" />
<Setter Property="BorderThickness" <Setter Property="BorderThickness"
Value="1" /> Value="0" />
<Setter Property="Cursor" <Setter Property="Cursor"
Value="Hand" /> Value="Hand" />
<Style.Triggers> <Style.Triggers>
<Trigger Property="IsMouseOver" <Trigger Property="IsMouseOver"
Value="True"> Value="True">
<Setter Property="Background" <Setter Property="Background"
Value="{DynamicResource headerControlHoverBackgroundColor}" /> Value="{DynamicResource navigationHoverColor}" />
<Setter Property="BorderBrush"
Value="{DynamicResource cardBorderColor}" />
</Trigger> </Trigger>
</Style.Triggers> </Style.Triggers>
</Style> </Style>
@@ -98,8 +96,8 @@
</Border> </Border>
</StackPanel> </StackPanel>
<Border Style="{StaticResource ReadAllButtonChromeStyle}" <Border Style="{StaticResource ReadAllButtonChromeStyle}"
Canvas.Left="334" Canvas.Left="335"
Canvas.Top="11" Canvas.Top="12"
Visibility="{Binding Visibility, ElementName=buttonReadAllAnnouncements}" Visibility="{Binding Visibility, ElementName=buttonReadAllAnnouncements}"
ToolTip="{x:Static resx:Resources.removeMarkups}" ToolTip="{x:Static resx:Resources.removeMarkups}"
PreviewMouseDown="ReadAll_PreviewMouseDown"> PreviewMouseDown="ReadAll_PreviewMouseDown">

16
UserControls/Incidents.xaml
View File

@@ -51,26 +51,24 @@
<Style x:Key="ReadAllButtonChromeStyle" <Style x:Key="ReadAllButtonChromeStyle"
TargetType="{x:Type Border}"> TargetType="{x:Type Border}">
<Setter Property="Width" <Setter Property="Width"
Value="30" /> Value="28" />
<Setter Property="Height" <Setter Property="Height"
Value="30" /> Value="28" />
<Setter Property="CornerRadius" <Setter Property="CornerRadius"
Value="8" /> Value="7" />
<Setter Property="Background" <Setter Property="Background"
Value="Transparent" /> Value="Transparent" />
<Setter Property="BorderBrush" <Setter Property="BorderBrush"
Value="Transparent" /> Value="Transparent" />
<Setter Property="BorderThickness" <Setter Property="BorderThickness"
Value="1" /> Value="0" />
<Setter Property="Cursor" <Setter Property="Cursor"
Value="Hand" /> Value="Hand" />
<Style.Triggers> <Style.Triggers>
<Trigger Property="IsMouseOver" <Trigger Property="IsMouseOver"
Value="True"> Value="True">
<Setter Property="Background" <Setter Property="Background"
Value="{DynamicResource headerControlHoverBackgroundColor}" /> Value="{DynamicResource navigationHoverColor}" />
<Setter Property="BorderBrush"
Value="{DynamicResource cardBorderColor}" />
</Trigger> </Trigger>
</Style.Triggers> </Style.Triggers>
</Style> </Style>
@@ -148,8 +146,8 @@
Click="OnCreateNewTicketClicked" Click="OnCreateNewTicketClicked"
Margin="0" /> Margin="0" />
<Border Style="{StaticResource ReadAllButtonChromeStyle}" <Border Style="{StaticResource ReadAllButtonChromeStyle}"
Canvas.Left="334" Canvas.Left="335"
Canvas.Top="11" Canvas.Top="12"
Visibility="{Binding Visibility, ElementName=buttonReadAllTickets}" Visibility="{Binding Visibility, ElementName=buttonReadAllTickets}"
ToolTip="{x:Static resx:Resources.removeMarkups}" ToolTip="{x:Static resx:Resources.removeMarkups}"
PreviewMouseDown="ReadAll_PreviewMouseDown"> PreviewMouseDown="ReadAll_PreviewMouseDown">

1
themes/ThemeDarkNav.xaml
View File

@@ -33,6 +33,7 @@
<SolidColorBrush x:Key="cardBackgroundColor" Color="#172742"></SolidColorBrush> <SolidColorBrush x:Key="cardBackgroundColor" Color="#172742"></SolidColorBrush>
<SolidColorBrush x:Key="cardBorderColor" Color="#2A3F5F"></SolidColorBrush> <SolidColorBrush x:Key="cardBorderColor" Color="#2A3F5F"></SolidColorBrush>
<SolidColorBrush x:Key="navigationRailColor" Color="#0F172A"></SolidColorBrush> <SolidColorBrush x:Key="navigationRailColor" Color="#0F172A"></SolidColorBrush>
<SolidColorBrush x:Key="navigationHoverColor" Color="#223651"></SolidColorBrush>
<SolidColorBrush x:Key="navigationRailBorderColor" Color="#2A3F5F"></SolidColorBrush> <SolidColorBrush x:Key="navigationRailBorderColor" Color="#2A3F5F"></SolidColorBrush>
<SolidColorBrush x:Key="inputBackgroundColor" Color="#0F1E37"></SolidColorBrush> <SolidColorBrush x:Key="inputBackgroundColor" Color="#0F1E37"></SolidColorBrush>
<SolidColorBrush x:Key="inputBorderColor" Color="#2A4469"></SolidColorBrush> <SolidColorBrush x:Key="inputBorderColor" Color="#2A4469"></SolidColorBrush>

1
themes/ThemeLightNav.xaml
View File

@@ -33,6 +33,7 @@
<SolidColorBrush x:Key="cardBackgroundColor" Color="#FFFFFFFF"></SolidColorBrush> <SolidColorBrush x:Key="cardBackgroundColor" Color="#FFFFFFFF"></SolidColorBrush>
<SolidColorBrush x:Key="cardBorderColor" Color="#D7E0EE"></SolidColorBrush> <SolidColorBrush x:Key="cardBorderColor" Color="#D7E0EE"></SolidColorBrush>
<SolidColorBrush x:Key="navigationRailColor" Color="#EDF3FB"></SolidColorBrush> <SolidColorBrush x:Key="navigationRailColor" Color="#EDF3FB"></SolidColorBrush>
<SolidColorBrush x:Key="navigationHoverColor" Color="#DCE8F7"></SolidColorBrush>
<SolidColorBrush x:Key="navigationRailBorderColor" Color="#C6D6EA"></SolidColorBrush> <SolidColorBrush x:Key="navigationRailBorderColor" Color="#C6D6EA"></SolidColorBrush>
<SolidColorBrush x:Key="inputBackgroundColor" Color="#F7FAFD"></SolidColorBrush> <SolidColorBrush x:Key="inputBackgroundColor" Color="#F7FAFD"></SolidColorBrush>
<SolidColorBrush x:Key="inputBorderColor" Color="#CBD9EC"></SolidColorBrush> <SolidColorBrush x:Key="inputBorderColor" Color="#CBD9EC"></SolidColorBrush>