From c5461b8536b6171aea17d0e97d41710988b73534 Mon Sep 17 00:00:00 2001 From: fiaxh Date: Sun, 9 Jan 2022 14:28:17 +0100 Subject: Imrove file widget menu (fixup 25db512) - Fix file menu remaining visible after clicking an action - Fix file menu for images (clicking resulted in hiding of the file widget part) - Fix styling of file menus for images - Fix compiler warnings and runtime criticals --- main/src/ui/conversation_content_view/file_image_widget.vala | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'main/src/ui/conversation_content_view/file_image_widget.vala') diff --git a/main/src/ui/conversation_content_view/file_image_widget.vala b/main/src/ui/conversation_content_view/file_image_widget.vala index f7841736..91eddd93 100644 --- a/main/src/ui/conversation_content_view/file_image_widget.vala +++ b/main/src/ui/conversation_content_view/file_image_widget.vala @@ -16,7 +16,7 @@ public class FileImageWidget : EventBox { this.halign = Align.START; this.events = EventMask.POINTER_MOTION_MASK; - Util.force_css(this, "* { border: 1px solid alpha(@theme_fg_color, 0.1); border-radius: 3px; }"); + this.get_style_context().add_class("file-image-widget"); } public async void load_from_file(File file, string file_name, int MAX_WIDTH=600, int MAX_HEIGHT=300) throws GLib.Error { @@ -52,20 +52,18 @@ public class FileImageWidget : EventBox { file_default_widget_controller = new FileDefaultWidgetController(file_default_widget); file_default_widget_controller.set_file(file, file_name, mime_type); - Util.force_css(file_default_widget, "* { color: #eee; }"); - Util.force_css(file_default_widget, "* { background-color: rgba(0, 0, 0, 0.5); }"); - Overlay overlay = new Overlay() { visible=true }; overlay.add(image); overlay.add_overlay(file_default_widget); this.enter_notify_event.connect((event) => { - if (event.detail == Gdk.NotifyType.INFERIOR) return false; file_default_widget.visible = true; return false; }); this.leave_notify_event.connect((event) => { if (event.detail == Gdk.NotifyType.INFERIOR) return false; + if (file_default_widget.file_menu.popover != null && file_default_widget.file_menu.popover.visible) return false; + file_default_widget.visible = false; return false; }); -- cgit v1.2.3-54-g00ecf