diff options
| -rw-r--r-- | main/src/ui/conversation_content_view/file_image_widget.vala | 30 | ||||
| -rw-r--r-- | main/src/ui/conversation_content_view/file_transmission_progress.vala | 1 |
2 files changed, 21 insertions, 10 deletions
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 d5415f31..1c8d4c02 100644 --- a/main/src/ui/conversation_content_view/file_image_widget.vala +++ b/main/src/ui/conversation_content_view/file_image_widget.vala @@ -63,25 +63,30 @@ public class FileImageWidget : Box { EventControllerMotion this_motion_events = new EventControllerMotion(); this.add_controller(this_motion_events); - this_motion_events.enter.connect(() => { - image_overlay_toolbar.visible = show_image_overlay_toolbar; - file_size_label.visible = file_transfer != null && file_transfer.direction == FileTransfer.DIRECTION_RECEIVED && file_transfer.state == FileTransfer.State.NOT_STARTED && !file_transfer.sfs_sources.is_empty; + this_motion_events.enter.connect((controller, x, y) => { + (controller.widget as FileImageWidget).on_motion_event_enter(); }); - this_motion_events.leave.connect(() => { + attach_on_motion_event_leave(this_motion_events, button); + } + + private static void attach_on_motion_event_leave(EventControllerMotion this_motion_events, MenuButton button) { + this_motion_events.leave.connect((controller) => { if (button.popover != null && button.popover.visible) return; - image_overlay_toolbar.visible = false; - file_size_label.visible = false; + (controller.widget as FileImageWidget).image_overlay_toolbar.visible = false; + (controller.widget as FileImageWidget).file_size_label.visible = false; }); } + private void on_motion_event_enter() { + image_overlay_toolbar.visible = show_image_overlay_toolbar; + file_size_label.visible = file_transfer != null && file_transfer.direction == FileTransfer.DIRECTION_RECEIVED && file_transfer.state == FileTransfer.State.NOT_STARTED && !file_transfer.sfs_sources.is_empty; + } + public async void set_file_transfer(FileTransfer file_transfer) { this.file_transfer = file_transfer; - this.file_transfer.bind_property("size", file_size_label, "label", BindingFlags.SYNC_CREATE, (_, from_value, ref to_value) => { - to_value = FileDefaultWidget.get_size_string((int64) from_value); - return true; - }); + this.file_transfer.bind_property("size", file_size_label, "label", BindingFlags.SYNC_CREATE, file_size_label_transform); this.file_transfer.bind_property("size", transmission_progress, "file-size", BindingFlags.SYNC_CREATE); this.file_transfer.bind_property("transferred-bytes", transmission_progress, "transferred-size"); @@ -90,6 +95,11 @@ public class FileImageWidget : Box { refresh_state(); } + private static bool file_size_label_transform(Binding binding, Value from_value, ref Value to_value) { + to_value = FileDefaultWidget.get_size_string((int64) from_value); + return true; + } + private void refresh_state() { if ((state == EMPTY || state == PREVIEW) && file_transfer.path != null) { if (state == EMPTY) { diff --git a/main/src/ui/conversation_content_view/file_transmission_progress.vala b/main/src/ui/conversation_content_view/file_transmission_progress.vala index 5285e0dd..ce8af78e 100644 --- a/main/src/ui/conversation_content_view/file_transmission_progress.vala +++ b/main/src/ui/conversation_content_view/file_transmission_progress.vala @@ -113,6 +113,7 @@ namespace Dino.Ui { Source.remove(update_progress_timeout_id); update_progress_timeout_id = -1; } + base.dispose(); } } } |