CreatBot/CreatBotKlipperScreen
7
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

screen: Put font size setting into KlippyGtk

Browse Source
This commit is contained in:
Jordan 2021-09-18 16:53:31 -04:00
parent 857b4a9bab
commit 36aaece846
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ks_includes/KlippyGtk.py
View File

@ -15,7 +15,7 @@ class KlippyGtk:
width_ratio = 16 width_ratio = 16
height_ratio = 9.375 height_ratio = 9.375
def __init__(self, screen, width, height, theme, cursor): def __init__(self, screen, width, height, theme, cursor, fontsize_type):
self.screen = screen self.screen = screen
self.width = width self.width = width
self.height = height self.height = height
@ -24,6 +24,10 @@ class KlippyGtk:
self.width / self.font_ratio[0], self.width / self.font_ratio[0],
self.height / self.font_ratio[1] self.height / self.font_ratio[1]
)) ))
if fontsize_type == "small":
self.font_size = round(self.font_size * 0.91)
elif (fontsize_type == "large"):
self.font_size = round(self.font_size * 1.09)
self.header_size = int(round((self.width / self.width_ratio) / 1.33)) self.header_size = int(round((self.width / self.width_ratio) / 1.33))
self.img_width = int(round(self.width / self.width_ratio)) self.img_width = int(round(self.width / self.width_ratio))
self.img_height = int(round(self.height / self.height_ratio)) self.img_height = int(round(self.height / self.height_ratio))

2
panels/base_panel.py
View File

@ -17,7 +17,7 @@ class BasePanel(ScreenPanel):
self.current_panel = None self.current_panel = None
self.time_min = -1 self.time_min = -1
self.time_format = self._config.get_main_config_option("24htime") self.time_format = self._config.get_main_config_option("24htime")
self.title_spacing = self._screen.font_size * 2 self.title_spacing = self._gtk.font_size * 2
self.buttons_showing = { self.buttons_showing = {
'back': False if back else True, 'back': False if back else True,

12
screen.py
View File

@ -123,7 +123,8 @@ class KlipperScreen(Gtk.Window):
self.theme = self._config.get_main_config_option('theme') self.theme = self._config.get_main_config_option('theme')
self.gtk = KlippyGtk(self, self.width, self.height, self.theme, self.gtk = KlippyGtk(self, self.width, self.height, self.theme,
self._config.get_main_config().getboolean("show_cursor", fallback=False)) self._config.get_main_config().getboolean("show_cursor", fallback=False),
self._config.get_main_config_option("font_size", "medium"))
self.keyboard_height = self.gtk.get_keyboard_height() self.keyboard_height = self.gtk.get_keyboard_height()
self.init_style() self.init_style()
@ -440,14 +441,7 @@ class KlipperScreen(Gtk.Window):
css_data = css_base_data + css.read() css_data = css_base_data + css.read()
css.close() css.close()
self.font_size = self.gtk.get_font_size() css_data = css_data.replace("KS_FONT_SIZE", str(self.gtk.get_font_size()))
fontsize_type = self._config.get_main_config_option("font_size", "medium")
if fontsize_type != "medium":
if fontsize_type == "small":
self.font_size = round(self.font_size * 0.91)
elif (fontsize_type == "large"):
self.font_size = round(self.font_size * 1.09)
css_data = css_data.replace("KS_FONT_SIZE", str(self.font_size))
style_provider = Gtk.CssProvider() style_provider = Gtk.CssProvider()
style_provider.load_from_data(css_data.encode()) style_provider.load_from_data(css_data.encode())