projects / platform / core / uifw / dali-demo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fda6bc6)
Updated shadow-button transition demo resources 93/117093/3
authorDavid Steele <david.steele@samsung.com>
Thu, 16 Feb 2017 16:46:11 +0000 (16:46 +0000)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Wed, 8 Mar 2017 18:21:01 +0000 (10:21 -0800)
Fixed the sizes and substates for disabling/enabling the shadow
button

Change-Id: I0fff3e76acbde962c0d958881f5e92aa2a8478ff
Signed-off-by: David Steele <david.steele@samsung.com>
resources/style/mobile/style-example-theme-one.json.in patch | blob | history
resources/style/style-example-theme-one.json.in patch | blob | history

diff --git a/resources/style/mobile/style-example-theme-one.json.in b/resources/style/mobile/style-example-theme-one.json.in
index 53bbcde..67ade2d 100644 (file)
--- a/resources/style/mobile/style-example-theme-one.json.in
+++ b/resources/style/mobile/style-example-theme-one.json.in
@@ -125,19 +125,21 @@
           {
             "backgroundVisual":{
               "visualType":"IMAGE",
-              "url":"{STYLE_DIR}/images/shadowButtonBg.9.png"
+              "url":"{STYLE_DIR}/images/shadowButtonBg.9.png",
+              "depthIndex":0
             },
 
             "checkboxBgVisual":{
               "visualType":"IMAGE",
               "url":"{STYLE_DIR}/images/CheckBg.png",
               "transform":{
-                "size":[0.09, 0.28],
+                "size":[0.12, 0.37],
                 "offset":[30,0],
                 "offsetSizeMode":[1,1,0,0],
                 "origin":"CENTER_BEGIN",
                 "anchorPoint":"CENTER_BEGIN"
-              }
+              },
+              "depthIndex":1
             },
 
             "labelVisual":{
@@ -147,14 +149,15 @@
               "horizontalAlignment":"END",
               "verticalAlignment":"CENTER",
               "textColor":[1,1,1,1],
-              "mixColor":[0, 0, 0, 1],
+              "mixColor":[0,0,0,1],
               "transform":{
                 "size":[0.9, 0.9],
                 "offset":[-30,0],
                 "offsetSizeMode":[1,1,0,0],
                 "origin":"CENTER_END",
                 "anchorPoint":"CENTER_END"
-              }
+              },
+              "depthIndex":1
             }
           },
 
@@ -168,12 +171,13 @@
                   "visualType":"IMAGE",
                   "url":"{STYLE_DIR}/images/Tick.png",
                   "transform":{
-                    "size":[0.09, 0.28],
+                    "size":[0.12, 0.37],
                     "offset":[30,0],
                     "offsetSizeMode":[1,1,0,0],
                     "origin":"CENTER_BEGIN",
                     "anchorPoint":"CENTER_BEGIN"
-                  }
+                  },
+                  "depthIndex":2
                 }
               },
               "entryTransition":
@@ -261,7 +265,8 @@
                 "offsetSizeMode":[1,1,0,0],
                 "origin":"CENTER_BEGIN",
                 "anchorPoint":"CENTER_BEGIN"
-              }
+              },
+              "depthIndex":0
             },
 
             "checkboxFgVisual":{
@@ -273,7 +278,8 @@
                 "offsetSizeMode":[1,1,0,0],
                 "origin":"CENTER_BEGIN",
                 "anchorPoint":"CENTER_BEGIN"
-              }
+              },
+              "depthIndex":1
             },
 
             "labelVisual":{
@@ -290,7 +296,32 @@
                 "offsetSizeMode":[1,1,0,0],
                 "origin":"CENTER_END",
                 "anchorPoint":"CENTER_END"
+              },
+              "depthIndex":1
+            }
+          },
+          "states":
+          {
+            "CHECKED":
+            {
+              "visuals":
+              {
+                "checkboxFgVisual":{
+                  "visualType":"IMAGE",
+                  "url":"{STYLE_DIR}/images/Tick.png",
+                  "transform":{
+                    "size":[0.09, 0.28],
+                    "offset":[30,0],
+                    "offsetSizeMode":[1,1,0,0],
+                    "origin":"CENTER_BEGIN",
+                    "anchorPoint":"CENTER_BEGIN"
+                  },
+                  "depthIndex":2
+                }
               }
+            },
+            "UNCHECKED":
+            {
             }
           }
         }
@@ -312,6 +343,7 @@
           "from":"DISABLED",
           "to":"NORMAL",
           "visualName":"*",
