From c54282962d6c1bccc54483fa31e1436eba3bbd0b Mon Sep 17 00:00:00 2001 From: Alfredo Monclus Date: Mon, 30 Aug 2021 20:53:23 -0300 Subject: [PATCH] Adjust titlebar height (#248) --- ks_includes/screen_panel.py | 1 - panels/base_panel.py | 1 + screen.py | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ks_includes/screen_panel.py b/ks_includes/screen_panel.py index 6456f934..1e15b638 100644 --- a/ks_includes/screen_panel.py +++ b/ks_includes/screen_panel.py @@ -9,7 +9,6 @@ from ks_includes.KlippyGtk import KlippyGtk from ks_includes.KlippyGcodes import KlippyGcodes class ScreenPanel: - title_spacing = 50 def __init__(self, screen, title, back=True, action_bar=True, printer_name=True): self._screen = screen diff --git a/panels/base_panel.py b/panels/base_panel.py index 6ab370a9..77cc78cd 100644 --- a/panels/base_panel.py +++ b/panels/base_panel.py @@ -16,6 +16,7 @@ class BasePanel(ScreenPanel): self.current_panel = None self.time_min = -1 self.time_format = self._config.get_main_config_option("24htime") + self.title_spacing = self._screen.font_size * 2 self.buttons_showing = { 'back': False if back else True diff --git a/screen.py b/screen.py index c51dda1f..ab6e4530 100644 --- a/screen.py +++ b/screen.py @@ -427,7 +427,8 @@ class KlipperScreen(Gtk.Window): css = open(klipperscreendir + "/styles/%s/style.css" % (self.theme)) css_data = css.read() css.close() - css_data = css_data.replace("KS_FONT_SIZE",str(self.gtk.get_font_size())) + self.font_size = self.gtk.get_font_size() + css_data = css_data.replace("KS_FONT_SIZE",str(self.font_size)) style_provider = Gtk.CssProvider() style_provider.load_from_data(css_data.encode())