fixed a render bug of rate

HandyOrg · Feb 3, 2021 · 1457b99 · 1457b99
1 parent 2b1973f
commit 1457b99
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 26 deletions.
diff --git a/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml b/src/Net_40/HandyControl_Net_40/Themes/Theme.xaml
@@ -9687,14 +9687,6 @@
 	</Style>
 	<Style x:Key="RateRateItemBaseStyle" TargetType="hc:RateItem">
 		<Setter Property="Focusable" Value="False" />
-		<Setter Property="Margin" Value="{Binding ItemMargin,RelativeSource={RelativeSource  AncestorType=hc:Rate}}" />
-		<Setter Property="Width" Value="{Binding ItemWidth,RelativeSource={RelativeSource  AncestorType=hc:Rate}}" />
-		<Setter Property="Height" Value="{Binding ItemHeight,RelativeSource={RelativeSource  AncestorType=hc:Rate}}" />
-		<Setter Property="AllowHalf" Value="{Binding AllowHalf,RelativeSource={RelativeSource  AncestorType=hc:Rate}}" />
-		<Setter Property="AllowClear" Value="{Binding AllowClear,RelativeSource={RelativeSource  AncestorType=hc:Rate}}" />
-		<Setter Property="Icon" Value="{Binding Icon,RelativeSource={RelativeSource  AncestorType=hc:Rate}}" />
-		<Setter Property="IsReadOnly" Value="{Binding IsReadOnly,RelativeSource={RelativeSource  AncestorType=hc:Rate}}" />
-		<Setter Property="Background" Value="{Binding Background,RelativeSource={RelativeSource  AncestorType=hc:Rate}}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="hc:RateItem">

diff --git a/src/Shared/HandyControl_Shared/Controls/Rate/Rate.cs b/src/Shared/HandyControl_Shared/Controls/Rate/Rate.cs
@@ -198,7 +198,15 @@ private void OnApplyTemplateInternal()
             {
                 var item = new RateItem
                 {
-                    Index = i
+                    Index = i,
+                    Width = ItemWidth,
+                    Height = ItemHeight,
+                    Margin = ItemMargin,
+                    AllowHalf = AllowHalf,
+                    AllowClear = AllowClear,
+                    Icon = Icon,
+                    IsReadOnly = IsReadOnly,
+                    Background = Background
                 };
 
                 Items.Add(item);

diff --git a/src/Shared/HandyControl_Shared/Themes/Styles/Base/RateBaseStyle.xaml b/src/Shared/HandyControl_Shared/Themes/Styles/Base/RateBaseStyle.xaml
@@ -11,14 +11,6 @@
 
     <Style x:Key="RateRateItemBaseStyle" TargetType="hc:RateItem">
         <Setter Property="Focusable" Value="False"/>
-        <Setter Property="Margin" Value="{Binding ItemMargin,RelativeSource={RelativeSource  AncestorType=hc:Rate}}"/>
-        <Setter Property="Width" Value="{Binding ItemWidth,RelativeSource={RelativeSource  AncestorType=hc:Rate}}"/>
-        <Setter Property="Height" Value="{Binding ItemHeight,RelativeSource={RelativeSource  AncestorType=hc:Rate}}"/>
-        <Setter Property="AllowHalf" Value="{Binding AllowHalf,RelativeSource={RelativeSource  AncestorType=hc:Rate}}"/>
-        <Setter Property="AllowClear" Value="{Binding AllowClear,RelativeSource={RelativeSource  AncestorType=hc:Rate}}"/>
-        <Setter Property="Icon" Value="{Binding Icon,RelativeSource={RelativeSource  AncestorType=hc:Rate}}"/>
-        <Setter Property="IsReadOnly" Value="{Binding IsReadOnly,RelativeSource={RelativeSource  AncestorType=hc:Rate}}"/>
-        <Setter Property="Background" Value="{Binding Background,RelativeSource={RelativeSource  AncestorType=hc:Rate}}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="hc:RateItem">
@@ -86,4 +78,4 @@
         </Setter>
     </Style>
 
-</ResourceDictionary>
+</ResourceDictionary>
diff --git a/src/Shared/HandyControl_Shared/Themes/Theme.xaml b/src/Shared/HandyControl_Shared/Themes/Theme.xaml
@@ -9805,14 +9805,6 @@
 	</Style>
 	<Style x:Key="RateRateItemBaseStyle" TargetType="hc:RateItem">
 		<Setter Property="Focusable" Value="False" />
-		<Setter Property="Margin" Value="{Binding ItemMargin,RelativeSource={RelativeSource  AncestorType=hc:Rate}}" />
-		<Setter Property="Width" Value="{Binding ItemWidth,RelativeSource={RelativeSource  AncestorType=hc:Rate}}" />
-		<Setter Property="Height" Value="{Binding ItemHeight,RelativeSource={RelativeSource  AncestorType=hc:Rate}}" />
-		<Setter Property="AllowHalf" Value="{Binding AllowHalf,RelativeSource={RelativeSource  AncestorType=hc:Rate}}" />
-		<Setter Property="AllowClear" Value="{Binding AllowClear,RelativeSource={RelativeSource  AncestorType=hc:Rate}}" />
-		<Setter Property="Icon" Value="{Binding Icon,RelativeSource={RelativeSource  AncestorType=hc:Rate}}" />
-		<Setter Property="IsReadOnly" Value="{Binding IsReadOnly,RelativeSource={RelativeSource  AncestorType=hc:Rate}}" />
-		<Setter Property="Background" Value="{Binding Background,RelativeSource={RelativeSource  AncestorType=hc:Rate}}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="hc:RateItem">