[NUI] Picker style update

diff --git a/src/Tizen.NUI.Components/Style/PickerStyle.cs b/src/Tizen.NUI.Components/Style/PickerStyle.cs
index 70965fe..f711ee0 100755 (executable)
--- a/src/Tizen.NUI.Components/Style/PickerStyle.cs
+++ b/src/Tizen.NUI.Components/Style/PickerStyle.cs
@@ -59,7 +59,7 @@ namespace Tizen.NUI.Components
         /// Gets or sets the PickerStyle Item list start offset value.
         /// </summary>
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public Size2D StartScrollOffset { get; set; } = new Size2D();
+        public Size StartScrollOffset { get; set; } = new Size();
 
         /// <summary>
         /// Style's clone function.
@@ -75,7 +75,7 @@ namespace Tizen.NUI.Components
                 ItemTextLabel.CopyFrom(pickerStyle.ItemTextLabel);
                 Divider.CopyFrom(pickerStyle.Divider);
                 StartScrollOffset = (pickerStyle.StartScrollOffset == null) ?
-                                    new Size2D() : new Size2D(pickerStyle.StartScrollOffset.Width, pickerStyle.StartScrollOffset.Height);
+                                    new Size() : new Size(pickerStyle.StartScrollOffset.Width, pickerStyle.StartScrollOffset.Height);
             }
         }
     }

diff --git a/src/Tizen.NUI.Components/Theme/DefaultTheme.cs b/src/Tizen.NUI.Components/Theme/DefaultTheme.cs
index 71a108b..614147b 100755 (executable)
--- a/src/Tizen.NUI.Components/Theme/DefaultTheme.cs
+++ b/src/Tizen.NUI.Components/Theme/DefaultTheme.cs
@@ -108,10 +108,15 @@ namespace Tizen.NUI.Components
 
                 // Picker
                 (new ExternalThemeKeyList(typeof(Picker), typeof(PickerStyle)))
-                    .AddSelector("/ItemTextLabel/Background", (ViewStyle style, Selector<Color> value) => ((PickerStyle)style).ItemTextLabel.BackgroundColor = value)
-                    .AddSelector("/ItemTextLabel/TextColor", (ViewStyle style, Selector<Color> value) => ((PickerStyle)style).ItemTextLabel.TextColor = value)
-                    .AddSelector("/ItemTextLabel/PixelSize", (ViewStyle style, Selector<float?> value) => ((PickerStyle)style).ItemTextLabel.PixelSize = value)
-                    .AddSelector("/Divider/Background", (ViewStyle style, Selector<Color> value) => ((PickerStyle)style).Divider.BackgroundColor = value),
+                    .Add<Size>("/Size", (ViewStyle style, Size value) => ((ViewStyle)style).Size = value)
+                    .AddSelector<float?>("/ItemTextLabel/PixelSize", (ViewStyle style, Selector<float?> value) => ((PickerStyle)style).ItemTextLabel.PixelSize = value, ControlState.Selected)
+                    .Add<Size>("/ItemTextLabel/Size", (ViewStyle style, Size value) => ((PickerStyle)style).ItemTextLabel.Size = value)
+                    .AddSelector<Color>("/ItemTextLabel/TextColor", (ViewStyle style, Selector<Color> value) => ((PickerStyle)style).ItemTextLabel.TextColor = value, ControlState.Selected)
+                    .AddSelector("/ItemTextLabel/BackgroundColor", (ViewStyle style, Selector<Color> value) => ((PickerStyle)style).ItemTextLabel.BackgroundColor = value, ControlState.Selected)
+                    .Add<float?>("/Divider/SizeHeight", (ViewStyle style, float? value) => ((PickerStyle)style).Divider.SizeHeight = value)
+                    .Add<Position>("/Divider/Position", (ViewStyle style, Position value) => ((PickerStyle)style).Divider.Position = value)
+                    .AddSelector("/Divider/BackgroundColor", (ViewStyle style, Selector<Color> value) => ((PickerStyle)style).Divider.BackgroundColor = value, ControlState.Selected)
+                    .Add<Size>("/StartScrollOffset", (ViewStyle style, Size value) => ((PickerStyle)style).StartScrollOffset = value),
 
                 // TabButton
                 (new ExternalThemeKeyList(typeof(TabButton), typeof(TabButtonStyle)))

diff --git a/src/Tizen.NUI.Components/Theme/DefaultThemeCommon.cs b/src/Tizen.NUI.Components/Theme/DefaultThemeCommon.cs
index ca7c016..ba8900c 100755 (executable)
--- a/src/Tizen.NUI.Components/Theme/DefaultThemeCommon.cs
+++ b/src/Tizen.NUI.Components/Theme/DefaultThemeCommon.cs
@@ -432,7 +432,7 @@ namespace Tizen.NUI.Components
                     Position = new Position(0, 132),
                     BackgroundColor = new Color("#0A0E4AFF"),
                 },
-                StartScrollOffset = new Size2D(0, 12),
+                StartScrollOffset = new Size(0, 12),
             });
 
             theme.AddStyleWithoutClone("Tizen.NUI.Components.TabButton", new TabButtonStyle()