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 b53bcff051a13fc4690fdf893f0f4168b1864020..0343bec73a02d4497517275867be93d9b63c87d5 100644 (file)
--- a/SettingMain/SettingContent_Storage.cs
+++ b/SettingMain/SettingContent_Storage.cs
@@ -238,18 +238,14 @@ namespace SettingMain
                 long sizeCache = sizeinfo.CacheSize;\r
                 Tizen.Log.Debug("NUI", "GetAppCacheSize() Task complete!!,  " + sizeApp.ToString() + ", " + sizeCache.ToString());\r
 \r
-                if (mAppsItem)\r
+                if (mAppsItem != null)\r
                 {\r
                     mAppsItem.SubText = GetMediaSizeString((double)sizeApp);\r
-                    //mAppsItem.Hide();\r
-                    //mAppsItem.Show();\r
                 }\r
-                if (mCacheItem) {\r
+                if (mCacheItem != null) {\r
                     mCacheItem.SubText = GetMediaSizeString((double)sizeCache);\r
-                    //mCacheItem.Hide();\r
-                    //mCacheItem.Show();\r
                 }\r
-            });\r
+            }, TaskScheduler.FromCurrentSynchronizationContext());\r
         }\r
 \r
         public void VconfChanged_SDCardStatus(IntPtr node, IntPtr userData)\r

diff --git a/SettingMain/SettingItemCreator.cs b/SettingMain/SettingItemCreator.cs
index ad4ea30ff00deb26e3fbafefb95de6ee0989a207..b9cf8dbcb28ff424c089f2c4307fb070365695f6 100644 (file)
--- a/SettingMain/SettingItemCreator.cs
+++ b/SettingMain/SettingItemCreator.cs
@@ -35,7 +35,7 @@ namespace SettingMain
         public SliderItem()\r
             : base()\r
         {\r
-            \r
+            WidthSpecification = LayoutParamPolicies.MatchParent;\r
         }\r
 \r
     }\r
@@ -266,7 +266,6 @@ namespace SettingMain
 \r
             var item = new SliderItem\r
             {\r
-                //WidthResizePolicy = ResizePolicyType.FillToParent,\r
                 Name = name,\r
                 Layout = linearLayout\r
             };\r
@@ -282,6 +281,8 @@ namespace SettingMain
 \r
                 item.mSlider = new Slider()\r
                 {\r
+                    WidthResizePolicy = ResizePolicyType.FillToParent,\r
+\r
                     Margin = new Extents(10, 10, 5,5),\r
 \r
                     TrackThickness = 5,\r
@@ -296,15 +297,6 @@ namespace SettingMain
 \r
                 };\r
                 item.Add(item.mSlider);\r
-\r
-#if true\r
-                var rightpadding = new View()\r
-                {\r
-                    Size2D = new Size2D(10, 5),\r
-                };\r
-                item.Add(rightpadding);\r
-#endif\r
-\r
             }\r
             return item;\r
         }\r

diff --git a/SettingView/SettingMenuManager.cs b/SettingView/SettingMenuManager.cs
index e38ce6383d63094cabafba4f6169980f8bfa5a58..a8d2d928a731fa3a3e006cb18f8b6e3b485ff119 100644 (file)
--- a/SettingView/SettingMenuManager.cs
+++ b/SettingView/SettingMenuManager.cs
@@ -160,9 +160,9 @@ namespace SettingView
             if (widgetview == null)\r
                 widgetview = WidgetViewManager.Instance.AddWidget(widgetid, encodedBundle, window.Size.Width, window.Size.Height, 0.0f);\r
 #else\r
+            Tizen.Log.Debug("NUI", string.Format("[SettingView]  window.Size.Width : {0}, window.Size.Height : {1}", window.Size.Width, window.Size.Height));\r
             WidgetView widgetview = WidgetViewManager.Instance.AddWidget(widgetid, encodedBundle, window.Size.Width, window.Size.Height, 0.0f);\r
 #endif\r
-\r
             if (widgetview != null)\r
             {\r
                 if (string.IsNullOrEmpty(widgetview.InstanceID))\r

diff --git a/SettingView/SettingView.cs b/SettingView/SettingView.cs
index 2d8c6b5cb96ba90934eaceae3aa42856b6589b0e..6acbaf07e3ee9c44523cbf5ad14b2c0b254f0eed 100644 (file)
--- a/SettingView/SettingView.cs
+++ b/SettingView/SettingView.cs
@@ -104,7 +104,12 @@ namespace SettingView
         {\r
             if (e.Key.State == Key.StateType.Down && (e.Key.KeyPressedName == "XF86Back" || e.Key.KeyPressedName == "Escape"))\r
             {\r
-                Exit();\r
+                var window = sender as Window;\r
+                Navigator navigator = window.GetDefaultNavigator();\r
+                if (navigator.PageCount > 1)\r
+                    SettingMenuManager.PopWidget(window);\r
+                else\r
+                    Exit();\r
             }\r
         }\r
         private void OnTouchEvent(object source, Window.TouchEventArgs e)\r