gtk: adjust icon sizes so they are more consistent across font sizes

This commit is contained in:
alfrix
2022-11-22 16:18:06 -03:00
parent 33fd5f9576
commit 00bd6ac4db
7 changed files with 35 additions and 35 deletions

View File

@@ -28,23 +28,22 @@ class BasePanel(ScreenPanel):
}
self.current_extruder = None
# Action bar buttons
scale = 1.5 if self._gtk.font_size_type == "extralarge" else 1
self.control['back'] = self._gtk.Button('back', scale=scale)
self.control['back'] = self._gtk.Button('back', scale=self.bts)
self.control['back'].connect("clicked", self.back)
self.control['home'] = self._gtk.Button('main', scale=scale)
self.control['home'] = self._gtk.Button('main', scale=self.bts)
self.control['home'].connect("clicked", self._screen._menu_go_home)
if len(self._config.get_printers()) > 1:
self.control['printer_select'] = self._gtk.Button('shuffle', scale=scale)
self.control['printer_select'] = self._gtk.Button('shuffle', scale=self.bts)
self.control['printer_select'].connect("clicked", self._screen.show_printer_select)
self.control['macros_shortcut'] = self._gtk.Button('custom-script', scale=scale)
self.control['macros_shortcut'] = self._gtk.Button('custom-script', scale=self.bts)
self.control['macros_shortcut'].connect("clicked", self.menu_item_clicked, "gcode_macros", {
"name": "Macros",
"panel": "gcode_macros"
})
self.control['estop'] = self._gtk.Button('emergency', scale=scale)
self.control['estop'] = self._gtk.Button('emergency', scale=self.bts)
self.control['estop'].connect("clicked", self.emergency_stop)
# Any action bar button should close the keyboard
@@ -123,10 +122,7 @@ class BasePanel(ScreenPanel):
if not show or self._screen.printer.get_temp_store_devices() is None:
return
if self._gtk.font_size_type == "extralarge":
img_size = self._gtk.img_scale * .75
else:
img_size = self._gtk.img_scale * .5
img_size = self._gtk.img_scale * self.bts
for device in self._screen.printer.get_temp_store_devices():
self.labels[device] = Gtk.Label(label="100º")
self.labels[device].set_ellipsize(Pango.EllipsizeMode.START)