+          "effect":"CROSSFADE",
           "animator":
           {
             "alphaFunction":"EASE_OUT_BACK",
@@ -333,6 +365,7 @@
           "from":"NORMAL",
           "to":"DISABLED",
           "visualName":"*",
+          "effect":"CROSSFADE",
           "animator":
           {
             "alphaFunction":"EASE_OUT_BACK",
diff --git a/resources/style/style-example-theme-one.json.in b/resources/style/style-example-theme-one.json.in
index d495a3d..eb10fa3 100644 (file)
--- a/resources/style/style-example-theme-one.json.in
+++ b/resources/style/style-example-theme-one.json.in
@@ -125,19 +125,21 @@
           {
             "backgroundVisual":{
               "visualType":"IMAGE",
-              "url":"{STYLE_DIR}/images/shadowButtonBg.9.png"
+              "url":"{STYLE_DIR}/images/shadowButtonBg.9.png",
+              "depthIndex":0
             },
 
             "checkboxBgVisual":{
               "visualType":"IMAGE",
               "url":"{STYLE_DIR}/images/CheckBg.png",
               "transform":{
-                "size":[0.09, 0.28],
+                "size":[0.12, 0.37],
                 "offset":[30,0],
                 "offsetSizeMode":[1,1,0,0],
                 "origin":"CENTER_BEGIN",
                 "anchorPoint":"CENTER_BEGIN"
-              }
+              },
+              "depthIndex":1
             },
 
             "labelVisual":{
@@ -147,14 +149,15 @@
               "horizontalAlignment":"END",
               "verticalAlignment":"CENTER",
               "textColor":[1,1,1,1],
-              "mixColor":[0, 0, 0, 1],
+              "mixColor":[0,0,0,1],
               "transform":{
                 "size":[0.9, 0.9],
                 "offset":[-30,0],
                 "offsetSizeMode":[1,1,0,0],
                 "origin":"CENTER_END",
                 "anchorPoint":"CENTER_END"
-              }
+              },
+              "depthIndex":1
             }
           },
 
@@ -168,12 +171,13 @@
                   "visualType":"IMAGE",
                   "url":"{STYLE_DIR}/images/Tick.png",
                   "transform":{
-                    "size":[0.09, 0.28],
+                    "size":[0.12, 0.37],
                     "offset":[30,0],
                     "offsetSizeMode":[1,1,0,0],
                     "origin":"CENTER_BEGIN",
                     "anchorPoint":"CENTER_BEGIN"
-                  }
+                  },
+                  "depthIndex":2
                 }
               },
               "entryTransition":
@@ -261,7 +265,8 @@
                 "offsetSizeMode":[1,1,0,0],
                 "origin":"CENTER_BEGIN",
                 "anchorPoint":"CENTER_BEGIN"
-              }
+              },
+              "depthIndex":0
             },
 
             "checkboxFgVisual":{
@@ -273,7 +278,8 @@
                 "offsetSizeMode":[1,1,0,0],
                 "origin":"CENTER_BEGIN",
                 "anchorPoint":"CENTER_BEGIN"
-              }
+              },
+              "depthIndex":1
             },
 
             "labelVisual":{
@@ -290,7 +296,32 @@
                 "offsetSizeMode":[1,1,0,0],
                 "origin":"CENTER_END",
                 "anchorPoint":"CENTER_END"
+              },
+              "depthIndex":1
+            }
+          },
+          "states":
+          {
+            "CHECKED":
+            {
+              "visuals":
+              {
+                "checkboxFgVisual":{
+                  "visualType":"IMAGE",
+                  "url":"{STYLE_DIR}/images/Tick.png",
+                  "transform":{
+                    "size":[0.09, 0.28],
+                    "offset":[30,0],
+                    "offsetSizeMode":[1,1,0,0],
+                    "origin":"CENTER_BEGIN",
+                    "anchorPoint":"CENTER_BEGIN"
+                  },
+                  "depthIndex":2
+                }
               }
+            },
+            "UNCHECKED":
+            {
             }
           }
         }
@@ -312,6 +343,7 @@
           "from":"DISABLED",
           "to":"NORMAL",
           "visualName":"*",
+          "effect":"CROSSFADE",
           "animator":
           {
             "alphaFunction":"EASE_OUT_BACK",
@@ -333,6 +365,7 @@
           "from":"NORMAL",
           "to":"DISABLED",
           "visualName":"*",
+          "effect":"CROSSFADE",
           "animator":
           {
             "alphaFunction":"EASE_OUT_BACK",
Domain: Graphics System / DALi;