projects / platform / upstream / elementary.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 25c01e0)
theme fix - fix disabled check, radio, toolbar with no label or icon
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>
Mon, 7 Jul 2014 07:58:00 +0000 (16:58 +0900)
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>
Mon, 7 Jul 2014 07:58:00 +0000 (16:58 +0900)
data/themes/edc/elm/button.edc patch | blob | history
data/themes/edc/elm/check.edc patch | blob | history
data/themes/edc/elm/radio.edc patch | blob | history
data/themes/edc/elm/toolbar.edc patch | blob | history
src/bin/test_check.c patch | blob | history

diff --git a/data/themes/edc/elm/button.edc b/data/themes/edc/elm/button.edc
index 56173fff4d829e68b51097a725cda920fc2583f8..46f58b4a783f2e97ddd9e61ae4539c9ddbb41236 100644 (file)
--- a/data/themes/edc/elm/button.edc
+++ b/data/themes/edc/elm/button.edc
@@ -55,11 +55,19 @@ group { name: "elm/button/base/default";
                set_state(PART:"event", "disabled", 0.0);
             }
          } else {
-            set_state(PART:"elm.swallow.content", "default", 0.0);
-            set_state(PART:"sizer.content", "default", 0.0);
-            set_state(PART:"elm.text", "default", 0.0);
-            set_state(PART:"icon_clip", "default", 0.0);
-            set_state(PART:"event", "default", 0.0);
+            if (!d) {
+               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"sizer.content", "default", 0.0);
+               set_state(PART:"elm.text", "icononly", 0.0);
+               set_state(PART:"icon_clip", "default", 0.0);
+               set_state(PART:"event", "default", 0.0);
+            } else {
+               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"sizer.content", "default", 0.0);
+               set_state(PART:"elm.text", "icononly", 0.0);
+               set_state(PART:"icon_clip", "disabled", 0.0);
+               set_state(PART:"event", "disabled", 0.0);
+            }
          }
       }
    }
@@ -355,12 +363,21 @@ group { name: "elm/button/base/anchor";
                set_state(PART:"event", "disabled", 0.0);
             }
          } else {
-            set_state(PART:"elm.swallow.content", "default", 0.0);
-            set_state(PART:"sizer.content", "default", 0.0);
-            set_state(PART:"elm.text", "default", 0.0);
-            set_state(PART:"icon_clip", "default", 0.0);
-            set_state(PART:"bar", "default", 0.0);
-            set_state(PART:"event", "default", 0.0);
+            if (!d) {
+               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"sizer.content", "default", 0.0);
+               set_state(PART:"elm.text", "icononly", 0.0);
+               set_state(PART:"icon_clip", "default", 0.0);
+               set_state(PART:"bar", "default", 0.0);
+               set_state(PART:"event", "default", 0.0);
+            } else {
+               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"sizer.content", "default", 0.0);
+               set_state(PART:"elm.text", "icononly", 0.0);
+               set_state(PART:"icon_clip", "disabled", 0.0);
+               set_state(PART:"bar", "disabled", 0.0);
+               set_state(PART:"event", "disabled", 0.0);
+            }
          }
       }
    }
@@ -936,11 +953,19 @@ group { name: "elm/button/base/hoversel_vertical_entry/default";
                set_state(PART:"event", "disabled", 0.0);
             }
          } else {
-            set_state(PART:"elm.swallow.content", "default", 0.0);
-            set_state(PART:"sizer.content", "default", 0.0);
-            set_state(PART:"elm.text", "default", 0.0);
-            set_state(PART:"icon_clip", "default", 0.0);
-            set_state(PART:"event", "default", 0.0);
+            if (!d) {
+               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"sizer.content", "default", 0.0);
+               set_state(PART:"elm.text", "icononly", 0.0);
+               set_state(PART:"icon_clip", "default", 0.0);
+               set_state(PART:"event", "default", 0.0);
+            } else {
+               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"sizer.content", "default", 0.0);
+               set_state(PART:"elm.text", "icononly", 0.0);
+               set_state(PART:"icon_clip", "disabled", 0.0);
+               set_state(PART:"event", "disabled", 0.0);
+            }
          }
       }
    }
diff --git a/data/themes/edc/elm/check.edc b/data/themes/edc/elm/check.edc
index 6338828a4e17902a338feb541d8956e24b975ad4..47c3d0a9edae5811b42215fc14a592f4ce9852cf 100644 (file)
--- a/data/themes/edc/elm/check.edc
+++ b/data/themes/edc/elm/check.edc
@@ -65,6 +65,24 @@ group { name: "elm/check/base/default";
                set_state(PART:"clip", "disabled", 0.0);
                set_state(PART:"event", "disabled", 0.0);
             }
+         } else {
+            if (!d) {
+               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"sizer.content", "default", 0.0);
+               set_state(PART:"elm.text", "default", 0.0);
+               set_state(PART:"shadow", "default", 0.0);
+               set_state(PART:"base", "default", 0.0);
+               set_state(PART:"clip", "default", 0.0);
+               set_state(PART:"event", "default", 0.0);
+            } else {
+               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"sizer.content", "default", 0.0);
+               set_state(PART:"elm.text", "default", 0.0);
+               set_state(PART:"shadow", "disabled", 0.0);
+               set_state(PART:"base", "disabled", 0.0);
+               set_state(PART:"clip", "disabled", 0.0);
+               set_state(PART:"event", "disabled", 0.0);
+            }
          }
       }
    }
