Modus styling issue - unable to change the control label text color #414

trimble-oss · Dec 4, 2024 · 365acb9 · 365acb9
1 parent a20cb63
commit 365acb9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/Trimble.Modus.Components/Controls/Label/ControlLabel.xaml.cs b/Trimble.Modus.Components/Controls/Label/ControlLabel.xaml.cs
@@ -86,6 +86,7 @@ public bool IsReadOnly
     public ControlLabel()
     {
         InitializeComponent();
+        this.SetDynamicResource(StyleProperty, "DefaultControlLabelStyle");
     }
 
     private static void OnHeaderTextColorPropertyChanged(BindableObject bindable, object oldValue, object newValue)

diff --git a/Trimble.Modus.Components/Controls/Label/ControlLabelStyles.xaml b/Trimble.Modus.Components/Controls/Label/ControlLabelStyles.xaml
@@ -4,9 +4,9 @@
                     xmlns:local="clr-namespace:Trimble.Modus.Components;assembly=Trimble.Modus.Components"
                     x:Class="Trimble.Modus.Components.ControlLabelStyles">
   <Style TargetType="local:ControlLabel"
-         x:Key="Default">
+         x:Key="DefaultControlLabelStyle">
     <Setter Property="HeaderTextColor"
-            Value="{DynamicResource LabelTextColor}" />
+            Value="{DynamicResource ControlLabelTextColor}" />
   </Style>
 
 </ResourceDictionary>
diff --git a/Trimble.Modus.Components/Styles/DarkThemeStyling.xaml b/Trimble.Modus.Components/Styles/DarkThemeStyling.xaml
@@ -5,7 +5,7 @@
                     x:Class="Trimble.Modus.Components.Styles.DarkThemeStyling">
 
   <!--Label-->
-  <styles:ReferenceColor x:Key="LabelTextColor"
+  <styles:ReferenceColor x:Key="ControlLabelTextColor"
                          Color="{StaticResource DefaultTextColor}" />
 
   <!--Button-->

diff --git a/Trimble.Modus.Components/Styles/LightThemeStyling.xaml b/Trimble.Modus.Components/Styles/LightThemeStyling.xaml
@@ -4,7 +4,7 @@
                     xmlns:styles="clr-namespace:Trimble.Modus.Components.Styles"
                     x:Class="Trimble.Modus.Components.Styles.LightThemeStyling">
   <!--Label-->
-  <styles:ReferenceColor x:Key="LabelTextColor"
+  <styles:ReferenceColor x:Key="ControlLabelTextColor"
                          Color="{StaticResource DefaultTextColor}" />
 
   <!--Button-->