From: kiso.chang <kiso.chang@samsung.com>
Date: Wed, 12 Oct 2022 12:02:34 +0000 (+0900)
Subject: Fix Slider size
X-Git-Tag: accepted/tizen/unified/20221013.014008~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eeba7b7375262d7be815c6ba32c7d46fc8bf766d;p=profile%2Fiot%2Fapps%2Fdotnet%2Fsettings.git

Fix Slider size

Change-Id: Icf2ad994d0ec77b9cfb19a7951dbce8800f45d32
Signed-off-by: kiso.chang <kiso.chang@samsung.com>
---

diff --git a/SettingMain/SettingContent_Storage.cs b/SettingMain/SettingContent_Storage.cs
index b53bcff..0343bec 100644
--- a/SettingMain/SettingContent_Storage.cs
+++ b/SettingMain/SettingContent_Storage.cs
@@ -238,18 +238,14 @@ namespace SettingMain
                 long sizeCache = sizeinfo.CacheSize;
                 Tizen.Log.Debug("NUI", "GetAppCacheSize() Task complete!!,  " + sizeApp.ToString() + ", " + sizeCache.ToString());
 
-                if (mAppsItem)
+                if (mAppsItem != null)
                 {
                     mAppsItem.SubText = GetMediaSizeString((double)sizeApp);
-                    //mAppsItem.Hide();
-                    //mAppsItem.Show();
                 }
-                if (mCacheItem) {
+                if (mCacheItem != null) {
                     mCacheItem.SubText = GetMediaSizeString((double)sizeCache);
-                    //mCacheItem.Hide();
-                    //mCacheItem.Show();
                 }
-            });
+            }, TaskScheduler.FromCurrentSynchronizationContext());
         }
 
         public void VconfChanged_SDCardStatus(IntPtr node, IntPtr userData)
diff --git a/SettingMain/SettingItemCreator.cs b/SettingMain/SettingItemCreator.cs
index ad4ea30..b9cf8db 100644
--- a/SettingMain/SettingItemCreator.cs
+++ b/SettingMain/SettingItemCreator.cs
@@ -35,7 +35,7 @@ namespace SettingMain
         public SliderItem()
             : base()
         {
-            
+            WidthSpecification = LayoutParamPolicies.MatchParent;
         }
 
     }
@@ -266,7 +266,6 @@ namespace SettingMain
 
             var item = new SliderItem
             {
-                //WidthResizePolicy = ResizePolicyType.FillToParent,
                 Name = name,
                 Layout = linearLayout
             };
@@ -282,6 +281,8 @@ namespace SettingMain
 
                 item.mSlider = new Slider()
                 {
+                    WidthResizePolicy = ResizePolicyType.FillToParent,
+
                     Margin = new Extents(10, 10, 5,5),
 
                     TrackThickness = 5,
@@ -296,15 +297,6 @@ namespace SettingMain
 
                 };
                 item.Add(item.mSlider);
-
-#if true
-                var rightpadding = new View()
-                {
-                    Size2D = new Size2D(10, 5),
-                };
-                item.Add(rightpadding);
-#endif
-
             }
             return item;
         }
diff --git a/SettingView/SettingMenuManager.cs b/SettingView/SettingMenuManager.cs
index e38ce63..a8d2d92 100644
--- a/SettingView/SettingMenuManager.cs
+++ b/SettingView/SettingMenuManager.cs
@@ -160,9 +160,9 @@ namespace SettingView
             if (widgetview == null)
                 widgetview = WidgetViewManager.Instance.AddWidget(widgetid, encodedBundle, window.Size.Width, window.Size.Height, 0.0f);
 #else
+            Tizen.Log.Debug("NUI", string.Format("[SettingView]  window.Size.Width : {0}, window.Size.Height : {1}", window.Size.Width, window.Size.Height));
             WidgetView widgetview = WidgetViewManager.Instance.AddWidget(widgetid, encodedBundle, window.Size.Width, window.Size.Height, 0.0f);
 #endif
-
             if (widgetview != null)
             {
                 if (string.IsNullOrEmpty(widgetview.InstanceID))
diff --git a/SettingView/SettingView.cs b/SettingView/SettingView.cs
index 2d8c6b5..6acbaf0 100644
--- a/SettingView/SettingView.cs
+++ b/SettingView/SettingView.cs
@@ -104,7 +104,12 @@ namespace SettingView
         {
             if (e.Key.State == Key.StateType.Down && (e.Key.KeyPressedName == "XF86Back" || e.Key.KeyPressedName == "Escape"))
             {
-                Exit();
+                var window = sender as Window;
+                Navigator navigator = window.GetDefaultNavigator();
+                if (navigator.PageCount > 1)
+                    SettingMenuManager.PopWidget(window);
+                else
+                    Exit();
             }
         }
         private void OnTouchEvent(object source, Window.TouchEventArgs e)