From c85945ae26cab7eb65c67dbe49ebbf668a028b1c Mon Sep 17 00:00:00 2001 From: fiaxh Date: Fri, 1 Oct 2021 15:05:37 +0200 Subject: FileWidgets: Improve mouse enter/leave identification --- .../file_default_widget.vala | 42 ++++++++-------------- 1 file changed, 14 insertions(+), 28 deletions(-) (limited to 'main/src/ui/conversation_content_view/file_default_widget.vala') diff --git a/main/src/ui/conversation_content_view/file_default_widget.vala b/main/src/ui/conversation_content_view/file_default_widget.vala index c2af92e3..33b8f8a7 100644 --- a/main/src/ui/conversation_content_view/file_default_widget.vala +++ b/main/src/ui/conversation_content_view/file_default_widget.vala @@ -17,16 +17,10 @@ public class FileDefaultWidget : EventBox { [GtkChild] public EventBox stack_event_box; private FileTransfer.State state; - private bool pointer_inside = false; public FileDefaultWidget() { this.enter_notify_event.connect(on_pointer_entered); this.leave_notify_event.connect(on_pointer_left); - - stack_event_box.enter_notify_event.connect((event) => { pointer_inside = true; return false; }); - mime_label.enter_notify_event.connect((event) => { pointer_inside = true; return false; }); - stack_event_box.leave_notify_event.connect((event) => { pointer_inside = true; return false; }); - mime_label.leave_notify_event.connect((event) => { pointer_inside = true; return false; }); } public void update_file_info(string? mime_type, FileTransfer.State state, long size) { @@ -66,32 +60,24 @@ public class FileDefaultWidget : EventBox { } private bool on_pointer_entered(Gdk.EventCrossing event) { - pointer_inside = true; - Timeout.add(20, () => { - if (pointer_inside) { - event.get_window().set_cursor(new Cursor.for_display(Gdk.Display.get_default(), CursorType.HAND2)); - content_type_image.opacity = 0.7; - if (state == FileTransfer.State.NOT_STARTED) { - image_stack.set_visible_child_name("download_image"); - } - } - return false; - }); + if (event.detail == Gdk.NotifyType.INFERIOR) return false; + + event.get_window().set_cursor(new Cursor.for_display(Gdk.Display.get_default(), CursorType.HAND2)); + content_type_image.opacity = 0.7; + if (state == FileTransfer.State.NOT_STARTED) { + image_stack.set_visible_child_name("download_image"); + } return false; } private bool on_pointer_left(Gdk.EventCrossing event) { - pointer_inside = false; - Timeout.add(20, () => { - if (!pointer_inside) { - event.get_window().set_cursor(new Cursor.for_display(Gdk.Display.get_default(), CursorType.XTERM)); - content_type_image.opacity = 0.5; - if (state == FileTransfer.State.NOT_STARTED) { - image_stack.set_visible_child_name("content_type_image"); - } - } - return false; - }); + if (event.detail == Gdk.NotifyType.INFERIOR) return false; + + event.get_window().set_cursor(new Cursor.for_display(Gdk.Display.get_default(), CursorType.XTERM)); + content_type_image.opacity = 0.5; + if (state == FileTransfer.State.NOT_STARTED) { + image_stack.set_visible_child_name("content_type_image"); + } return false; } -- cgit v1.2.3-54-g00ecf