Fix svace issues.

Change-Id: I43842eb7db8702484b5db8f7943129c6647371ce
Signed-off-by: Ernest Borowski <e.borowski@samsung.com>

diff --git a/SettingCertificates/SettingCertificates/WidgetSettingCertificates.cs b/SettingCertificates/SettingCertificates/WidgetSettingCertificates.cs
index 6e36e09b113912fc732551e22786f89815e35ba9..3457d5a0f0155779b446476f3110b5f89ada5642 100644 (file)
--- a/SettingCertificates/SettingCertificates/WidgetSettingCertificates.cs
+++ b/SettingCertificates/SettingCertificates/WidgetSettingCertificates.cs
@@ -89,7 +89,8 @@ namespace SettingCertificates
             ContentPage firstPage = CreateContentPage(Resources.IDS_ST_HEADER_MANAGE_CERTIFICATES_ABB/*"Manage certificates"*/, content);
             firstPage.AppBar.AutoNavigationContent = false;
 
-            var navigationContent = new Button(((AppBarStyle)ThemeManager.GetStyle("Tizen.NUI.Components.AppBar")).BackButton);
+            ViewStyle style = ThemeManager.GetStyle("Tizen.NUI.Components.AppBar");
+            var navigationContent = new Button(((AppBarStyle)style).BackButton);
             navigationContent.Clicked += (o, e) =>
             {
                 Bundle bundle = new Bundle();
@@ -97,6 +98,7 @@ namespace SettingCertificates
                 SetContentInfo(bundle.Encode());
             };
             firstPage.AppBar.NavigationContent = navigationContent;
+            style.Dispose();
 
             return firstPage;
         }

diff --git a/SettingCertificates/SettingView/SettingViewBorder.cs b/SettingCertificates/SettingView/SettingViewBorder.cs
index dcf5802d9c130b91bf124ab0b7c833eaf07346b1..8bcf5a20577de0574a7af5c90c27304b42a62b7f 100644 (file)
--- a/SettingCertificates/SettingView/SettingViewBorder.cs
+++ b/SettingCertificates/SettingView/SettingViewBorder.cs
@@ -226,12 +226,15 @@ namespace SettingView
         {
             if (e.Touch.GetState(0) == PointStateType.Up)
             {
-                if (BorderWindow.IsMaximized() == true)
+                if (BorderWindow != null)
                 {
-                    BorderWindow.Maximize(false);
+                    if (BorderWindow.IsMaximized() == true)
+                    {
+                        BorderWindow.Maximize(false);
+                    }
+                    preWinPositonSize = BorderWindow.WindowPositionSize;
+                    BorderWindow.WindowPositionSize = new Rectangle(preWinPositonSize.X, preWinPositonSize.Y, 500, 0);
                 }
-                preWinPositonSize = BorderWindow.WindowPositionSize;
-                BorderWindow.WindowPositionSize = new Rectangle(preWinPositonSize.X, preWinPositonSize.Y, 500, 0);
             }
             return true;
         }

diff --git a/packaging/org.tizen.cssetting-certificates-1.0.0.tpk b/packaging/org.tizen.cssetting-certificates-1.0.0.tpk
index 40a29680303e65b5a02def29d654e2d5e0e75292..a6ddc179b3253c9f54048fee6790c277c657ab36 100644 (file)
Binary files a/packaging/org.tizen.cssetting-certificates-1.0.0.tpk and b/packaging/org.tizen.cssetting-certificates-1.0.0.tpk differ