marko10_000
/
apostrophe
forked from Mirrors/apostrophe
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refine fullscreen headerbar behavior

ui
Manuel Genovés 2020-02-26 01:07:58 +01:00
parent 6ca2410432
commit 004c7544a0
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/ui/Headerbar.ui
View File

@ -406,7 +406,7 @@
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="transition_type">slide-right</property> <property name="transition_type">slide-right</property>
<child> <child>
<object class="GtkMenuButton"> <object class="GtkMenuButton" id="preview_switch_button">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>

10
uberwriter/headerbars.py
View File

@ -62,6 +62,8 @@ class BaseHeaderbar:
self.menu_button = self.builder.get_object("menu_button") self.menu_button = self.builder.get_object("menu_button")
self.recents_button = self.builder.get_object("recents_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) add_menus(self, app)
@ -172,6 +174,8 @@ class FullscreenHeaderbar(BaseHeaderbar):
self.events.connect('leave_notify_event', self.hide_fs_hb) self.events.connect('leave_notify_event', self.hide_fs_hb)
self.menu_button.get_popover().connect('closed', 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.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): def show_fs_hb(self, _widget=None, _data=None):
"""show headerbar of the fullscreen mode """show headerbar of the fullscreen mode
@ -182,7 +186,9 @@ class FullscreenHeaderbar(BaseHeaderbar):
"""hide headerbar of the fullscreen mode """hide headerbar of the fullscreen mode
""" """
if (self.menu_button.get_active() or 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 pass
else: else:
self.hb_revealer.set_reveal_child(False) self.hb_revealer.set_reveal_child(False)
@ -261,7 +267,7 @@ def add_menus(headerbar, app):
builder_window_menu = Gtk.Builder() builder_window_menu = Gtk.Builder()
builder_window_menu.add_from_resource( 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") model = builder_window_menu.get_object("Menu")
headerbar.light_button = builder_window_menu.get_object("light_mode_button") headerbar.light_button = builder_window_menu.get_object("light_mode_button")
headerbar.dark_button = builder_window_menu.get_object("dark_mode_button") headerbar.dark_button = builder_window_menu.get_object("dark_mode_button")