@@ -405,6 +423,32 @@ group { name: "elm/check/base/toggle";
                set_state(PART:"onrect", "disabled", 0.0);
                set_state(PART:"offrect", "disabled", 0.0);
             }
+         } else {
+            if (!d) {
+               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"sizer.content", "default", 0.0);
+               set_state(PART:"elm.text", "default", 0.0);
+               set_state(PART:"shadow", "default", 0.0);
+               set_state(PART:"clip", "default", 0.0);
+               set_state(PART:"event", "default", 0.0);
+               set_state(PART:"event2", "default", 0.0);
+               set_state(PART:"elm.ontext", "default", 0.0);
+               set_state(PART:"elm.offtext", "default", 0.0);
+               set_state(PART:"onrect", "default", 0.0);
+               set_state(PART:"offrect", "default", 0.0);
+            } else {
+               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"sizer.content", "default", 0.0);
+               set_state(PART:"elm.text", "default", 0.0);
+               set_state(PART:"shadow", "disabled", 0.0);
+               set_state(PART:"clip", "disabled", 0.0);
+               set_state(PART:"event", "disabled", 0.0);
+               set_state(PART:"event2", "disabled", 0.0);
+               set_state(PART:"elm.ontext", "disabled", 0.0);
+               set_state(PART:"elm.offtext", "disabled", 0.0);
+               set_state(PART:"onrect", "disabled", 0.0);
+               set_state(PART:"offrect", "disabled", 0.0);
+            }
          }
       }
    }
diff --git a/data/themes/edc/elm/radio.edc b/data/themes/edc/elm/radio.edc
index 5ddb1efd72c9ca52ada41795f248816bbb1e44e6..26ea09e42cd0552beb79cc7446912633ef432e01 100644 (file)
--- a/data/themes/edc/elm/radio.edc
+++ b/data/themes/edc/elm/radio.edc
@@ -59,6 +59,22 @@ group { name: "elm/radio/base/default";
                set_state(PART:"clip", "disabled", 0.0);
                set_state(PART:"event", "disabled", 0.0);
             }
+         } else {
+            if (!d) {
+               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"sizer.content", "default", 0.0);
+               set_state(PART:"elm.text", "default", 0.0);
+               set_state(PART:"inset", "default", 0.0);
+               set_state(PART:"clip", "default", 0.0);
+               set_state(PART:"event", "default", 0.0);
+            } else {
+               set_state(PART:"elm.swallow.content", "default", 0.0);
+               set_state(PART:"sizer.content", "default", 0.0);
+               set_state(PART:"elm.text", "default", 0.0);
+               set_state(PART:"inset", "disabled", 0.0);
+               set_state(PART:"clip", "disabled", 0.0);
+               set_state(PART:"event", "disabled", 0.0);
+            }
          }
       }
    }
diff --git a/data/themes/edc/elm/toolbar.edc b/data/themes/edc/elm/toolbar.edc
index 12e0c5cb3bd9b51144d3036e485c184c607f50af..f9303f6793a158b58dcddc4ae7fd365b3706a254 100644 (file)
--- a/data/themes/edc/elm/toolbar.edc
+++ b/data/themes/edc/elm/toolbar.edc
@@ -418,10 +418,17 @@ group { name: "elm/toolbar/item/default";
                set_state(PART:"label2", "noicon_disabled", 0.0);
             }
          } else {
-            set_state(PART:"elm.swallow.icon", "default", 0.0);
-            set_state(PART:"icon_clip", "default", 0.0);
-            set_state(PART:"elm.text", "default", 0.0);
-            set_state(PART:"label2", "default", 0.0);
+            if (!d) {
+               set_state(PART:"elm.swallow.icon", "noicon", 0.0);
+               set_state(PART:"icon_clip", "default", 0.0);
+               set_state(PART:"elm.text", "noicon", 0.0);
+               set_state(PART:"label2", "noicon", 0.0);
+            } else {
+               set_state(PART:"elm.swallow.icon", "noicon", 0.0);
+               set_state(PART:"icon_clip", "disabled", 0.0);
+               set_state(PART:"elm.text", "noicon_disabled", 0.0);
+               set_state(PART:"label2", "noicon_disabled", 0.0);
+            }
          }
       }
    }
diff --git a/src/bin/test_check.c b/src/bin/test_check.c
index 93eea1040582bf28707d5c85714b0060e8ecfdd1..4ed72ee545ba1b6dae87716804bbb5e92aa527ba 100644 (file)
--- a/src/bin/test_check.c
+++ b/src/bin/test_check.c
@@ -95,6 +95,13 @@ test_check(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_inf
    evas_object_show(ck);
    evas_object_show(ic);
 
+   ck = elm_check_add(win);
+   evas_object_size_hint_weight_set(ck, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(ck, EVAS_HINT_FILL, 0.5);
+   elm_box_pack_end(bx, ck);
+   elm_object_disabled_set(ck, EINA_TRUE);
+   evas_object_show(ck);
+   
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
    elm_image_file_set(ic, buf, NULL);
Domain: UI Framework / EFL;