From 004c7544a08de7ed72b62bdfe3e1db93a04882c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20Genov=C3=A9s?= <manuel.genoves@gmail.com>
Date: Wed, 26 Feb 2020 01:07:58 +0100
Subject: [PATCH] refine fullscreen headerbar behavior

---
 data/ui/Headerbar.ui     |  2 +-
 uberwriter/headerbars.py | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/data/ui/Headerbar.ui b/data/ui/Headerbar.ui
index f001d52..d8bacca 100644
--- a/data/ui/Headerbar.ui
+++ b/data/ui/Headerbar.ui
@@ -406,7 +406,7 @@
                 <property name="can_focus">False</property>
                 <property name="transition_type">slide-right</property>
                 <child>
-                  <object class="GtkMenuButton">
+                  <object class="GtkMenuButton" id="preview_switch_button">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
diff --git a/uberwriter/headerbars.py b/uberwriter/headerbars.py
index 45fd18d..3631f0e 100644
--- a/uberwriter/headerbars.py
+++ b/uberwriter/headerbars.py
@@ -62,6 +62,8 @@ class BaseHeaderbar:
 
         self.menu_button = self.builder.get_object("menu_button")
         self.recents_button = self.builder.get_object("recents_button")
+        self.export_button = self.builder.get_object("export_button")
+        self.preview_switch_button = self.builder.get_object("preview_switch_button")
 
         add_menus(self, app)
 
@@ -172,6 +174,8 @@ class FullscreenHeaderbar(BaseHeaderbar):
         self.events.connect('leave_notify_event', self.hide_fs_hb)
         self.menu_button.get_popover().connect('closed', self.hide_fs_hb)
         self.recents_button.get_popover().connect('closed', self.hide_fs_hb)
+        self.export_button.get_popover().connect('closed', self.hide_fs_hb)
+        self.preview_switch_button.get_popover().connect('closed', self.hide_fs_hb)
 
     def show_fs_hb(self, _widget=None, _data=None):
         """show headerbar of the fullscreen mode
@@ -182,7 +186,9 @@ class FullscreenHeaderbar(BaseHeaderbar):
         """hide headerbar of the fullscreen mode
         """
         if (self.menu_button.get_active() or
-           self.recents_button.get_active()):
+                self.recents_button.get_active() or
+                self.export_button.get_active() or
+                self.preview_switch_button.get_active()):
             pass
         else:
             self.hb_revealer.set_reveal_child(False)
@@ -261,7 +267,7 @@ def add_menus(headerbar, app):
 
     builder_window_menu = Gtk.Builder()
     builder_window_menu.add_from_resource(
-        "/de/wolfvollprecht/UberWriter/ui/Menu2.ui")
+        "/de/wolfvollprecht/UberWriter/ui/Menu.ui")
     model = builder_window_menu.get_object("Menu")
     headerbar.light_button = builder_window_menu.get_object("light_mode_button")
     headerbar.dark_button = builder_window_menu.get_object("dark_mode_button")