From 4f485d9ece981723312ab5f64490e3ad969c8d76 Mon Sep 17 00:00:00 2001 From: raster Date: Thu, 25 Aug 2011 10:20:47 +0000 Subject: [PATCH] if you activate index without it being clicked, the indicator bit is visible but empty - dont show this until someone actually clicks. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@62799 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- data/themes/widgets/index.edc | 24 +++++++++++++++++++----- src/bin/test.c | 1 + src/lib/elm_index.c | 2 ++ 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/data/themes/widgets/index.edc b/data/themes/widgets/index.edc index 40a0494..0224490 100644 --- a/data/themes/widgets/index.edc +++ b/data/themes/widgets/index.edc @@ -49,7 +49,7 @@ group { name: "elm/index/base/vertical/default"; } part { name: "button_image"; mouse_events: 1; - clip_to: "clip"; + clip_to: "clip2"; description { state: "default" 0.0; rel1 { to: "elm.text.body"; @@ -71,7 +71,7 @@ group { name: "elm/index/base/vertical/default"; effect: SOFT_SHADOW; mouse_events: 0; scale: 1; - clip_to: "clip"; + clip_to: "clip2"; description { state: "default" 0.0; align: 1.0 0.5; fixed: 1 1; @@ -100,7 +100,7 @@ group { name: "elm/index/base/vertical/default"; effect: SOFT_SHADOW; mouse_events: 0; scale: 1; - clip_to: "clip"; + clip_to: "clip2"; description { state: "default" 0.0; align: 1.0 0.5; fixed: 1 1; @@ -128,7 +128,7 @@ group { name: "elm/index/base/vertical/default"; } part { name: "over1"; mouse_events: 0; - clip_to: "clip"; + clip_to: "clip2"; description { state: "default" 0.0; rel1 { to: "button_image"; @@ -147,7 +147,7 @@ group { name: "elm/index/base/vertical/default"; mouse_events: 1; repeat_events: 1; ignore_flags: ON_HOLD; - clip_to: "clip"; + clip_to: "clip2"; description { state: "default" 0.0; rel1 { to: "button_image"; @@ -215,6 +215,20 @@ group { name: "elm/index/base/vertical/default"; transition: DECELERATE 0.5; target: "clip"; } + program { name: "active2"; + signal: "elm,indicator,state,active"; + source: "elm"; + action: STATE_SET "active" 0.0; + transition: DECELERATE 0.5; + target: "clip2"; + } + program { name: "inactive2"; + signal: "elm,indicator,state,inactive"; + source: "elm"; + action: STATE_SET "default" 0.0; + transition: DECELERATE 0.5; + target: "clip2"; + } } } diff --git a/src/bin/test.c b/src/bin/test.c index e930cd6..2cea5f2 100644 --- a/src/bin/test.c +++ b/src/bin/test.c @@ -278,6 +278,7 @@ my_win_main(char *autorun, Eina_Bool test_win_only) evas_object_smart_callback_add(idx, "delay,changed", index_changed, NULL); evas_object_size_hint_weight_set(idx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); elm_win_resize_object_add(win, idx); + elm_index_active_set(idx, EINA_TRUE); evas_object_show(idx); tests = NULL; diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c index 09f2f20..68994f8 100644 --- a/src/lib/elm_index.c +++ b/src/lib/elm_index.c @@ -442,6 +442,7 @@ _mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void *eve _sel_eval(data, ev->canvas.x, ev->canvas.y); edje_object_part_drag_value_set(wd->base, "elm.dragable.pointer", (!edje_object_mirrored_get(wd->base)) ? wd->dx : (wd->dx - w), wd->dy); + edje_object_signal_emit(wd->base, "elm,indicator,state,active", "elm"); } static void @@ -457,6 +458,7 @@ _mouse_up(void *data, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void *event if (d) evas_object_smart_callback_call(data, SIG_SELECTED, d); elm_index_active_set(data, 0); edje_object_signal_emit(wd->base, "elm,state,level,0", "elm"); + edje_object_signal_emit(wd->base, "elm,indicator,state,inactive", "elm"); } static void -- 2.7.4