[fractal] Fix: double click on messages launches fullscreen
- From: Daniel Garcia Moreno <danigm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [fractal] Fix: double click on messages launches fullscreen
- Date: Mon, 17 Feb 2020 07:55:57 +0000 (UTC)
commit f9403d3c2a38af788a179ca044d8fe7b830a8905
Author: Sonja Heinze <sonjaleaheinze gmail com>
Date: Fri Feb 14 10:11:56 2020 +0100
Fix: double click on messages launches fullscreen
This commit fixes the following bug: double click on messages in the room
history switched the app to fullscreen mode.
fractal-gtk/src/widgets/media_viewer.rs | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
---
diff --git a/fractal-gtk/src/widgets/media_viewer.rs b/fractal-gtk/src/widgets/media_viewer.rs
index 84226789..0bd84a04 100644
--- a/fractal-gtk/src/widgets/media_viewer.rs
+++ b/fractal-gtk/src/widgets/media_viewer.rs
@@ -141,6 +141,7 @@ struct Data {
loading_error: bool,
no_more_media: bool,
is_fullscreen: bool,
+ double_click_handler_id: Option<glib::SignalHandlerId>,
}
impl Data {
@@ -174,6 +175,7 @@ impl Data {
main_window,
signal_id: None,
is_fullscreen,
+ double_click_handler_id: None,
}
}
@@ -613,6 +615,9 @@ impl Data {
impl Drop for Data {
fn drop(&mut self) {
+ if let Some(signal_handler_id) = self.double_click_handler_id.take() {
+ self.main_window.disconnect(signal_handler_id);
+ }
match &self.widget {
Widget::Video(widget) => {
widget.player.stop();
@@ -765,7 +770,8 @@ impl MediaViewer {
.builder
.get_object::<gtk::Button>("full_screen_button")
.expect("Cant find full_screen_button in ui file.");
- self.data
+ let id = self
+ .data
.borrow()
.main_window
.connect_button_press_event(move |_, e| {
@@ -777,6 +783,7 @@ impl MediaViewer {
}
Inhibit(false)
});
+ self.data.borrow_mut().double_click_handler_id = Some(id);
let header_hovered: Arc<Mutex<bool>> = Arc::new(Mutex::new(false));
let nav_hovered: Arc<Mutex<bool>> = Arc::new(Mutex::new(false));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]