From 868ab9086366bf27d5c8ccd782889945240e3281 Mon Sep 17 00:00:00 2001
From: Anna Malchow-Perryman <amalchowperryman@devolutions.net>
Date: Fri, 12 Sep 2025 02:40:27 +0200
Subject: [PATCH 1/3] Copied from Fluent

---
 .../Controls/Label.axaml                      | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 src/Devolutions.AvaloniaTheme.MacOS/Controls/Label.axaml

diff --git a/src/Devolutions.AvaloniaTheme.MacOS/Controls/Label.axaml b/src/Devolutions.AvaloniaTheme.MacOS/Controls/Label.axaml
new file mode 100644
index 00000000..82a6f833
--- /dev/null
+++ b/src/Devolutions.AvaloniaTheme.MacOS/Controls/Label.axaml
@@ -0,0 +1,23 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    x:ClassModifier="internal">
+
+  <ControlTheme x:Key="{x:Type Label}" TargetType="Label">
+    <Setter Property="Padding" Value="3"/>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <ContentPresenter Name="PART_ContentPresenter"
+                          Background="{TemplateBinding Background}"
+                          BorderBrush="{TemplateBinding BorderBrush}"
+                          BorderThickness="{TemplateBinding BorderThickness}"
+                          CornerRadius="{TemplateBinding CornerRadius}"
+                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                          Content="{TemplateBinding Content}"
+                          Padding="{TemplateBinding Padding}"
+                          RecognizesAccessKey="True"
+                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
+      </ControlTemplate>
+    </Setter>
+  </ControlTheme>
+</ResourceDictionary>
\ No newline at end of file

From 77bdec4964ae5e32d1cf41851ce1b094eda47087 Mon Sep 17 00:00:00 2001
From: Anna Malchow-Perryman <amalchowperryman@devolutions.net>
Date: Fri, 12 Sep 2025 02:44:23 +0200
Subject: [PATCH 2/3] [MacOS] Add Label styles

---
 samples/SampleApp/DemoPages/LabelDemo.axaml   | 54 +++++++++++++++++++
 .../SampleApp/DemoPages/LabelDemo.axaml.cs    | 13 +++++
 samples/SampleApp/MainWindow.axaml            |  8 ++-
 .../Controls/Label.axaml                      | 38 ++++++++-----
 .../Controls/_index.axaml                     |  1 +
 .../GlobalStyles.axaml                        |  8 +++
 6 files changed, 109 insertions(+), 13 deletions(-)
 create mode 100644 samples/SampleApp/DemoPages/LabelDemo.axaml
 create mode 100644 samples/SampleApp/DemoPages/LabelDemo.axaml.cs

