From: Daniel Juyung Seo Date: Mon, 13 Jan 2014 14:00:28 +0000 (+0900) Subject: panes: Fixed panes smart callbak calls by fixing default theme. X-Git-Tag: v1.9.0-alpha1~233 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a902244ee6be445524fce8329081bf181c45ef83;p=platform%2Fupstream%2Felementary.git panes: Fixed panes smart callbak calls by fixing default theme. Panes smart callback depends on the signals from theme but it was broken when dark theme was introduced. "clicked" does not work yet, it should be fixed. Thanks for the report, JackDanielZ. --- diff --git a/data/themes/edc/elm/panes.edc b/data/themes/edc/elm/panes.edc index 5910769..63f1166 100644 --- a/data/themes/edc/elm/panes.edc +++ b/data/themes/edc/elm/panes.edc @@ -81,6 +81,20 @@ group { name: "elm/panes/vertical/default"; } } } + programs { + program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback + action: SIGNAL_EMIT "elm,action,press" "elm"; + } + program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart callback + action: SIGNAL_EMIT "elm,action,unpress" "elm"; + } + program { signal: "mouse,clicked,1"; source: "bar"; // for "clicked" smart callback + action: SIGNAL_EMIT "elm,action,click" "elm"; + } + program { signal: "mouse,down,1,double"; source: "bar"; // for "clicked,double" smart callback + action: SIGNAL_EMIT "elm,action,click,double" "elm"; + } + } } group { name: "elm/panes/horizontal/default"; @@ -162,6 +176,20 @@ group { name: "elm/panes/horizontal/default"; } } } + programs { + program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback + action: SIGNAL_EMIT "elm,action,press" "elm"; + } + program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart callback + action: SIGNAL_EMIT "elm,action,unpress" "elm"; + } + program { signal: "mouse,clicked,1"; source: "bar"; // for "clicked" smart callback + action: SIGNAL_EMIT "elm,action,click" "elm"; + } + program { signal: "mouse,down,1,double"; source: "bar"; // for "clicked,double" smart callback + action: SIGNAL_EMIT "elm,action,click,double" "elm"; + } + } } //////////////////////////////////////////////////////////////////////////// @@ -309,6 +337,18 @@ group { name: "elm/panes/vertical/flush"; } } programs { + program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback + action: SIGNAL_EMIT "elm,action,press" "elm"; + } + program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart callback + action: SIGNAL_EMIT "elm,action,unpress" "elm"; + } + program { signal: "mouse,clicked,1"; source: "bar"; // for "clicked" smart callback + action: SIGNAL_EMIT "elm,action,click" "elm"; + } + program { signal: "mouse,down,1,double"; source: "bar"; // for "clicked,double" smart callback + action: SIGNAL_EMIT "elm,action,click,double" "elm"; + } program { signal: "mouse,in"; source: "bar1"; action: STATE_SET "active" 0.0; @@ -511,5 +551,17 @@ group { name: "elm/panes/horizontal/flush"; target: "glow2a"; target: "glow2b"; } + program {signal: "mouse,down,1"; source: "bar"; // for "press" smart callback + action: SIGNAL_EMIT "elm,action,press" "elm"; + } + program { signal: "mouse,up,1"; source: "bar"; // for "unpress" smart callback + action: SIGNAL_EMIT "elm,action,unpress" "elm"; + } + program { signal: "mouse,clicked,1"; source: "bar"; // for "clicked" smart callback + action: SIGNAL_EMIT "elm,action,click" "elm"; + } + program { signal: "mouse,down,1,double"; source: "bar"; // for "clicked,double" smart callback + action: SIGNAL_EMIT "elm,action,click,double" "elm"; + } } } diff --git a/src/lib/elm_panes.c b/src/lib/elm_panes.c index 10bcb06..a6cbb33 100644 --- a/src/lib/elm_panes.c +++ b/src/lib/elm_panes.c @@ -207,16 +207,16 @@ _elm_panes_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED) elm_panes_content_left_size_set(obj, 0.5); edje_object_signal_callback_add - (wd->resize_obj, "elm,action,click", "", + (wd->resize_obj, "elm,action,click", "*", _on_clicked, obj); edje_object_signal_callback_add - (wd->resize_obj, "elm,action,click,double", "", + (wd->resize_obj, "elm,action,click,double", "*", _double_clicked, obj); edje_object_signal_callback_add - (wd->resize_obj, "elm,action,press", "", + (wd->resize_obj, "elm,action,press", "*", _on_pressed, obj); edje_object_signal_callback_add - (wd->resize_obj, "elm,action,unpress", "", + (wd->resize_obj, "elm,action,unpress", "*", _on_unpressed, obj); elm_widget_can_focus_set(obj, EINA_FALSE);