From b942e97a727c7c49625600e9ee9694cb11fba0a1 Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Tue, 20 Feb 2024 10:07:19 +0100 Subject: [PATCH] Fixed server browse window breakpoint --- main.py | 4 +++- melon/browse/server.py | 6 +++++- melon/window.py | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/main.py b/main.py index 19c741b..2cbae11 100644 --- a/main.py +++ b/main.py @@ -2,7 +2,7 @@ import sys import gi gi.require_version('Gtk', '4.0') gi.require_version('Adw', '1') -from gi.repository import Gtk, Adw, Gio +from gi.repository import Gtk, Adw, Gio, GLib from melon.window import MainWindow from melon.models import init_db @@ -11,6 +11,8 @@ from melon.servers.utils import get_server_instance, load_server, get_servers_li class MyApp(Adw.Application): def __init__(self, **kwargs): super().__init__(**kwargs) + # set name + GLib.set_application_name("Melon") # initialize db init_db() # this has to wait till the db is initialized diff --git a/melon/browse/server.py b/melon/browse/server.py index fde146e..e98811f 100644 --- a/melon/browse/server.py +++ b/melon/browse/server.py @@ -136,7 +136,7 @@ class BrowseServerScreen(Adw.NavigationPage): return url = self.instance.get_external_url() Gtk.UriLauncher.new(uri=url).launch() - def __init__(self, id, *args, **kwargs): + def __init__(self, id, window=None, *args, **kwargs): super().__init__(*args, **kwargs) server = get_servers_list()[id] self.set_title(server["name"]) @@ -171,3 +171,7 @@ class BrowseServerScreen(Adw.NavigationPage): self.toolbar_view.set_content(self.view_stack) self.toolbar_view.add_bottom_bar(self.bottom_bar) self.set_child(self.toolbar_view) + + if not window is None: + window.breakpoint.add_setter(self.header_bar, "title-widget", Gtk.Box()) + window.breakpoint.add_setter(self.bottom_bar, "reveal", True) diff --git a/melon/window.py b/melon/window.py index 5cc7122..e461c7a 100644 --- a/melon/window.py +++ b/melon/window.py @@ -28,7 +28,7 @@ class MainWindow(Adw.ApplicationWindow): def open_server_browse(self, action, prefs): # manually convert GLib.Variant to value id = prefs[:] - self.view.push(BrowseServerScreen(id)) + self.view.push(BrowseServerScreen(id, window=self)) def open_channel_browse(self, action, prefs): plugin = prefs[0] id = prefs[1] -- 2.38.5