forked from enlightenment/efl
elementary: should work with wayland when both wayland and x11 backend are build.
SVN revision: 77496
This commit is contained in:
parent
870c91ca10
commit
6f20d1cb7f
|
@ -452,6 +452,8 @@ _entry_changed_cb(void *data,
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HAVE_ELEMENTARY_X
|
#ifdef HAVE_ELEMENTARY_X
|
||||||
|
static Eina_Bool _mouse_grab_pixels(void *data, int type __UNUSED__, void *event __UNUSED__);
|
||||||
|
|
||||||
static Ecore_X_Window
|
static Ecore_X_Window
|
||||||
_x11_elm_widget_xwin_get(const Evas_Object *obj)
|
_x11_elm_widget_xwin_get(const Evas_Object *obj)
|
||||||
{
|
{
|
||||||
|
@ -472,10 +474,6 @@ _x11_elm_widget_xwin_get(const Evas_Object *obj)
|
||||||
}
|
}
|
||||||
return xwin;
|
return xwin;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_ELEMENTARY_X
|
|
||||||
static Eina_Bool _mouse_grab_pixels(void *data, int type __UNUSED__, void *event __UNUSED__);
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
_start_grab_pick_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
|
_start_grab_pick_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
|
||||||
|
@ -630,12 +628,15 @@ _color_picker_add(Evas_Object *obj, Elm_Colorselector_Smart_Data *sd)
|
||||||
Ecore_X_Window xwin;
|
Ecore_X_Window xwin;
|
||||||
|
|
||||||
xwin = _x11_elm_widget_xwin_get(obj);
|
xwin = _x11_elm_widget_xwin_get(obj);
|
||||||
sd->grab.xroot = ecore_x_window_root_get(xwin);
|
if (xwin)
|
||||||
ecore_x_input_raw_select(sd->grab.xroot);
|
{
|
||||||
|
sd->grab.xroot = ecore_x_window_root_get(xwin);
|
||||||
|
ecore_x_input_raw_select(sd->grab.xroot);
|
||||||
|
|
||||||
sd->grab.mouse_motion = ecore_event_handler_add(ECORE_X_RAW_MOTION, _mouse_grab_pixels, obj);
|
sd->grab.mouse_motion = ecore_event_handler_add(ECORE_X_RAW_MOTION, _mouse_grab_pixels, obj);
|
||||||
sd->grab.key_up = ecore_event_handler_add(ECORE_EVENT_KEY_UP, _key_up_cb, obj);
|
sd->grab.key_up = ecore_event_handler_add(ECORE_EVENT_KEY_UP, _key_up_cb, obj);
|
||||||
sd->grab.mouse_up = ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_UP, _mouse_up_cb, obj);
|
sd->grab.mouse_up = ecore_event_handler_add(ECORE_EVENT_MOUSE_BUTTON_UP, _mouse_up_cb, obj);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
bx = elm_box_add(sd->picker);
|
bx = elm_box_add(sd->picker);
|
||||||
|
@ -652,11 +653,14 @@ _color_picker_add(Evas_Object *obj, Elm_Colorselector_Smart_Data *sd)
|
||||||
evas_object_show(ed);
|
evas_object_show(ed);
|
||||||
|
|
||||||
#ifdef HAVE_ELEMENTARY_X
|
#ifdef HAVE_ELEMENTARY_X
|
||||||
sd->button = elm_button_add(sd->picker);
|
if (xwin)
|
||||||
elm_object_text_set(sd->button, "Pick a color");
|
{
|
||||||
evas_object_smart_callback_add(sd->button, "clicked", _start_grab_pick_cb, obj);
|
sd->button = elm_button_add(sd->picker);
|
||||||
elm_box_pack_end(bx, sd->button);
|
elm_object_text_set(sd->button, "Pick a color");
|
||||||
evas_object_show(sd->button);
|
evas_object_smart_callback_add(sd->button, "clicked", _start_grab_pick_cb, obj);
|
||||||
|
elm_box_pack_end(bx, sd->button);
|
||||||
|
evas_object_show(sd->button);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
im = evas_object_image_add(evas_object_evas_get(sd->picker));
|
im = evas_object_image_add(evas_object_evas_get(sd->picker));
|
||||||
|
|
Loading…
Reference in New Issue