From fcd13d3ea3dfb72417adb08085bd48f39800b893 Mon Sep 17 00:00:00 2001 From: AdunFang <30402408+AdunFang@users.noreply.github.com> Date: Mon, 24 Jun 2019 18:22:28 +0800 Subject: [PATCH] [NUI] Fix memory leak (#899) --- src/Tizen.NUI/src/public/BaseComponents/View.cs | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/Tizen.NUI/src/public/BaseComponents/View.cs b/src/Tizen.NUI/src/public/BaseComponents/View.cs index 96c8d7a1c..5597b46bd 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/View.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/View.cs @@ -1294,7 +1294,20 @@ namespace Tizen.NUI.BaseComponents [EditorBrowsable(EditorBrowsableState.Never)] public static bool layoutingDisabled{get; set;} = true; - internal readonly MergedStyle _mergedStyle; + private MergedStyle mergedStyle = null; + internal MergedStyle _mergedStyle + { + get + { + if (null == mergedStyle) + { + mergedStyle = new MergedStyle(GetType(), this); + } + + return mergedStyle; + } + } + private global::System.Runtime.InteropServices.HandleRef swigCPtr; private LayoutItem _layout; // Exclusive layout assigned to this View. private int _widthPolicy = LayoutParamPolicies.WrapContent; // Layout width policy @@ -1358,7 +1371,6 @@ namespace Tizen.NUI.BaseComponents { PositionUsesPivotPoint = false; } - _mergedStyle = new MergedStyle(GetType(), this); _onWindowSendEventCallback = SendViewAddedEventToWindow; this.OnWindowSignal().Connect(_onWindowSendEventCallback); -- 2.34.1