From: zhouhao02 Date: Tue, 31 Oct 2023 05:11:23 +0000 (+0800) Subject: [NUI] Fix some SVACE issues. X-Git-Tag: submit/tizen_8.0/20231106.124429~1^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b4adcb7f44cf23c48f924f53c61d335bd055e339;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git [NUI] Fix some SVACE issues. --- diff --git a/src/Tizen.NUI/src/internal/Layouting/LayoutController.cs b/src/Tizen.NUI/src/internal/Layouting/LayoutController.cs index 4373ee1bc..e4c2872ac 100755 --- a/src/Tizen.NUI/src/internal/Layouting/LayoutController.cs +++ b/src/Tizen.NUI/src/internal/Layouting/LayoutController.cs @@ -225,7 +225,8 @@ namespace Tizen.NUI // Parent not a View so assume it's a Layer which is the size of the window. private void MeasureAndLayout(View root, float parentWidth, float parentHeight) { - if (root.Layout != null) + var layout = root.Layout; + if (layout != null) { // Determine measure specification for root. // The root layout policy could be an exact size, be match parent or wrap children. @@ -237,7 +238,7 @@ namespace Tizen.NUI var widthMode = GetMode(root.WidthSpecification); var heightMode = GetMode(root.HeightSpecification); - if (root.Layout.NeedsLayout(widthSize, heightSize, widthMode, heightMode)) + if (layout.NeedsLayout(widthSize, heightSize, widthMode, heightMode)) { var widthSpec = CreateMeasureSpecification(widthSize, widthMode); var heightSpec = CreateMeasureSpecification(heightSize, heightMode); @@ -251,8 +252,8 @@ namespace Tizen.NUI // Start at root which was just measured. PerformLayout(root, new LayoutLength(positionX), new LayoutLength(positionY), - new LayoutLength(positionX) + root.Layout.MeasuredWidth.Size, - new LayoutLength(positionY) + root.Layout.MeasuredHeight.Size); + new LayoutLength(positionX) + layout.MeasuredWidth.Size, + new LayoutLength(positionY) + layout.MeasuredHeight.Size); } } diff --git a/src/Tizen.NUI/src/public/Window/Window.cs b/src/Tizen.NUI/src/public/Window/Window.cs index ef73ba23e..8451a6b17 100755 --- a/src/Tizen.NUI/src/public/Window/Window.cs +++ b/src/Tizen.NUI/src/public/Window/Window.cs @@ -2481,7 +2481,7 @@ namespace Tizen.NUI { bool ret = Interop.Window.GetFullScreen(SwigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; + return ret; } ///