From c6d9ecbfdbf7afad35f41a7f9be6c7b99fd64459 Mon Sep 17 00:00:00 2001 From: June Tate-Gans Date: Sat, 28 Oct 2023 13:26:07 -0500 Subject: [PATCH] Adjust thumbstick button layout to match reality a bit more. --- g13gui/ui/mainwindow.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/g13gui/ui/mainwindow.py b/g13gui/ui/mainwindow.py index e702ab7..0c39750 100644 --- a/g13gui/ui/mainwindow.py +++ b/g13gui/ui/mainwindow.py @@ -121,13 +121,14 @@ class MainWindow(Gtk.ApplicationWindow, GtkObserver): self._g13Buttons = {} - mrButton = self.newG13Button('MR') - mrButton.set_sensitive(False) - self._mButtons.pack_start(mrButton, False, False, 6) self._mButtons.pack_start(self.newG13Button('M1'), False, False, 6) self._mButtons.pack_start(self.newG13Button('M2'), False, False, 6) self._mButtons.pack_start(self.newG13Button('M3'), False, False, 6) + mrButton = self.newG13Button('MR') + mrButton.set_sensitive(False) + self._mButtons.pack_start(mrButton, False, False, 6) + # G1 to G14 self._buttonNum = 1 for row in range(0, 2): @@ -148,12 +149,12 @@ class MainWindow(Gtk.ApplicationWindow, GtkObserver): self._keyGrid.attach(self.newG13NumberedButton(), 4, 4, 1, 1) self._stickGrid.attach(self.newG13Button("STICK_UP"), 4, 0, 1, 1) - self._stickGrid.attach(self.newG13Button("THUMB_LEFT"), 2, 1, 1, 1) + self._stickGrid.attach(self.newG13Button("THUMB_LEFT"), 2, 0, 1, 3) self._stickGrid.attach(self.newG13Button("STICK_LEFT"), 3, 1, 1, 1) self._stickGrid.attach(self.newG13Button("THUMB_STICK"), 4, 1, 1, 1) self._stickGrid.attach(self.newG13Button("STICK_RIGHT"), 5, 1, 1, 1) self._stickGrid.attach(self.newG13Button("STICK_DOWN"), 4, 2, 1, 1) - self._stickGrid.attach(self.newG13Button("THUMB_DOWN"), 4, 3, 1, 1) + self._stickGrid.attach(self.newG13Button("THUMB_DOWN"), 3, 3, 3, 1) def newG13NumberedButton(self): button = self.newG13Button('G' + str(self._buttonNum))