From 696d2dcbacc0991b2c91e401e3ba8da3cebbbba1 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Date: Sat, 10 Aug 2019 09:35:52 +0000 Subject: Fixes to regresion pointed in RC about text and tooltips --- src/widgets/desktop-widget.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/widgets/desktop-widget.cpp') diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index e6444de55..6035719d8 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -1002,10 +1002,6 @@ SPDesktopWidget::event(GtkWidget *widget, GdkEvent *event, SPDesktopWidget *dtw) // current item on the canvas, because item events and all mouse events are caught // and passed on by the canvas acetate (I think). --bb - if ((event->type == GDK_MOTION_NOTIFY || event->type == GDK_BUTTON_RELEASE) && !dtw->_canvas->_inside) { - return sp_desktop_root_handler(nullptr, event, dtw->desktop); - } - if ((event->type == GDK_KEY_PRESS || event->type == GDK_KEY_RELEASE) && !dtw->_canvas->_current_item) { return sp_desktop_root_handler (nullptr, event, dtw->desktop); @@ -1021,9 +1017,11 @@ SPDesktopWidget::event(GtkWidget *widget, GdkEvent *event, SPDesktopWidget *dtw) gint SPDesktopWidget::eventoutside(GtkWidget *widget, GdkEvent *event, SPDesktopWidget *dtw) { - if ((event->type == GDK_MOTION_NOTIFY || event->type == GDK_BUTTON_RELEASE) && !dtw->_canvas->_inside) { - return sp_desktop_root_handler(nullptr, event, dtw->desktop); + if ((event->type == GDK_MOTION_NOTIFY || event->type == GDK_BUTTON_RELEASE) && !dtw->_canvas->_inside && + dtw->desktop->event_context->_button1on) { + sp_desktop_root_handler(nullptr, event, dtw->desktop); } + return FALSE; } -- cgit v1.2.3