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

优化竖屏的布局

Browse Source
This commit is contained in:
张开科 2024-07-16 17:31:11 +08:00
parent 3af8c253bb
commit 4ca43b2049
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
panels/main_menu.py
View File

@ -19,13 +19,17 @@ class Panel(MenuPanel):
self.h = self.f = 0
self.main_menu = Gtk.Grid(row_homogeneous=True, column_homogeneous=True, hexpand=True, vexpand=True)
self.labels['menu'] = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0, homogeneous=False)
if self._screen.vertical_mode:
self.labels['menu'] = Gtk.Box(orientation=Gtk.Orientation.HORIZONTAL, spacing=0, homogeneous=False)
else:
self.labels['menu'] = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=0, homogeneous=False)
logo_image = self._gtk.Image("klipper", self._gtk.content_width * 0.2, self._gtk.content_height * 0.5)
self.labels['menu'].pack_start(logo_image, False, False, 80)
# temp_Button = self.arrangeMenuItems(items, 1, True)
temp_Button = self._gtk.Button("heat-up", _("Temperature"))
temp_Button.set_margin_start(120)
temp_Button.set_margin_end(120)
temp_Button.set_valign(Gtk.Align.CENTER)
temp_Button.set_halign(Gtk.Align.CENTER)
temp_Button.set_size_request(200, 100)
temp_Button.get_style_context().add_class('custom-temp-button')
temp_Button.connect('clicked', self.menu_item_clicked, {"panel": "temperature"})
self.labels['menu'].pack_start(temp_Button, True, True, 0)
@ -39,8 +43,8 @@ class Panel(MenuPanel):
self._gtk.reset_temp_color()
if self._screen.vertical_mode:
self.main_menu.attach(self.labels['devices'], 0, 0, 2, 1)
self.main_menu.attach(self.labels['menu'], 0, 1, 1, 2)
self.main_menu.attach(self.labels['da'], 1, 1, 1, 2)
self.main_menu.attach(self.labels['da'], 0, 1, 2, 1)
self.main_menu.attach(self.labels['menu'], 0, 2, 2, 1)
else:
self.main_menu.attach(self.labels['devices'], 0, 0, 2, 1)
self.main_menu.attach(self.labels['menu'], 0, 1, 1, 2)

3
panels/temperature.py
View File

@ -33,7 +33,8 @@ class Panel(ScreenPanel):
right_panel = self.create_right_panel()
right_panel.set_halign(Gtk.Align.CENTER)
right_panel.set_size_request(400, -1)
right_panel.set_valign(Gtk.Align.CENTER)
right_panel.set_size_request(self._screen.width / 5 * 3, self._screen.height / 5 * 4)
dev = self.create_left_panel()
if self._screen.vertical_mode:
self.grid.attach(right_panel, 0, 0, 1, 1)