From: Jaehwan Kim <jae.hwan.kim@samsung.com>
Date: Tue, 4 Jun 2013 12:46:55 +0000 (+0900)
Subject: [Toolbar] Fix some bug about icon_file_set.
X-Git-Tag: submit/tizen/20131004.114939~234
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a1467090d14ab0895f16bb7007c1f0388d927f33;p=platform%2Fcore%2Fuifw%2Fefl-theme-tizen.git

[Toolbar] Fix some bug about icon_file_set.

Change-Id: Ided0df7b2400c07eef3690f8ab6babbbbb1194a9
---

diff --git a/themes/widgets/toolbar.edc b/themes/widgets/toolbar.edc
index 254929b..200c97a 100644
--- a/themes/widgets/toolbar.edc
+++ b/themes/widgets/toolbar.edc
@@ -1494,7 +1494,7 @@ group { name: "elm/toolbar/item/tabbar";
          scale: 1;
          clip_to: "elm.text.clipper";
          description { state: "default" 0.0;
-            visible: 1;
+            visible: 0;
             rel1 {
                relative: 1.0 1.0;
                to_x: "padding_after_icon";
@@ -2085,7 +2085,6 @@ group { name: "elm/toolbar/item/tabbar";
          action: STATE_SET "animation" 0.0;
          target: "elm.text.clipper";
          target: "elm.text_new.clipper";
-         transition: LINEAR 0.2;
          after: "label_set,animation,done";
       }
       program { name: "label_set,animation,done";
@@ -2120,7 +2119,6 @@ group { name: "elm/toolbar/item/tabbar";
          target: "elm.icon_new.clipper";
          target: "elm.icon.proxy.clipper";
          target: "elm.icon_new.proxy.clipper";
-         transition: LINEAR 0.2;
          after: "icon_set,animation,done";
       }
       program { name: "icon_set,animation,done";
@@ -2188,7 +2186,7 @@ group { name: "elm/toolbar/item/tabbar";
             new st[31];
             new Float:vl;
             get_state(PART:"elm.swallow.icon", st, 30, vl);
-            if (!strcmp(st, "visible"))
+            if (strcmp(st, "default"))
               {
                  set_state(PART:"elm.swallow.icon", "icononly", 0.0);
                  set_state(PART:"icon_rect", "icononly", 0.0);
@@ -2205,7 +2203,7 @@ group { name: "elm/toolbar/item/tabbar";
             new st[31];
             new Float:vl;
             get_state(PART:"elm.text", st, 30, vl);
-            if (!strncmp(st, "visible", 7))
+            if (strncmp(st, "default", 7))
               {
                  set_state(PART:"elm.swallow.icon", "visible", 0.0);
                  set_state(PART:"icon_rect", "visible", 0.0);