Use double leaflet layout for the sidebar

pmos_tweaks/window.py

@@ -21,7 +21,11 @@ class TweaksWindow:
         Handy.init()
 
         self.window = None
+        self.titlebar = None
+        self.titleleaflet = None
+        self.headerbar_side = None
         self.headerbar = None
+        self.headergroup = None
         self.leaflet = None
         self.sidebar = None
         self.content = None
@@ -29,6 +33,9 @@ class TweaksWindow:
         self.stack = None
         self.back = None
 
+        self.sg_sidebar = None
+        self.sg_main = None
+
         self.create_window()
 
         self.settings = SettingsTree()
@@ -43,6 +50,13 @@ class TweaksWindow:
         Gtk.main()
 
     def create_window(self):
+        self.sg_sidebar = Gtk.SizeGroup()
+        self.sg_sidebar.set_mode(Gtk.SizeGroupMode.HORIZONTAL)
+        self.sg_main = Gtk.SizeGroup()
+        self.sg_main.set_mode(Gtk.SizeGroupMode.HORIZONTAL)
+
+        self.headergroup = Handy.HeaderGroup()
+
         self.window = Handy.Window()
         self.window.set_default_size(640, 480)
         self.window.set_title('postmarketOS Tweaks')
@@ -51,9 +65,27 @@ class TweaksWindow:
         box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
         self.window.add(box)
 
+        self.titlebar = Gtk.Box()
+        self.titleleaflet = Handy.Leaflet()
+        self.titlebar.add(self.titleleaflet)
+
+        self.headerbar_side = Handy.HeaderBar()
+        self.headerbar_side.set_show_close_button(True)
+        self.titleleaflet.add(self.headerbar_side)
+        self.titleleaflet.child_set(self.headerbar_side, name="sidebar")
+        leaflet_sep = Gtk.Separator()
+        leaflet_sep.get_style_context().add_class('sidebar')
+        self.titleleaflet.add(leaflet_sep)
+
         self.headerbar = Handy.HeaderBar()
+        self.titleleaflet.add(self.headerbar)
+        self.titleleaflet.child_set(self.headerbar, name="content")
         self.headerbar.set_title("postmarketOS Tweaks")
         self.headerbar.set_show_close_button(True)
+        self.headerbar.set_hexpand(True)
+
+        self.headergroup.add_header_bar(self.headerbar_side)
+        self.headergroup.add_header_bar(self.headerbar)
 
         self.back = Gtk.Button.new_from_icon_name("go-previous-symbolic", 1)
         self.back.connect("clicked", self.on_back_clicked)
@@ -71,10 +103,19 @@ class TweaksWindow:
         self.content.props.hexpand = True
         self.leaflet.add(self.sidebar)
         self.leaflet.child_set(self.sidebar, name="sidebar")
+        leaflet_sep = Gtk.Separator()
+        leaflet_sep.get_style_context().add_class('sidebar')
+        self.leaflet.add(leaflet_sep)
         self.leaflet.add(self.content)
         self.leaflet.child_set(self.content, name="content")
         self.leaflet.set_visible_child_name("sidebar")
 
+        self.sg_sidebar.add_widget(self.headerbar_side)
+        self.sg_sidebar.add_widget(self.sidebar)
+
+        self.sg_main.add_widget(self.headerbar)
+        self.sg_main.add_widget(self.content)
+
         sw = Gtk.ScrolledWindow()
         sw.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
         self.sidebar.pack_start(sw, True, True, 0)
@@ -85,7 +126,7 @@ class TweaksWindow:
         self.stack = Gtk.Stack()
         self.content.pack_start(self.stack, True, True, 0)
 
-        box.pack_start(self.headerbar, False, True, 0)
+        box.pack_start(self.titlebar, False, True, 0)
         box.pack_start(self.leaflet, True, True, 0)
 
         self.actionbar = Gtk.ActionBar()
@@ -345,9 +386,8 @@ class TweaksWindow:
         self.headerbar.set_subtitle('')
 
     def on_leaflet_change(self, *args):
-        folded = self.leaflet.get_folded()
-        content = self.leaflet.get_visible_child_name() == "content"
-        self.back.set_visible(folded and content)
+        self.titleleaflet.set_visible_child_name(self.leaflet.get_visible_child_name())
+        self.back.set_visible(self.leaflet.get_folded())
 
     def on_save_settings(self, *args):
         fd, filename = tempfile.mkstemp()