projects / platform / core / uifw / dali-toolkit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 1a34781)
Merge "Added default styles for ToggleButton" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 6 Feb 2017 13:53:03 +0000 (05:53 -0800)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Mon, 6 Feb 2017 13:53:03 +0000 (05:53 -0800)
dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json patch | blob | history
dali-toolkit/styles/480x800/dali-toolkit-default-theme.json patch | blob | history

diff --git a/dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json b/dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json
index 1809436..3ad99cd 100644 (file)
--- a/dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json
+++ b/dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json
@@ -237,6 +237,10 @@
          "url": "{DALI_IMAGE_DIR}button-disabled.9.png"
        }
     },
+    "ToggleButton":
+    {
+      "styles":["Button"]
+    },
     "CheckBoxButton":
     {
       "styles":["Button"],
diff --git a/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json b/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
index 0684889..f7b49db 100644 (file)
--- a/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
+++ b/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
@@ -284,6 +284,10 @@
          "url": "{DALI_IMAGE_DIR}button-disabled.9.png"
        }
     },
+    "ToggleButton":
+    {
+      "styles":["Button"]
+    },
     "CheckBoxButton":
     {
       "styles":["Button"],
Domain: Graphics System / DALi;