From 3064a9b5dbf3f971d0265a40ca5bbb455bf6f807 Mon Sep 17 00:00:00 2001 From: bshsqa <32317749+bshsqa@users.noreply.github.com> Date: Tue, 21 Jan 2025 21:09:39 +0900 Subject: [PATCH] Revert "[NUI] Rebase from DevelNUI to main (#6597)" This reverts commit ae55a7e5791cf9c4c34b48c2ba4ebeab1c5ccc79. --- packaging/csapi-tizenfx.spec | 2 +- packaging/version.txt | 2 +- .../{Lite/UIState.cs => Base/ViewState.cs} | 76 +++++++++---------- .../src/devel/Lite/{UIColor.cs => L.Color.cs} | 36 ++++----- .../devel/Lite/{UICorner.cs => L.Corner.cs} | 16 ++-- .../devel/Lite/{UIShadow.cs => L.Shadow.cs} | 18 ++--- .../devel/Lite/{UIVector2.cs => L.Vector2.cs} | 10 +-- .../src/devel}/Markup/ViewExtensions.cs | 61 +++++---------- src/Tizen.NUI/src/internal/Common/Object.cs | 6 +- .../src/internal/Interop/Interop.VideoView.cs | 14 ---- .../src/public/BaseComponents/ControlState.cs | 30 ++++---- .../src/public/BaseComponents/VideoView.cs | 46 ----------- .../public/BaseComponents/ViewLiteProperty.cs | 8 +- .../src/public/Common/PropertyMap.cs | 6 +- src/Tizen.NUI/src/public/Common/Vector4.cs | 4 +- .../public/Utility/GraphicsTypeExtensions.cs | 8 +- 16 files changed, 129 insertions(+), 214 deletions(-) rename src/Tizen.NUI/src/devel/{Lite/UIState.cs => Base/ViewState.cs} (61%) rename src/Tizen.NUI/src/devel/Lite/{UIColor.cs => L.Color.cs} (77%) rename src/Tizen.NUI/src/devel/Lite/{UICorner.cs => L.Corner.cs} (84%) rename src/Tizen.NUI/src/devel/Lite/{UIShadow.cs => L.Shadow.cs} (90%) rename src/Tizen.NUI/src/devel/Lite/{UIVector2.cs => L.Vector2.cs} (87%) rename src/{Tizen.NUI.Extension => Tizen.NUI/src/devel}/Markup/ViewExtensions.cs (83%) diff --git a/packaging/csapi-tizenfx.spec b/packaging/csapi-tizenfx.spec index 6b124ec7645..8a30664651d 100644 --- a/packaging/csapi-tizenfx.spec +++ b/packaging/csapi-tizenfx.spec @@ -1,7 +1,7 @@ # Auto-generated from csapi-tizenfx.spec.in by makespec.sh %define TIZEN_NET_API_VERSION 13 -%define TIZEN_NET_RPM_VERSION 13.0.0.999+nui22402 +%define TIZEN_NET_RPM_VERSION 13.0.0.999+nui22401 %define TIZEN_NET_NUGET_VERSION 13.0.0.99999 %define DOTNET_ASSEMBLY_PATH /usr/share/dotnet.tizen/framework diff --git a/packaging/version.txt b/packaging/version.txt index e5b0bee6aa0..b3ee688b90c 100755 --- a/packaging/version.txt +++ b/packaging/version.txt @@ -6,4 +6,4 @@ RPM_VERSION=13.0.0.999 NUGET_VERSION=13.0.0.99999 # RPM Version Suffix -RPM_VERSION_SUFFIX=nui22402 +RPM_VERSION_SUFFIX=nui22401 diff --git a/src/Tizen.NUI/src/devel/Lite/UIState.cs b/src/Tizen.NUI/src/devel/Base/ViewState.cs similarity index 61% rename from src/Tizen.NUI/src/devel/Lite/UIState.cs rename to src/Tizen.NUI/src/devel/Base/ViewState.cs index 87b3c8e737a..7a079cff7a7 100755 --- a/src/Tizen.NUI/src/devel/Lite/UIState.cs +++ b/src/Tizen.NUI/src/devel/Base/ViewState.cs @@ -26,81 +26,81 @@ namespace Tizen.NUI /// Defines a value type of view state. /// [EditorBrowsable(EditorBrowsableState.Never)] - public readonly struct UIState + public readonly struct ViewState { /// /// The All state is used in a selector class. It represents all states, so if this state is defined in a selector, the other states are ignored. /// - public static readonly UIState All = new (ControlStateUtility.FullMask); + public static readonly ViewState All = new (ControlStateUtility.FullMask); /// /// Normal State. /// - public static readonly UIState Normal = new (0UL); + public static readonly ViewState Normal = new (0UL); /// /// Focused State. /// - public static readonly UIState Focused = new (nameof(Focused)); + public static readonly ViewState Focused = new (nameof(Focused)); /// /// Pressed State. /// - public static readonly UIState Pressed = new (nameof(Pressed)); + public static readonly ViewState Pressed = new (nameof(Pressed)); /// /// Disabled State. /// - public static readonly UIState Disabled = new (nameof(Disabled)); + public static readonly ViewState Disabled = new (nameof(Disabled)); /// /// Selected State. /// - public static readonly UIState Selected = new (nameof(Selected)); + public static readonly ViewState Selected = new (nameof(Selected)); /// /// Pressed caused by key state. /// - public static readonly UIState PressedByKey = Pressed + new UIState(nameof(PressedByKey)); + public static readonly ViewState PressedByKey = Pressed + new ViewState(nameof(PressedByKey)); /// /// Pressed caused by touch state. /// - public static readonly UIState PressedByTouch = Pressed + new UIState(nameof(PressedByTouch)); + public static readonly ViewState PressedByTouch = Pressed + new ViewState(nameof(PressedByTouch)); /// /// SelectedPressed State. /// - public static readonly UIState SelectedPressed = Selected + Pressed; + public static readonly ViewState SelectedPressed = Selected + Pressed; /// /// DisabledSelected State. /// - public static readonly UIState DisabledSelected = Disabled + Selected; + public static readonly ViewState DisabledSelected = Disabled + Selected; /// /// DisabledFocused State. /// - public static readonly UIState DisabledFocused = Disabled + Focused; + public static readonly ViewState DisabledFocused = Disabled + Focused; /// /// SelectedFocused State. /// - public static readonly UIState SelectedFocused = Selected + Focused; + public static readonly ViewState SelectedFocused = Selected + Focused; /// /// This is used in a selector class. It represents all other states except for states that are already defined in a selector. /// - public static readonly UIState Other = new UIState(nameof(Other)); + public static readonly ViewState Other = new ViewState(nameof(Other)); private readonly ulong bitFlags; - private UIState(ulong bitMask) + private ViewState(ulong bitMask) { bitFlags = bitMask; } - private UIState(string name) : this(ControlStateUtility.Register(name)) + private ViewState(string name) : this(ControlStateUtility.Register(name)) { } @@ -110,15 +110,15 @@ private UIState(string name) : this(ControlStateUtility.Register(name)) internal bool IsCombined => (bitFlags != 0UL) && ((bitFlags & (bitFlags - 1UL)) != 0UL); /// - /// Create an instance of the with state name. + /// Create an instance of the with state name. /// /// The state name. - /// The instance which has single state. + /// The instance which has single state. /// Thrown when the given name is null. /// Thrown when the given name is invalid. - public static UIState Create(string name) + public static ViewState Create(string name) { - return new UIState(name); + return new ViewState(name); } /// @@ -126,14 +126,14 @@ public static UIState Create(string name) /// /// The state to search for /// true if the state contain a specified state, otherwise, false. - public bool Contains(UIState state) => (bitFlags & state.bitFlags) == state.bitFlags; + public bool Contains(ViewState state) => (bitFlags & state.bitFlags) == state.bitFlags; /// /// Checks if there is a intersection part between this and the other. /// /// The other state to check. /// True if an intersection exists, otherwise false. - public bool HasIntersectionWith(UIState other) => (bitFlags & other.bitFlags) != 0L; + public bool HasIntersectionWith(ViewState other) => (bitFlags & other.bitFlags) != 0L; /// public override string ToString() @@ -165,41 +165,41 @@ public override string ToString() /// /// Compares whether the two ControlStates are same or not. /// - /// A on the left hand side. - /// A on the right hand side. + /// A on the left hand side. + /// A on the right hand side. /// true if the ControlStates are equal; otherwise, false. - public static bool operator ==(UIState lhs, UIState rhs) => lhs.Equals(rhs); + public static bool operator ==(ViewState lhs, ViewState rhs) => lhs.Equals(rhs); /// /// Compares whether the two ControlStates are different or not. /// - /// A on the left hand side. - /// A on the right hand side. + /// A on the left hand side. + /// A on the right hand side. /// true if the ControlStates are not equal; otherwise, false. - public static bool operator !=(UIState lhs, UIState rhs) => !lhs.Equals(rhs); + public static bool operator !=(ViewState lhs, ViewState rhs) => !lhs.Equals(rhs); /// /// The addition operator. /// - /// A on the left hand side. - /// A on the right hand side. - /// The containing the result of the addition. - public static UIState operator +(UIState lhs, UIState rhs) => new (lhs.bitFlags | rhs.bitFlags); + /// A on the left hand side. + /// A on the right hand side. + /// The containing the result of the addition. + public static ViewState operator +(ViewState lhs, ViewState rhs) => new ViewState(lhs.bitFlags | rhs.bitFlags); /// /// The substraction operator. /// - /// A on the left hand side. - /// A on the right hand side. - /// The containing the result of the substraction. - public static UIState operator -(UIState lhs, UIState rhs) => new (lhs.bitFlags & ~(rhs.bitFlags)); + /// A on the left hand side. + /// A on the right hand side. + /// The containing the result of the substraction. + public static ViewState operator -(ViewState lhs, ViewState rhs) => new ViewState(lhs.bitFlags & ~(rhs.bitFlags)); - public bool Equals(UIState other) => bitFlags == other.bitFlags; + public bool Equals(ViewState other) => bitFlags == other.bitFlags; /// public override bool Equals(object obj) { - if (obj is UIState otherState) + if (obj is ViewState otherState) { return Equals(otherState); } diff --git a/src/Tizen.NUI/src/devel/Lite/UIColor.cs b/src/Tizen.NUI/src/devel/Lite/L.Color.cs similarity index 77% rename from src/Tizen.NUI/src/devel/Lite/UIColor.cs rename to src/Tizen.NUI/src/devel/Lite/L.Color.cs index a5cefc4e64a..6de76adf1ae 100644 --- a/src/Tizen.NUI/src/devel/Lite/UIColor.cs +++ b/src/Tizen.NUI/src/devel/Lite/L.Color.cs @@ -16,57 +16,57 @@ */ using System.ComponentModel; -namespace Tizen.NUI +namespace Tizen.NUI.L { /// /// Defines a value type of color. /// [EditorBrowsable(EditorBrowsableState.Never)] - public struct UIColor + public struct Color { /// /// The default color. (This is to distinguish from zero corners) /// - public static readonly UIColor Default = new (-1, -1, -1, -1); + public static readonly Color Default = new (-1, -1, -1, -1); /// /// The transparent color. /// - public static readonly UIColor Transparent = new (0, 0, 0, 0); + public static readonly Color Transparent = new (0, 0, 0, 0); /// /// The transparent color. /// - public static readonly UIColor Black = new (0, 0, 0, 1); + public static readonly Color Black = new (0, 0, 0, 1); /// /// The white color. /// - public static readonly UIColor White = new (1, 1, 1, 1); + public static readonly Color White = new (1, 1, 1, 1); /// /// The red color. /// - public static readonly UIColor Red = new (1, 0, 0, 1); + public static readonly Color Red = new (1, 0, 0, 1); /// /// The green color. /// - public static readonly UIColor Green = new (0, 1, 0, 1); + public static readonly Color Green = new (0, 1, 0, 1); /// /// The blue color. /// - public static readonly UIColor Blue = new (0, 0, 1, 1); + public static readonly Color Blue = new (0, 0, 1, 1); /// - /// Initializes a new instance of the struct. + /// Initializes a new instance of the struct. /// /// The red component. /// The green component. /// The blue component. /// The alpha component. - public UIColor(float r, float g, float b, float a) + public Color(float r, float g, float b, float a) { R = r; G = g; @@ -75,17 +75,17 @@ public UIColor(float r, float g, float b, float a) } /// - /// Initializes a new instance of the struct. + /// Initializes a new instance of the struct. /// /// The value of 0xRRGGBB format. /// The alpha value between 0.0 and 1.0. /// /// - /// new UIColor(0xFF0000, 1f); // Solid red - /// new UIColor(0x00FF00, 0.5f) // Half transparent green + /// new L.Color(0xFF0000, 1f); // Solid red + /// new L.Color(0x00FF00, 0.5f) // Half transparent green /// /// - public UIColor(uint value, float alpha) + public Color(uint value, float alpha) { R = ((value >> 16) & 0xff) / 255.0f; G = ((value >> 8) & 0xff) / 255.0f; @@ -93,7 +93,7 @@ public UIColor(uint value, float alpha) A = alpha; } - internal UIColor(NUI.Vector4 vector4) : this(vector4.X, vector4.Y, vector4.Z, vector4.W) + internal Color(NUI.Vector4 vector4) : this(vector4.X, vector4.Y, vector4.Z, vector4.W) { } @@ -144,7 +144,7 @@ public float A /// /// The value to multiply the alpha component by. /// The new color. - public readonly UIColor MultiplyAlpha(float alpha) => new UIColor(R, G, B, A * alpha); + public readonly Color MultiplyAlpha(float alpha) => new Color(R, G, B, A * alpha); /// public override string ToString() => $"R:{R}, G:{G}, B:{B}, A:{A}"; @@ -154,7 +154,7 @@ public float A /// /// The new alpha value. /// A new color object with the specified alpha value. - public readonly UIColor WithAlpha(float alpha) => new (R, G, B, alpha); + public readonly Color WithAlpha(float alpha) => new (R, G, B, alpha); internal readonly NUI.Color ToReferenceType() => new NUI.Color(R, G, B, A); } diff --git a/src/Tizen.NUI/src/devel/Lite/UICorner.cs b/src/Tizen.NUI/src/devel/Lite/L.Corner.cs similarity index 84% rename from src/Tizen.NUI/src/devel/Lite/UICorner.cs rename to src/Tizen.NUI/src/devel/Lite/L.Corner.cs index 87c3da528cd..8a26c4c8747 100644 --- a/src/Tizen.NUI/src/devel/Lite/UICorner.cs +++ b/src/Tizen.NUI/src/devel/Lite/L.Corner.cs @@ -16,40 +16,40 @@ */ using System.ComponentModel; -namespace Tizen.NUI +namespace Tizen.NUI.L { /// /// Defines a value type of corner radius. /// [EditorBrowsable(EditorBrowsableState.Never)] - public struct UICorner + public struct Corner { /// /// The default corner. (This is to distinguish from zero corners) /// - public static readonly UICorner Default = new (-1, -1, -1, -1); + public static readonly Corner Default = new (-1, -1, -1, -1); /// /// The zero corner. /// - public static readonly UICorner Zero = new (0.0f, 0.0f, 0.0f, 0.0f); + public static readonly Corner Zero = new (0.0f, 0.0f, 0.0f, 0.0f); /// - /// Initializes a new instance of the struct. + /// Initializes a new instance of the struct. /// /// The uniform corner value. - public UICorner(float uniform) : this(uniform, uniform, uniform, uniform) + public Corner(float uniform) : this(uniform, uniform, uniform, uniform) { } /// - /// Initializes a new instance of the struct. + /// Initializes a new instance of the struct. /// /// The top-left value. /// The top-right value. /// The bottom-right value. /// The bottom-left value. - public UICorner(float topLeft, float topRight, float bottomRight, float bottomLeft) + public Corner(float topLeft, float topRight, float bottomRight, float bottomLeft) { TopLeft = topLeft; TopRight = topRight; diff --git a/src/Tizen.NUI/src/devel/Lite/UIShadow.cs b/src/Tizen.NUI/src/devel/Lite/L.Shadow.cs similarity index 90% rename from src/Tizen.NUI/src/devel/Lite/UIShadow.cs rename to src/Tizen.NUI/src/devel/Lite/L.Shadow.cs index 5c5c437d40a..cc565ad2005 100644 --- a/src/Tizen.NUI/src/devel/Lite/UIShadow.cs +++ b/src/Tizen.NUI/src/devel/Lite/L.Shadow.cs @@ -17,13 +17,13 @@ using System.ComponentModel; using Tizen.NUI.BaseComponents; -namespace Tizen.NUI +namespace Tizen.NUI.L { /// /// Defines a value type of shadow. /// [EditorBrowsable(EditorBrowsableState.Never)] - public struct UIShadow + public struct Shadow { /// /// Create a Shadow. @@ -34,8 +34,8 @@ public struct UIShadow /// Optional. The shadow will extend its size by specified amount of length. The default is 0. /// Optional. The shadow will extend its size by specified amount of length. The default is 0. /// The policy of the shadow cutout. The default is . - public UIShadow(float blurRadius, float offsetX = 0, float offsetY = 0, float extraWidth = 0, float extraHeight = 0, ColorVisualCutoutPolicyType cutoutPolicy = ColorVisualCutoutPolicyType.None) - : this(blurRadius, UIColor.Black, offsetX, offsetY, extraWidth, extraHeight, cutoutPolicy) + public Shadow(float blurRadius, float offsetX = 0, float offsetY = 0, float extraWidth = 0, float extraHeight = 0, ColorVisualCutoutPolicyType cutoutPolicy = ColorVisualCutoutPolicyType.None) + : this(blurRadius, L.Color.Black, offsetX, offsetY, extraWidth, extraHeight, cutoutPolicy) { } @@ -49,7 +49,7 @@ public UIShadow(float blurRadius, float offsetX = 0, float offsetY = 0, float ex /// Optional. The shadow will extend its size by specified amount of length. The default is 0. /// Optional. The shadow will extend its size by specified amount of length. The default is 0. /// The policy of the shadow cutout. The default is . - public UIShadow(float blurRadius, UIColor color, float offsetX = 0, float offsetY = 0, float extraWidth = 0, float extraHeight = 0, ColorVisualCutoutPolicyType cutoutPolicy = ColorVisualCutoutPolicyType.None) + public Shadow(float blurRadius, L.Color color, float offsetX = 0, float offsetY = 0, float extraWidth = 0, float extraHeight = 0, ColorVisualCutoutPolicyType cutoutPolicy = ColorVisualCutoutPolicyType.None) { BlurRadius = blurRadius; Color = color; @@ -75,7 +75,7 @@ public float BlurRadius /// /// The color for the shadow. /// - public UIColor Color + public L.Color Color { get; init; @@ -142,9 +142,9 @@ public ColorVisualCutoutPolicyType CutoutPolicy internal readonly PropertyMap BuildMap(View attachedView) { using var transform = new PropertyMap() - .Append((int)VisualTransformPropertyType.Offset, new UIVector2(OffsetX, OffsetY)) - .Append((int)VisualTransformPropertyType.OffsetPolicy, new UIVector2((int)VisualTransformPolicyType.Absolute, (int)VisualTransformPolicyType.Absolute)) - .Append((int)VisualTransformPropertyType.ExtraSize, new UIVector2(ExtraWidth, ExtraHeight)) + .Append((int)VisualTransformPropertyType.Offset, new L.Vector2(OffsetX, OffsetY)) + .Append((int)VisualTransformPropertyType.OffsetPolicy, new L.Vector2((int)VisualTransformPolicyType.Absolute, (int)VisualTransformPolicyType.Absolute)) + .Append((int)VisualTransformPropertyType.ExtraSize, new L.Vector2(ExtraWidth, ExtraHeight)) .Append((int)VisualTransformPropertyType.Origin, (int)Visual.AlignType.Center) .Append((int)VisualTransformPropertyType.AnchorPoint, (int)Visual.AlignType.Center); diff --git a/src/Tizen.NUI/src/devel/Lite/UIVector2.cs b/src/Tizen.NUI/src/devel/Lite/L.Vector2.cs similarity index 87% rename from src/Tizen.NUI/src/devel/Lite/UIVector2.cs rename to src/Tizen.NUI/src/devel/Lite/L.Vector2.cs index f62d73c891b..0d4ac7c96de 100644 --- a/src/Tizen.NUI/src/devel/Lite/UIVector2.cs +++ b/src/Tizen.NUI/src/devel/Lite/L.Vector2.cs @@ -16,25 +16,25 @@ */ using System.ComponentModel; -namespace Tizen.NUI +namespace Tizen.NUI.L { /// /// Defines a value type of vector2. /// [EditorBrowsable(EditorBrowsableState.Never)] - public readonly struct UIVector2 + public readonly struct Vector2 { /// /// The zero vector2. /// - public static readonly UIVector2 Zero = new (0.0f, 0.0f); + public static readonly Vector2 Zero = new (0.0f, 0.0f); /// - /// Initializes a new instance of the struct. + /// Initializes a new instance of the struct. /// /// The x value. /// The y value. - public UIVector2(float x, float y) + public Vector2(float x, float y) { X = x; Y = y; diff --git a/src/Tizen.NUI.Extension/Markup/ViewExtensions.cs b/src/Tizen.NUI/src/devel/Markup/ViewExtensions.cs similarity index 83% rename from src/Tizen.NUI.Extension/Markup/ViewExtensions.cs rename to src/Tizen.NUI/src/devel/Markup/ViewExtensions.cs index 6405f630037..6ead5056b72 100644 --- a/src/Tizen.NUI.Extension/Markup/ViewExtensions.cs +++ b/src/Tizen.NUI/src/devel/Markup/ViewExtensions.cs @@ -17,10 +17,9 @@ using System.ComponentModel; using Tizen.NUI.BaseComponents; -namespace Tizen.NUI.Extension +namespace Tizen.NUI.Markup { /// - /// Markup extensions for View. /// [EditorBrowsable(EditorBrowsableState.Never)] public static class ViewExtensions @@ -32,7 +31,7 @@ public static class ViewExtensions /// The extension target. /// The variable to save the reference to. /// The view itself. - public static T Self(this T view, out T self) where T : View + public static T Self(this T view, out T self) where T : View { self = view; return view; @@ -50,7 +49,7 @@ public static T Self(this T view, out T self) where T : View /// The view itself. public static T BackgroundColor(this T view, float r, float g, float b, float a = 1f) where T : View { - return view.BackgroundColor(new UIColor(r, g, b, a)); + return view.BackgroundColor(new L.Color(r, g, b, a)); } /// @@ -63,7 +62,7 @@ public static T BackgroundColor(this T view, float r, float g, float b, float /// The view itself. public static T BackgroundColor(this T view, uint value, float alpha) where T : View { - return view.BackgroundColor(new UIColor(value, alpha)); + return view.BackgroundColor(new L.Color(value, alpha)); } /// @@ -73,7 +72,7 @@ public static T BackgroundColor(this T view, uint value, float alpha) where T /// The extension target. /// The color value. /// The view itself. - public static T BackgroundColor(this T view, UIColor color) where T : View + public static T BackgroundColor(this T view, L.Color color) where T : View { view.SetBackgroundColor(color); return view; @@ -84,24 +83,11 @@ public static T BackgroundColor(this T view, UIColor color) where T : View /// /// The extension target. /// The background color value. - public static UIColor BackgroundColor(this View view) + public static L.Color BackgroundColor(this View view) { return Object.InternalRetrievingVisualPropertyColor(view.SwigCPtr, View.Property.BACKGROUND, ColorVisualProperty.MixColor); } - /// - /// Sets the background image of the view. - /// - /// The type of the view. - /// The extension target. - /// The resource url. - /// The view itself. - public static TView BackgroundImage(this TView view, string url) where TView : View - { - view.BackgroundImage = url; - return view; - } - /// /// Sets the size of the view. /// @@ -194,7 +180,7 @@ public static T PositionY(this T view, float y) where T : View /// The view itself. public static T CornerRadius(this T view, float uniform, bool isRelative = false) where T : View { - return view.CornerRadius(new UICorner(uniform, uniform, uniform, uniform), isRelative); + return view.CornerRadius(new L.Corner(uniform, uniform, uniform, uniform), isRelative); } /// @@ -210,7 +196,7 @@ public static T CornerRadius(this T view, float uniform, bool isRelative = fa /// The view itself. public static T CornerRadius(this T view, float topLeft, float topRight, float bottomRight, float bottomLeft, bool isRelative = false) where T : View { - return view.CornerRadius(new UICorner(topLeft, topRight, bottomRight, bottomLeft), isRelative); + return view.CornerRadius(new L.Corner(topLeft, topRight, bottomRight, bottomLeft), isRelative); } /// @@ -221,7 +207,7 @@ public static T CornerRadius(this T view, float topLeft, float topRight, floa /// The corner value. /// Sets the corner radius policy to relative. The default is false. /// The view itself. - public static T CornerRadius(this T view, UICorner corner, bool isRelative = false) where T : View + public static T CornerRadius(this T view, L.Corner corner, bool isRelative = false) where T : View { // TODO Do not create Vector4 here view.CornerRadius = corner.ToReferenceType(); @@ -229,19 +215,6 @@ public static T CornerRadius(this T view, UICorner corner, bool isRelative = return view; } - /// - /// Gets the corner radius of the view. - /// - /// The type of the view. - /// The extension target. - /// The corner radius value. - public static UICorner CornerRadius(this View view) - { - // TODO Do not use Vector4 here - var corner = view.CornerRadius; - return new UICorner(corner.X, corner.Y, corner.Z, corner.W); - } - /// /// Sets the box shadow of the view. /// @@ -250,10 +223,13 @@ public static UICorner CornerRadius(this View view) /// The blur radius value for the shadow. Bigger value, much blurry. /// Optional. The x offset value from the top left corner. The default is 0. /// Optional. The y offset value from the top left corner. The default is 0. + /// Optional. The shadow will extend its size by specified amount of length. The default is 0. + /// Optional. The shadow will extend its size by specified amount of length. The default is 0. + /// The policy of the shadow cutout. The default is . /// The view itself. - public static T BoxShadow(this T view, float blurRadius, float offsetX = 0, float offsetY = 0) where T : View + public static T BoxShadow(this T view, float blurRadius, float offsetX = 0, float offsetY = 0, float extraWidth = 0, float extraHeight = 0, ColorVisualCutoutPolicyType cutoutPolicy = ColorVisualCutoutPolicyType.None) where T : View { - return view.BoxShadow(new UIShadow(blurRadius)); + return view.BoxShadow(new L.Shadow(blurRadius, offsetX, offsetY, extraWidth, extraHeight, cutoutPolicy)); } /// @@ -265,10 +241,13 @@ public static T BoxShadow(this T view, float blurRadius, float offsetX = 0, f /// The color for the shadow. /// Optional. The x offset value from the top left corner. The default is 0. /// Optional. The y offset value from the top left corner. The default is 0. + /// Optional. The shadow will extend its size by specified amount of length. The default is 0. + /// Optional. The shadow will extend its size by specified amount of length. The default is 0. + /// The policy of the shadow cutout. The default is . /// The view itself. - public static T BoxShadow(this T view, float blurRadius, UIColor color, float offsetX = 0, float offsetY = 0) where T : View + public static T BoxShadow(this T view, float blurRadius, L.Color color, float offsetX = 0, float offsetY = 0, float extraWidth = 0, float extraHeight = 0, ColorVisualCutoutPolicyType cutoutPolicy = ColorVisualCutoutPolicyType.None) where T : View { - return view.BoxShadow(new UIShadow(blurRadius, color, offsetX, offsetY)); + return view.BoxShadow(new L.Shadow(blurRadius, color, offsetX, offsetY, extraWidth, extraHeight, cutoutPolicy)); } /// @@ -278,7 +257,7 @@ public static T BoxShadow(this T view, float blurRadius, UIColor color, float /// The extension target. /// The shadow value. /// The view itself. - public static T BoxShadow(this T view, UIShadow shadow) where T : View + public static T BoxShadow(this T view, L.Shadow shadow) where T : View { view.SetBoxShadow(shadow); return view; diff --git a/src/Tizen.NUI/src/internal/Common/Object.cs b/src/Tizen.NUI/src/internal/Common/Object.cs index c44467b7df4..cf68612fec4 100755 --- a/src/Tizen.NUI/src/internal/Common/Object.cs +++ b/src/Tizen.NUI/src/internal/Common/Object.cs @@ -328,7 +328,7 @@ internal static int InternalRetrievingVisualPropertyVector4(HandleRef actor, int /// /// This is not thread safe. /// - internal static void InternalSetPropertyColor(HandleRef actor, int propertyType, UIColor color) + internal static void InternalSetPropertyColor(HandleRef actor, int propertyType, L.Color color) { if (actor.Handle == System.IntPtr.Zero) { @@ -349,7 +349,7 @@ internal static void InternalSetPropertyColor(HandleRef actor, int propertyType, /// /// This is not thread safe. /// - internal static UIColor InternalRetrievingVisualPropertyColor(HandleRef actor, int visualIndex, int visualPropertyIndex) + internal static L.Color InternalRetrievingVisualPropertyColor(HandleRef actor, int visualIndex, int visualPropertyIndex) { if (actor.Handle == System.IntPtr.Zero) { @@ -361,7 +361,7 @@ internal static UIColor InternalRetrievingVisualPropertyColor(HandleRef actor, i vector4.Reset(); _ = Interop.View.InternalRetrievingVisualPropertyVector4(actor, visualIndex, visualPropertyIndex, vector4.SwigCPtr); NDalicPINVOKE.ThrowExceptionIfExists(); - return new UIColor(vector4); + return new L.Color(vector4); }, actor, visualIndex, visualPropertyIndex); } diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.VideoView.cs b/src/Tizen.NUI/src/internal/Interop/Interop.VideoView.cs index 943177366eb..e84cdaa3988 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.VideoView.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.VideoView.cs @@ -66,20 +66,6 @@ internal static partial class VideoView [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_VideoView_Backward")] public static extern void Backward(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2); - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_VideoView_SetAutoRotationEnabled")] - public static extern void SetAutoRotationEnabled(global::System.Runtime.InteropServices.HandleRef jarg1, bool jarg2); - - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_VideoView_IsAutoRotationEnabled")] - [return: global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.U1)] - public static extern bool IsAutoRotationEnabled(global::System.Runtime.InteropServices.HandleRef jarg1); - - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_VideoView_SetLetterBoxEnabled")] - public static extern void SetLetterBoxEnabled(global::System.Runtime.InteropServices.HandleRef jarg1, bool jarg2); - - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_VideoView_IsLetterBoxEnabled")] - [return: global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.U1)] - public static extern bool IsLetterBoxEnabled(global::System.Runtime.InteropServices.HandleRef jarg1); - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_VideoView_FinishedSignal")] public static extern global::System.IntPtr FinishedSignal(global::System.Runtime.InteropServices.HandleRef jarg1); diff --git a/src/Tizen.NUI/src/public/BaseComponents/ControlState.cs b/src/Tizen.NUI/src/public/BaseComponents/ControlState.cs index 2ea88d3518c..b19f770dc8a 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/ControlState.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/ControlState.cs @@ -35,59 +35,59 @@ public class ControlState : IEquatable /// The All state is used in a selector class. It represents all states, so if this state is defined in a selector, the other states are ignored. /// /// 9 - public static readonly ControlState All = new ControlState(UIState.All); + public static readonly ControlState All = new ControlState(ViewState.All); /// /// Normal State. /// /// 9 - public static readonly ControlState Normal = new ControlState(UIState.Normal); + public static readonly ControlState Normal = new ControlState(ViewState.Normal); /// /// Focused State. /// /// 9 - public static readonly ControlState Focused = new ControlState(UIState.Focused); + public static readonly ControlState Focused = new ControlState(ViewState.Focused); /// /// Pressed State. /// /// 9 - public static readonly ControlState Pressed = new ControlState(UIState.Pressed); + public static readonly ControlState Pressed = new ControlState(ViewState.Pressed); /// /// Disabled State. /// /// 9 - public static readonly ControlState Disabled = new ControlState(UIState.Disabled); + public static readonly ControlState Disabled = new ControlState(ViewState.Disabled); /// /// Selected State. /// /// 9 - public static readonly ControlState Selected = new ControlState(UIState.Selected); + public static readonly ControlState Selected = new ControlState(ViewState.Selected); /// /// SelectedPressed State. /// [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly ControlState SelectedPressed = new ControlState(UIState.SelectedPressed); + public static readonly ControlState SelectedPressed = new ControlState(ViewState.SelectedPressed); /// /// DisabledSelected State. /// [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly ControlState DisabledSelected = new ControlState(UIState.DisabledSelected); + public static readonly ControlState DisabledSelected = new ControlState(ViewState.DisabledSelected); /// /// DisabledFocused State. /// [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly ControlState DisabledFocused = new ControlState(UIState.DisabledFocused); + public static readonly ControlState DisabledFocused = new ControlState(ViewState.DisabledFocused); /// /// SelectedFocused State. /// [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly ControlState SelectedFocused = new ControlState(UIState.SelectedFocused); + public static readonly ControlState SelectedFocused = new ControlState(ViewState.SelectedFocused); /// /// This is used in a selector class. It represents all other states except for states that are already defined in a selector. /// /// 9 - public static readonly ControlState Other = new ControlState(UIState.Other); + public static readonly ControlState Other = new ControlState(ViewState.Other); - readonly UIState value; + readonly ViewState value; /// @@ -96,7 +96,7 @@ public class ControlState : IEquatable [EditorBrowsable(EditorBrowsableState.Never)] public bool IsCombined => value.IsCombined; - internal ControlState(UIState value) + internal ControlState(ViewState value) { this.value = value; } @@ -111,7 +111,7 @@ internal ControlState(UIState value) /// 9 public static ControlState Create(string name) { - return new ControlState(UIState.Create(name)); + return new ControlState(ViewState.Create(name)); } /// @@ -122,7 +122,7 @@ public static ControlState Create(string name) [EditorBrowsable(EditorBrowsableState.Never)] public static ControlState Create(params ControlState[] states) { - UIState result = UIState.Normal; + ViewState result = ViewState.Normal; for (int i = 0; i < states.Length; i++) { diff --git a/src/Tizen.NUI/src/public/BaseComponents/VideoView.cs b/src/Tizen.NUI/src/public/BaseComponents/VideoView.cs index a5f88d55c67..42534a02006 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/VideoView.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/VideoView.cs @@ -447,52 +447,6 @@ public string ResourceUrl } } - /// - /// Enables auto rotation of the video based on the orientation of the video contents. - /// - /// - /// This feature is supported only when underlay is false. - /// So This property will not be set to true unless you first set underlay to false. - /// - [EditorBrowsable(EditorBrowsableState.Never)] - public bool IsAutoRotationEnabled - { - get - { - bool ret = (bool)Interop.VideoView.IsAutoRotationEnabled(SwigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - set - { - Interop.VideoView.SetAutoRotationEnabled(SwigCPtr, value); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - } - - /// - /// Enables letter box of the video based on the aspect of the video contents. - /// - /// - /// This property is supported only when underlay is false. - /// So This property will not be set to true unless you first set underlay to false. - /// - [EditorBrowsable(EditorBrowsableState.Never)] - public bool IsLetterBoxEnabled - { - get - { - bool ret = (bool)Interop.VideoView.IsLetterBoxEnabled(SwigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - set - { - Interop.VideoView.SetLetterBoxEnabled(SwigCPtr, value); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - } - /// /// Starts the video playback. /// diff --git a/src/Tizen.NUI/src/public/BaseComponents/ViewLiteProperty.cs b/src/Tizen.NUI/src/public/BaseComponents/ViewLiteProperty.cs index 3b644b70eaa..f85087a267b 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/ViewLiteProperty.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/ViewLiteProperty.cs @@ -20,7 +20,7 @@ namespace Tizen.NUI.BaseComponents public partial class View { /// NOTE This can replace SetBackgroundColor(NUI.Color) after sufficient verification - internal void SetBackgroundColor(UIColor color) + internal void SetBackgroundColor(L.Color color) { themeData?.selectorData?.ClearBackground(this); @@ -47,13 +47,10 @@ internal void SetBackgroundColor(UIColor color) Object.InternalSetPropertyMap(SwigCPtr, Property.BACKGROUND, map.SwigCPtr); } - - NotifyPropertyChanged(nameof(BackgroundColor)); - NotifyBackgroundChanged(); } /// NOTE This can replace SetInternalBoxShadowProperty() after sufficient verification - internal void SetBoxShadow(UIShadow shadow) + internal void SetBoxShadow(L.Shadow shadow) { themeData?.selectorData?.ClearShadow(this); @@ -62,7 +59,6 @@ internal void SetBoxShadow(UIShadow shadow) using var map = shadow.BuildMap(this); Object.InternalSetPropertyMap(SwigCPtr, Property.SHADOW, map.SwigCPtr); - NotifyPropertyChanged(nameof(BoxShadow)); } } } diff --git a/src/Tizen.NUI/src/public/Common/PropertyMap.cs b/src/Tizen.NUI/src/public/Common/PropertyMap.cs index 9c5c4376b1e..e18a864b776 100755 --- a/src/Tizen.NUI/src/public/Common/PropertyMap.cs +++ b/src/Tizen.NUI/src/public/Common/PropertyMap.cs @@ -338,7 +338,7 @@ public PropertyMap Append(int key, Vector2 value) /// The value to insert. /// Returns a reference to this object. [EditorBrowsable(EditorBrowsableState.Never)] - public PropertyMap Append(int key, UIVector2 value) + public PropertyMap Append(int key, L.Vector2 value) { Interop.PropertyMap.AddVector2(SwigCPtr, key, value.X, value.Y); NDalicPINVOKE.ThrowExceptionIfExists(); @@ -391,7 +391,7 @@ public PropertyMap Append(int key, Vector4 value) /// The value to insert. /// Returns a reference to this object. [EditorBrowsable(EditorBrowsableState.Never)] - public PropertyMap Append(int key, UIColor value) + public PropertyMap Append(int key, L.Color value) { Interop.PropertyMap.AddVector4(SwigCPtr, key, value.R, value.G, value.B, value.A); NDalicPINVOKE.ThrowExceptionIfExists(); @@ -406,7 +406,7 @@ public PropertyMap Append(int key, UIColor value) /// The value to insert. /// Returns a reference to this object. [EditorBrowsable(EditorBrowsableState.Never)] - public PropertyMap Append(int key, UICorner value) + public PropertyMap Append(int key, L.Corner value) { Interop.PropertyMap.AddVector4(SwigCPtr, key, value.TopLeft, value.TopRight, value.BottomRight, value.BottomLeft); NDalicPINVOKE.ThrowExceptionIfExists(); diff --git a/src/Tizen.NUI/src/public/Common/Vector4.cs b/src/Tizen.NUI/src/public/Common/Vector4.cs index 3f179cfe6d1..592a8b71ab4 100755 --- a/src/Tizen.NUI/src/public/Common/Vector4.cs +++ b/src/Tizen.NUI/src/public/Common/Vector4.cs @@ -722,9 +722,9 @@ public void Clamp(Vector4 min, Vector4 max) internal void Reset() => Reset(0, 0, 0, 0); - internal void Reset(UIColor color) => Reset(color.R, color.G, color.B, color.A); + internal void Reset(L.Color color) => Reset(color.R, color.G, color.B, color.A); - internal void Reset(UICorner corner) => Reset(corner.TopLeft, corner.TopRight, corner.BottomRight, corner.BottomLeft); + internal void Reset(L.Corner corner) => Reset(corner.TopLeft, corner.TopRight, corner.BottomRight, corner.BottomLeft); internal void Reset(float x, float y, float z, float w) { diff --git a/src/Tizen.NUI/src/public/Utility/GraphicsTypeExtensions.cs b/src/Tizen.NUI/src/public/Utility/GraphicsTypeExtensions.cs index f2bce69fe0e..69f6b22d290 100644 --- a/src/Tizen.NUI/src/public/Utility/GraphicsTypeExtensions.cs +++ b/src/Tizen.NUI/src/public/Utility/GraphicsTypeExtensions.cs @@ -88,7 +88,7 @@ public static float SpToPx(this float sp) [EditorBrowsable(EditorBrowsableState.Never)] public static float PxToDp(this float pixel) { - return GraphicsTypeManager.Instance.Dp.ConvertFromPixel(pixel); + return PxToDp(pixel); } /// @@ -100,7 +100,7 @@ public static float PxToDp(this float pixel) [EditorBrowsable(EditorBrowsableState.Never)] public static float PxToSp(this float pixel) { - return GraphicsTypeManager.Instance.Sp.ConvertFromPixel(pixel); + return PxToSp(pixel); } /// @@ -161,7 +161,7 @@ public static int SpToPx(this int sp) [EditorBrowsable(EditorBrowsableState.Never)] public static int PxToDp(this int pixel) { - return (int)PxToDp((float)pixel); + return (int)PxToDp(pixel); } /// @@ -173,7 +173,7 @@ public static int PxToDp(this int pixel) [EditorBrowsable(EditorBrowsableState.Never)] public static int PxToSp(this int pixel) { - return (int)PxToSp((float)pixel); + return (int)PxToSp(pixel); } ///