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

layout: fixes for long vertical screens

Browse Source 
KS is not optimized for this aspect-ratio, but at least it shouldn't be broken
This commit is contained in:
alfrix 2022-07-04 16:15:45 -03:00
parent fd221bde86
commit e70c9d37e9
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ks_includes/KlippyGtk.py
View File

@ -12,7 +12,6 @@ class KlippyGtk:
labels = {} labels = {}
width_ratio = 16 width_ratio = 16
height_ratio = 9.375 height_ratio = 9.375
keyboard_ratio = .5
def __init__(self, screen, width, height, theme, cursor, fontsize_type): def __init__(self, screen, width, height, theme, cursor, fontsize_type):
self.screen = screen self.screen = screen
@ -84,7 +83,11 @@ class KlippyGtk:
return self.img_height return self.img_height
def get_keyboard_height(self): def get_keyboard_height(self):
return self.get_content_height() * self.keyboard_ratio if (self.height / self.width) >= 3:
# Ultra-tall
return self.get_content_height() * 0.25
else:
return self.get_content_height() * 0.5
def get_temp_color(self, device): def get_temp_color(self, device):
# logging.debug("Color list %s" % self.color_list) # logging.debug("Color list %s" % self.color_list)

10
panels/main_menu.py
View File

@ -232,16 +232,12 @@ class MainPanel(MenuPanel):
popover.set_position(Gtk.PositionType.BOTTOM) popover.set_position(Gtk.PositionType.BOTTOM)
self.labels['popover'] = popover self.labels['popover'] = popover
i = 2 i = 0
for d in self._printer.get_temp_store_devices(): for d in self._printer.get_temp_store_devices():
if self.add_device(d): if self.add_device(d):
i += 1 i += 1
if self._screen.vertical_mode: graph_height = (self._gtk.get_content_height() / 2) - ((i + 2) * 4 * self._gtk.get_font_size())
aux = 1.38 self.labels['da'].set_size_request(-1, graph_height)
else:
aux = 1
graph_height = max(0, self._screen.height / aux - (i * 5 * self._gtk.get_font_size()))
self.labels['da'].set_size_request(0, graph_height)
return box return box
def graph_show_device(self, widget, show=True): def graph_show_device(self, widget, show=True):

10
panels/temperature.py
View File

@ -443,16 +443,12 @@ class TemperaturePanel(ScreenPanel):
popover.set_position(Gtk.PositionType.BOTTOM) popover.set_position(Gtk.PositionType.BOTTOM)
self.labels['popover'] = popover self.labels['popover'] = popover
i = 2 i = 0
for d in self._printer.get_temp_store_devices(): for d in self._printer.get_temp_store_devices():
if self.add_device(d): if self.add_device(d):
i += 1 i += 1
if self._screen.vertical_mode: graph_height = (self._gtk.get_content_height() / 2) - ((i + 2) * 4 * self._gtk.get_font_size())
aux = 1.38 self.labels['da'].set_size_request(-1, graph_height)
else:
aux = 1
graph_height = max(0, self._screen.height / aux - (i * 5 * self._gtk.get_font_size()))
self.labels['da'].set_size_request(0, graph_height)
return box return box
def graph_show_device(self, widget, show=True): def graph_show_device(self, widget, show=True):