CreatBot/GeneralKlipperScreen
7
0
Fork 0
forked from CreatBot/CreatBotKlipperScreen
Code Pull Requests Activity

base_panel: simplify sidebar scaling

Browse Source
This commit is contained in:
alfrix 2022-03-21 07:14:58 -03:00
parent 5286e433fe
commit 50d3671d0f
2 changed files with 5 additions and 13 deletions
ks_includes
KlippyGtk.py
panels
base_panel.py

5
ks_includes/KlippyGtk.py

@ -41,8 +41,6 @@ class KlippyGtk:
else: else:
self.action_bar_width = int(self.width * .1) self.action_bar_width = int(self.width * .1)
self.action_bar_height = int(self.height) self.action_bar_height = int(self.height)
self.header_image_scale_width = 1.2
self.header_image_scale_height = 1.4
self.cursor = cursor self.cursor = cursor
self.color_list = {} # This is set by screen.py init_style() self.color_list = {} # This is set by screen.py init_style()
@ -72,9 +70,6 @@ class KlippyGtk:
def get_header_size(self): def get_header_size(self):
return self.header_size return self.header_size
def get_header_image_scale(self):
return [self.header_image_scale_width, self.header_image_scale_height]
def get_image_width(self): def get_image_width(self):
return self.img_width return self.img_width

13
panels/base_panel.py

@ -34,27 +34,24 @@ class BasePanel(ScreenPanel):
self.control_grid.set_size_request(action_bar_width, action_bar_height) self.control_grid.set_size_request(action_bar_width, action_bar_height)
self.control_grid.get_style_context().add_class('action_bar') self.control_grid.get_style_context().add_class('action_bar')
button_scale = self._gtk.get_header_image_scale() self.control['back'] = self._gtk.ButtonImage('back', None, None, 1, 1)
logging.debug("Button scale: %s" % button_scale)
self.control['back'] = self._gtk.ButtonImage('back', None, None, button_scale[0], button_scale[1])
self.control['back'].connect("clicked", self.back) self.control['back'].connect("clicked", self.back)
self.control['home'] = self._gtk.ButtonImage('main', None, None, button_scale[0], button_scale[1]) self.control['home'] = self._gtk.ButtonImage('main', None, None, 1, 1)
self.control['home'].connect("clicked", self.menu_return, True) self.control['home'].connect("clicked", self.menu_return, True)
if len(self._config.get_printers()) > 1: if len(self._config.get_printers()) > 1:
self.control['printer_select'] = self._gtk.ButtonImage( self.control['printer_select'] = self._gtk.ButtonImage(
'shuffle', None, None, button_scale[0], button_scale[1]) 'shuffle', None, None, 1, 1)
self.control['printer_select'].connect("clicked", self._screen.show_printer_select) self.control['printer_select'].connect("clicked", self._screen.show_printer_select)
self.control['macro_shortcut'] = self._gtk.ButtonImage( self.control['macro_shortcut'] = self._gtk.ButtonImage(
'custom-script', None, None, button_scale[0], button_scale[1]) 'custom-script', None, None, 1, 1)
self.control['macro_shortcut'].connect("clicked", self.menu_item_clicked, "gcode_macros", { self.control['macro_shortcut'].connect("clicked", self.menu_item_clicked, "gcode_macros", {
"name": "Macros", "name": "Macros",
"panel": "gcode_macros" "panel": "gcode_macros"
}) })
self.control['estop'] = self._gtk.ButtonImage('emergency', None, None, button_scale[0], button_scale[1]) self.control['estop'] = self._gtk.ButtonImage('emergency', None, None, 1, 1)
self.control['estop'].connect("clicked", self.emergency_stop) self.control['estop'].connect("clicked", self.emergency_stop)
self.locations = { self.locations = {