forked from enlightenment/efl
Elm: Add a mouse,out event (when we have a wayland frame) to handle
the case of resetting the wayland cursor image. Fixes ticket #1293. Increase the size of the event rects on the border theme to allow for easier resizing. SVN revision: 75313
This commit is contained in:
parent
bada407026
commit
f9d98db03e
|
@ -603,7 +603,7 @@ group {
|
|||
state: "default" 0.0;
|
||||
rel2 {
|
||||
relative: 1.0 0.0;
|
||||
offset: -1 3;
|
||||
offset: -1 5;
|
||||
}
|
||||
color: 0 0 0 0;
|
||||
}
|
||||
|
@ -620,7 +620,7 @@ group {
|
|||
state: "default" 0.0;
|
||||
rel1 {
|
||||
relative: 0.0 1.0;
|
||||
offset: 0 -4;
|
||||
offset: 0 -6;
|
||||
}
|
||||
color: 0 0 0 0;
|
||||
}
|
||||
|
@ -883,6 +883,12 @@ group {
|
|||
source: "elm.event.resize.t";
|
||||
action: SIGNAL_EMIT "elm,action,resize,show" "elm.event.resize.t";
|
||||
}
|
||||
program {
|
||||
name: "resize_t_hide";
|
||||
signal: "mouse,out";
|
||||
source: "elm.event.resize.t";
|
||||
action: SIGNAL_EMIT "elm,action,resize,hide" "elm.event.resize.t";
|
||||
}
|
||||
program {
|
||||
name: "resize_t_down";
|
||||
signal: "mouse,down,1";
|
||||
|
@ -895,6 +901,12 @@ group {
|
|||
source: "elm.event.resize.b";
|
||||
action: SIGNAL_EMIT "elm,action,resize,show" "elm.event.resize.b";
|
||||
}
|
||||
program {
|
||||
name: "resize_b_hide";
|
||||
signal: "mouse,out";
|
||||
source: "elm.event.resize.b";
|
||||
action: SIGNAL_EMIT "elm,action,resize,hide" "elm.event.resize.b";
|
||||
}
|
||||
program {
|
||||
name: "resize_b_down";
|
||||
signal: "mouse,down,1";
|
||||
|
@ -907,6 +919,12 @@ group {
|
|||
source: "elm.event.resize.tl";
|
||||
action: SIGNAL_EMIT "elm,action,resize,show" "elm.event.resize.tl";
|
||||
}
|
||||
program {
|
||||
name: "resize_tl_hide";
|
||||
signal: "mouse,out";
|
||||
source: "elm.event.resize.tl";
|
||||
action: SIGNAL_EMIT "elm,action,resize,hide" "elm.event.resize.tl";
|
||||
}
|
||||
program {
|
||||
name: "resize_tl_down";
|
||||
signal: "mouse,down,1";
|
||||
|
@ -919,6 +937,12 @@ group {
|
|||
source: "elm.event.resize.tr";
|
||||
action: SIGNAL_EMIT "elm,action,resize,show" "elm.event.resize.tr";
|
||||
}
|
||||
program {
|
||||
name: "resize_tr_hide";
|
||||
signal: "mouse,out";
|
||||
source: "elm.event.resize.tr";
|
||||
action: SIGNAL_EMIT "elm,action,resize,hide" "elm.event.resize.tr";
|
||||
}
|
||||
program {
|
||||
name: "resize_tr_down";
|
||||
signal: "mouse,down,1";
|
||||
|
@ -931,6 +955,12 @@ group {
|
|||
source: "elm.event.resize.bl";
|
||||
action: SIGNAL_EMIT "elm,action,resize,show" "elm.event.resize.bl";
|
||||
}
|
||||
program {
|
||||
name: "resize_bl_hide";
|
||||
signal: "mouse,out";
|
||||
source: "elm.event.resize.bl";
|
||||
action: SIGNAL_EMIT "elm,action,resize,hide" "elm.event.resize.bl";
|
||||
}
|
||||
program {
|
||||
name: "resize_bl_down";
|
||||
signal: "mouse,down,1";
|
||||
|
@ -943,6 +973,12 @@ group {
|
|||
source: "elm.event.resize.br";
|
||||
action: SIGNAL_EMIT "elm,action,resize,show" "elm.event.resize.br";
|
||||
}
|
||||
program {
|
||||
name: "resize_br_hide";
|
||||
signal: "mouse,out";
|
||||
source: "elm.event.resize.br";
|
||||
action: SIGNAL_EMIT "elm,action,resize,hide" "elm.event.resize.br";
|
||||
}
|
||||
program {
|
||||
name: "resize_br_down";
|
||||
signal: "mouse,down,1";
|
||||
|
|
|
@ -1841,6 +1841,22 @@ _elm_win_frame_cb_resize_show(void *data,
|
|||
#endif
|
||||
}
|
||||
|
||||
static void
|
||||
_elm_win_frame_cb_resize_hide(void *data,
|
||||
Evas_Object *obj __UNUSED__,
|
||||
const char *sig __UNUSED__,
|
||||
const char *source __UNUSED__)
|
||||
{
|
||||
Elm_Win_Smart_Data *sd;
|
||||
|
||||
if (!(sd = data)) return;
|
||||
if (sd->resizing) return;
|
||||
|
||||
#ifdef HAVE_ELEMENTARY_WAYLAND
|
||||
ecore_wl_window_cursor_default_restore(sd->wl.win);
|
||||
#endif
|
||||
}
|
||||
|
||||
static void
|
||||
_elm_win_frame_cb_resize_start(void *data,
|
||||
Evas_Object *obj __UNUSED__,
|
||||
|
@ -1960,6 +1976,9 @@ _elm_win_frame_add(Elm_Win_Smart_Data *sd,
|
|||
edje_object_signal_callback_add
|
||||
(sd->frame_obj, "elm,action,resize,show", "*",
|
||||
_elm_win_frame_cb_resize_show, sd);
|
||||
edje_object_signal_callback_add
|
||||
(sd->frame_obj, "elm,action,resize,hide", "*",
|
||||
_elm_win_frame_cb_resize_hide, sd);
|
||||
edje_object_signal_callback_add
|
||||
(sd->frame_obj, "elm,action,resize,start", "*",
|
||||
_elm_win_frame_cb_resize_start, sd);
|
||||
|
@ -1990,6 +2009,9 @@ _elm_win_frame_del(Elm_Win_Smart_Data *sd)
|
|||
edje_object_signal_callback_del
|
||||
(sd->frame_obj, "elm,action,resize,show", "*",
|
||||
_elm_win_frame_cb_resize_show);
|
||||
edje_object_signal_callback_del
|
||||
(sd->frame_obj, "elm,action,resize,hide", "*",
|
||||
_elm_win_frame_cb_resize_hide);
|
||||
edje_object_signal_callback_del
|
||||
(sd->frame_obj, "elm,action,resize,start", "*",
|
||||
_elm_win_frame_cb_resize_start);
|
||||
|
|
Loading…
Reference in New Issue