summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYakov Goldberg <yakov.g@samsung.com>2014-10-27 17:42:54 +0200
committerYakov Goldberg <yakov.g@samsung.com>2014-10-27 17:42:54 +0200
commit8658dc58fe7ffb9ecff8fbcc246d8a69f00fd5d9 (patch)
tree9aff69e548c9e90099a594c07666c6d629ac3384
parent8decaa1258fb2032b7146418db884302d24c0fbd (diff)
Fix blinking "resize" cursor near marker.
-rw-r--r--src/bin/egui_gui/editor.c27
1 files changed, 2 insertions, 25 deletions
diff --git a/src/bin/egui_gui/editor.c b/src/bin/egui_gui/editor.c
index b3ac9e7..2ae2548 100644
--- a/src/bin/egui_gui/editor.c
+++ b/src/bin/egui_gui/editor.c
@@ -647,20 +647,8 @@ _marker_mouse_in(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Des
647{ 647{
648 Evas_Coord sz = 17, trans_size = 25; 648 Evas_Coord sz = 17, trans_size = 25;
649 Evas_Event_Mouse_Down *ev = event_info; 649 Evas_Event_Mouse_Down *ev = event_info;
650 const Gui_Session *session = gui_context_editor_session_get(_active_context_get());
651
652 const Gui_Widget *wdg = _editor_wdg_selected_get();
653 650
654 const Eo *base_obj; 651 const Eo *base_obj = g->main_win->main_win;
655 if (IS_MAIN(wdg))
656 {
657 base_obj = canvas_get();
658 }
659 else
660 {
661 const Gui_Widget *win_wdg = wdg_main_wdg_get(wdg);
662 base_obj = session_eo_get(session, win_wdg);
663 }
664 652
665 /* This is "arrow" icon which flows around cursor. */ 653 /* This is "arrow" icon which flows around cursor. */
666 Eo *cur_logo; 654 Eo *cur_logo;
@@ -697,19 +685,8 @@ static Eina_Bool
697_marker_mouse_out(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) 685_marker_mouse_out(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED)
698{ 686{
699 Eo *cur_logo = NULL; 687 Eo *cur_logo = NULL;
700 const Gui_Widget *wdg = _editor_wdg_selected_get();
701 688
702 const Eo *base_obj; 689 const Eo *base_obj = g->main_win->main_win;
703 if (IS_MAIN(wdg))
704 {
705 base_obj = canvas_get();
706 }
707 else
708 {
709 const Gui_Widget *win_wdg = wdg_main_wdg_get(wdg);
710 const Gui_Session *session = gui_context_editor_session_get(_active_context_get());
711 base_obj = session_eo_get(session, win_wdg);
712 }
713 690
714 eo_do(base_obj, cur_logo = eo_key_data_get("cursor")); 691 eo_do(base_obj, cur_logo = eo_key_data_get("cursor"));
715 692