Update main UI with new 1.7 design

1 files changed, 30 insertions, 25 deletions

diff --git a/src/globals.c b/src/globals.c
index 57c77bb..842b39f 100644
--- a/src/globals.c
+++ b/src/globals.c
@@ -32,63 +32,68 @@ bool clear_screen = true;
 
 #define CHAN_W 19
 #define CHAN_H 8
-#define CHAN_START_X 30
-#define CHAN_START_Y 98
+#define CHAN_START_X 28
+#define CHAN_START_Y 100
 #define CHAN_OFFSET_Y 15
 
 #define TRIG_W 15
 #define TRIG_H 22
-#define TRIG_START_X 59
-#define TRIG_START_Y 98
+#define TRIG_START_X 55
+#define TRIG_START_Y 100
 #define TRIG_OFFSET_X (TRIG_W + 3)
 #define TRIG_OFFSET_Y (TRIG_H + 8)
 
 #define PIANO_W 170
 #define PIANO_H 12
 #define PIANO_BLACK_H 10
-#define PIANO_START_X 30
+#define PIANO_START_X 27
 #define PIANO_START_Y 80
 #define PIANO_NOTE_W 2
 
 #define NOTIF_W 170
 #define NOTIF_H 10
-#define NOTIF_START_X 30
-#define NOTIF_START_Y 13
+#define NOTIF_START_X 27
+#define NOTIF_START_Y 12
 
 #define PARAMS_W 166
 #define PARAMS_H 52
-#define PARAMS_START_X 32
-#define PARAMS_START_Y 22
+#define PARAMS_START_X 29
+#define PARAMS_START_Y 20
 #define PARAMS_BOX_W 30
 #define PARAMS_BOX_H 24
 #define PARAMS_BOX_OFFSET_X (PARAMS_BOX_W + 4)
 #define PARAMS_BOX_OFFSET_Y (PARAMS_BOX_H + 4)
 
-#define R_SIDEBAR_X ((TRIG_START_X) + (TRIG_OFFSET_X) * 8 + 4)
-#define L_SIDEBAR_X ((CHAN_START_X) - 26)
+#define R_SIDEBAR_X ((TRIG_START_X) + (TRIG_OFFSET_X) * 8 + 8)
 
-#define PAT_START_X (L_SIDEBAR_X + 4)
-#define PAT_START_Y 21
+#define PAT_START_X 5
+#define PAT_START_Y 16
 #define PAT_W 14
 #define PAT_H 10
-#define PAT_OFFSET_Y 17
+#define PAT_OFFSET_Y 18
 
-#define R_COL_W 24
-#define BPM_START_X (R_SIDEBAR_X)
-#define BPM_START_Y (TRIG_START_Y + TRIG_H + 8)
-#define BPM_H 22
+#define R_COL_W 30
+#define BPM_START_X (R_SIDEBAR_X - 2)
+#define BPM_START_Y (TRIG_START_Y + 8)
+#define BPM_H 15
 
-#define SETTINGS_START_X (R_SIDEBAR_X)
-#define SETTINGS_START_Y (TRIG_START_Y - 7)
-#define PLAY_START_X (R_SIDEBAR_X)
-#define PLAY_START_Y (TRIG_START_Y + 12)
+#define SCALE_START_X (R_SIDEBAR_X - 2)
+#define SCALE_START_Y (PIANO_START_Y)
+#define SCALE_H 15
+
+#define SETTINGS_START_X (R_SIDEBAR_X - 4)
+#define SETTINGS_START_Y (TRIG_START_Y + 30)
+#define PLAY_START_X (R_SIDEBAR_X - 2)
+#define PLAY_START_Y (TRIG_START_Y + 44)
 #define STOP_START_X (R_SIDEBAR_X + 14)
-#define STOP_START_Y (TRIG_START_Y + 12)
-#define PLAY_STOP_W (10)
-#define PLAY_STOP_H (10)
+#define STOP_START_Y (TRIG_START_Y + 44)
+#define PLAY_STOP_W (12)
+#define PLAY_STOP_H (8)
 
 #define BANK_START_X (R_SIDEBAR_X + 5)
 #define BANK_START_Y (PAT_START_Y)
+#define BANK_W 12
+#define BANK_H 10
 
 #define PAT_TRIG_W 14
 #define PAT_TRIG_H 14