diff --git a/samples/SampleApp/DemoPages/LabelDemo.axaml b/samples/SampleApp/DemoPages/LabelDemo.axaml
new file mode 100644
index 00000000..af27fbaf
--- /dev/null
+++ b/samples/SampleApp/DemoPages/LabelDemo.axaml
@@ -0,0 +1,54 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="SampleApp.DemoPages.LabelDemo">
+
+  <StackPanel Margin="10" Width="350" Spacing="15" HorizontalAlignment="Left">
+    <StackPanel>
+      <Label Content="Label" Target="{Binding #Input1}" />
+      <TextBox Name="Input1" Text="Input" />
+    </StackPanel>
+
+    <StackPanel>
+      <Label Content="Label disabled" IsEnabled="False" Target="{Binding #Input2}" />
+      <TextBox Name="Input2" Text="Linked input control not affected" />
+    </StackPanel>
+
+    <StackPanel IsEnabled="False">
+      <Label Content="Container disabled" Target="{Binding #Input3}" />
+      <TextBox Name="Input3" Text="Input" />
+    </StackPanel>
+
+    <StackPanel>
+      <Label Content="Linked control disabled" Target="{Binding #Input4}" />
+      <TextBox Name="Input4" Text="Input" IsEnabled="False" />
+    </StackPanel>
+
+    <StackPanel>
+      <Label Content="_Label not linked to Target" />
+      <TextBox Name="Input5" Text="No mnemonics, no accesibility, no label-click-to-focus" />
+    </StackPanel>
+
+    <StackPanel>
+      <Label Content="Label.form" Classes="form" Target="{Binding #Input6}" />
+      <TextBox Name="Input6" Text="Colon automatically added" />
+    </StackPanel>
+
+
+    <TextBlock Classes="section-title" Text="Grid.form or Grid.compact-form" Margin="0 20 0 0" />
+    <TextBlock Text="Colons added to all labels" />
+    <Grid Classes="form" ColumnDefinitions="Auto, *" RowDefinitions="Auto,Auto" Margin="10 0">
+      <Label Content="_First" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" Target="{Binding #FirstNameBox}" />
+      <TextBox Name="FirstNameBox" Grid.Row="0" Grid.Column="1" Text="Otto" />
+
+      <Label Content="Last Name" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" Target="{Binding #LastNameBox}" />
+      <TextBox Name="LastNameBox" Grid.Row="1" Grid.Column="1" IsEnabled="False" Text="Smith" />
+    </Grid>
+
+
+  </StackPanel>
+
+
+</UserControl>
\ No newline at end of file
diff --git a/samples/SampleApp/DemoPages/LabelDemo.axaml.cs b/samples/SampleApp/DemoPages/LabelDemo.axaml.cs
new file mode 100644
index 00000000..0d6a573d
--- /dev/null
+++ b/samples/SampleApp/DemoPages/LabelDemo.axaml.cs
@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace SampleApp.DemoPages;
+
+public partial class LabelDemo : UserControl
+{
+  public LabelDemo()
+  {
+    InitializeComponent();
+  }
+}
\ No newline at end of file
diff --git a/samples/SampleApp/MainWindow.axaml b/samples/SampleApp/MainWindow.axaml
index 3182d5fe..9b4c7028 100644
--- a/samples/SampleApp/MainWindow.axaml
+++ b/samples/SampleApp/MainWindow.axaml
@@ -86,7 +86,7 @@
         </TabItem.Header>
         <demoPages:EditableComboBoxDemo />
       </TabItem>
-      <TabItem IsSelected="True">
+      <TabItem>
         <TabItem.Header>
           <controls:SampleItemHeader Title="Expander" ApplicableTo="MacOS, Windows - DevExpress" />
         </TabItem.Header>
@@ -118,6 +118,12 @@
         </TabItem.Header>
         <demoPages:GridSplitterDemo />
       </TabItem>
+      <TabItem IsSelected="True">
+        <TabItem.Header>
+          <controls:SampleItemHeader Title="Label" ApplicableTo="MacOS" />
+        </TabItem.Header>
+        <demoPages:LabelDemo />
+      </TabItem>
       <TabItem>
         <TabItem.Header>
           <controls:SampleItemHeader Title="ListBox" ApplicableTo="MacOS, Windows - DevExpress" />
diff --git a/src/Devolutions.AvaloniaTheme.MacOS/Controls/Label.axaml b/src/Devolutions.AvaloniaTheme.MacOS/Controls/Label.axaml
index 82a6f833..6932fb82 100644
--- a/src/Devolutions.AvaloniaTheme.MacOS/Controls/Label.axaml
+++ b/src/Devolutions.AvaloniaTheme.MacOS/Controls/Label.axaml
@@ -1,23 +1,37 @@
+<!-- Based off https://github.com/AvaloniaUI/Avalonia/blob/master/src/Avalonia.Themes.Fluent/Controls/Label.xaml -->
+
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     x:ClassModifier="internal">
 
   <ControlTheme x:Key="{x:Type Label}" TargetType="Label">
-    <Setter Property="Padding" Value="3"/>
+    <Setter Property="Padding" Value="3" />
+    <Setter Property="IsEnabled" Value="{Binding $self.Target.IsEnabled, FallbackValue=True}" />
     <Setter Property="Template">
       <ControlTemplate>
-        <ContentPresenter Name="PART_ContentPresenter"
-                          Background="{TemplateBinding Background}"
-                          BorderBrush="{TemplateBinding BorderBrush}"
-                          BorderThickness="{TemplateBinding BorderThickness}"
-                          CornerRadius="{TemplateBinding CornerRadius}"
-                          ContentTemplate="{TemplateBinding ContentTemplate}"
-                          Content="{TemplateBinding Content}"
-                          Padding="{TemplateBinding Padding}"
-                          RecognizesAccessKey="True"
-                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
+        <StackPanel Orientation="Horizontal" Margin="{TemplateBinding Padding}">
+          <ContentPresenter Name="PART_ContentPresenter"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{TemplateBinding CornerRadius}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            Content="{TemplateBinding Content}"
+                            RecognizesAccessKey="True"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" />
+          <!-- TextBlock#Colon is used in GlobalStyles to display colon in forms -->
+          <TextBlock
+            Name="Colon"
+            Text=":"
+            IsVisible="False" />
+        </StackPanel>
       </ControlTemplate>
     </Setter>
+
+    <Style Selector="^:disabled">
+      <Setter Property="Foreground" Value="{DynamicResource ForegroundLowBrush}" />
+    </Style>
+
   </ControlTheme>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Devolutions.AvaloniaTheme.MacOS/Controls/_index.axaml b/src/Devolutions.AvaloniaTheme.MacOS/Controls/_index.axaml
index 55b77f85..5b418cac 100644
--- a/src/Devolutions.AvaloniaTheme.MacOS/Controls/_index.axaml
+++ b/src/Devolutions.AvaloniaTheme.MacOS/Controls/_index.axaml
@@ -20,6 +20,7 @@
     <MergeResourceInclude Source="EditableComboBox.axaml" />
     <MergeResourceInclude Source="Expander.axaml" />
     <MergeResourceInclude Source="GridSplitter.axaml" />
+    <MergeResourceInclude Source="Label.axaml" />
     <MergeResourceInclude Source="ListBox.axaml" />
     <MergeResourceInclude Source="ListBoxItem.axaml" />
     <MergeResourceInclude Source="Menu.axaml" />
diff --git a/src/Devolutions.AvaloniaTheme.MacOS/GlobalStyles.axaml b/src/Devolutions.AvaloniaTheme.MacOS/GlobalStyles.axaml
index 711f0d42..1464231e 100644
--- a/src/Devolutions.AvaloniaTheme.MacOS/GlobalStyles.axaml
+++ b/src/Devolutions.AvaloniaTheme.MacOS/GlobalStyles.axaml
@@ -47,6 +47,14 @@
     </Setter>
   </Style>
 
+  <Style
+    Selector="Grid.form > Label /template/ TextBlock#Colon,
+                 Label.form /template/ TextBlock#Colon,
+                 .compact-form > Label /template/ TextBlock#Colon">
+    <Setter Property="IsVisible" Value="True" />
+  </Style>
+
+
   <!-- Custom Classes used as ConverterParameters in Template styles - declared here to make them available to the IDE's parser to avoid false error highlighting -->
   <Style Selector=".MacOS_Theme_MenuLabelBelowIcon" />
   <Style Selector=".MacOS_Theme_MenuItemIconOnly" />

From 75f7ab14f8711e0a319ba79d995aa7289e1c4198 Mon Sep 17 00:00:00 2001
From: Anna Malchow-Perryman <amalchowperryman@devolutions.net>
Date: Fri, 12 Sep 2025 19:31:43 +0200
Subject: [PATCH 3/3] Move .form rule into SampleApp (not part of the theme)

---
 samples/SampleApp/Styles.axaml                       | 12 ++++++++++--
 .../Controls/Label.axaml                             |  2 +-
 .../GlobalStyles.axaml                               |  8 --------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/samples/SampleApp/Styles.axaml b/samples/SampleApp/Styles.axaml
index a0903de2..d76c756b 100644
--- a/samples/SampleApp/Styles.axaml
+++ b/samples/SampleApp/Styles.axaml
@@ -23,8 +23,8 @@
 
   <Style Selector="Border.alternativeBackground">
     <Setter Property="Background" Value="{DynamicResource AlternativeBackgroundBrush}" />
-  </Style>  
-  
+  </Style>
+
   <Style Selector="Panel.mainControl">
     <Setter Property="Background" Value="{DynamicResource BackgroundBrush}" />
   </Style>
@@ -43,4 +43,12 @@
     <Setter Property="Padding" Value="4,0,4,0" />
     <Setter Property="VerticalAlignment" Value="Center" />
   </Style>
+
+  <!-- This rule is also used in RDM Styles.MacOS-->
+  <Style
+    Selector="Grid.form > Label /template/ TextBlock#Colon,
+                 Label.form /template/ TextBlock#Colon,
+                 .compact-form > Label /template/ TextBlock#Colon">
+    <Setter Property="IsVisible" Value="True" />
+  </Style>
 </Styles>
\ No newline at end of file
diff --git a/src/Devolutions.AvaloniaTheme.MacOS/Controls/Label.axaml b/src/Devolutions.AvaloniaTheme.MacOS/Controls/Label.axaml
index 6932fb82..1e16ffe3 100644
--- a/src/Devolutions.AvaloniaTheme.MacOS/Controls/Label.axaml
+++ b/src/Devolutions.AvaloniaTheme.MacOS/Controls/Label.axaml
@@ -20,7 +20,7 @@
                             RecognizesAccessKey="True"
                             VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                             HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" />
-          <!-- TextBlock#Colon is used in GlobalStyles to display colon in forms -->
+          <!-- TextBlock#Colon can be used in styles to automatically display colon after each label (cp. SampleApp/styles.axaml) -->
           <TextBlock
             Name="Colon"
             Text=":"
diff --git a/src/Devolutions.AvaloniaTheme.MacOS/GlobalStyles.axaml b/src/Devolutions.AvaloniaTheme.MacOS/GlobalStyles.axaml
index 1464231e..711f0d42 100644
--- a/src/Devolutions.AvaloniaTheme.MacOS/GlobalStyles.axaml
+++ b/src/Devolutions.AvaloniaTheme.MacOS/GlobalStyles.axaml
@@ -47,14 +47,6 @@
     </Setter>
   </Style>
 
-  <Style
-    Selector="Grid.form > Label /template/ TextBlock#Colon,
-                 Label.form /template/ TextBlock#Colon,
-                 .compact-form > Label /template/ TextBlock#Colon">
-    <Setter Property="IsVisible" Value="True" />
-  </Style>
-
-
   <!-- Custom Classes used as ConverterParameters in Template styles - declared here to make them available to the IDE's parser to avoid false error highlighting -->
   <Style Selector=".MacOS_Theme_MenuLabelBelowIcon" />
   <Style Selector=".MacOS_Theme_MenuItemIconOnly" />