Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Navigator sidebar so can change view type with proper resize (#853)

Browse Source 
Fixes #6422, #11164
This commit is contained in:
Paul Culley 2019-08-01 08:27:38 -05:00 committed by GitHub
parent ab5a810990
commit 7e7dd68b58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gramps/gui/navigator.py
View File

@ -199,7 +199,10 @@ class Navigator:
Add a page to the sidebar for a plugin. Add a page to the sidebar for a plugin.
""" """
self.pages.append((title, sidebar)) self.pages.append((title, sidebar))
index = self.notebook.append_page(sidebar.get_top(), Gtk.Label(label=title)) page = sidebar.get_top()
# hide for now so notebook is only size of active page
page.get_child().hide()
index = self.notebook.append_page(page, Gtk.Label(label=title))
menu_item = Gtk.MenuItem(label=title) menu_item = Gtk.MenuItem(label=title)
if order == START: if order == START:
@ -276,9 +279,15 @@ class Navigator:
old_page = notebook.get_current_page() old_page = notebook.get_current_page()
if old_page != -1: if old_page != -1:
self.pages[old_page][1].inactive() self.pages[old_page][1].inactive()
# hide so notebook is only size of active page
notebook.get_nth_page(old_page).get_child().hide()
self.pages[index][1].active(self.active_cat, self.active_view) self.pages[index][1].active(self.active_cat, self.active_view)
notebook.get_nth_page(index).get_child().show()
notebook.queue_resize()
if self.active_view is not None: if self.active_view is not None:
self.pages[index][1].view_changed(self.active_cat, self.active_view) self.pages[index][1].view_changed(self.active_cat,
self.active_view)
self.title_label.set_text(self.pages[index][0]) self.title_label.set_text(self.pages[index][0])
def cb_close_clicked(self, button): def cb_close_clicked(self, button):

2
gramps/gui/viewmanager.py
View File

@ -407,7 +407,7 @@ class ViewManager(CLIManager):
self.navigator = Navigator(self) self.navigator = Navigator(self)
self.ebox.add(self.navigator.get_top()) self.ebox.add(self.navigator.get_top())
hpane.add1(self.ebox) hpane.pack1(self.ebox, False, False)
hpane.show() hpane.show()
self.notebook = Gtk.Notebook() self.notebook = Gtk.Notebook()