From d50d02469bef6d5e9bcb5030e6fa32ef951961ae Mon Sep 17 00:00:00 2001 From: Bad Diode Date: Tue, 30 May 2023 14:59:04 +0200 Subject: Fix parameter alignments --- src/drawing.c | 44 ++++++++++++++++++++++---------------------- src/globals.c | 2 +- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/drawing.c b/src/drawing.c index a9322dd..de494a6 100644 --- a/src/drawing.c +++ b/src/drawing.c @@ -514,7 +514,7 @@ draw_params_cursor_noise(size_t i, u8 clr) { }; size_t cursor_length = 24; size_t x = PARAMS_START_X + x_positions[i] + 30; - size_t y = PARAMS_START_Y + PARAMS_H - 23 + y_positions[i]; + size_t y = PARAMS_START_Y + PARAMS_H - 24 + y_positions[i]; switch (settings.cursor) { case CURSOR_THICK_LINE: { draw_line(x, y, x + cursor_length, y, clr); @@ -549,7 +549,7 @@ draw_params_cursor_square(size_t i, u8 clr, bool sweep) { }; size_t cursor_length = 24; size_t x = PARAMS_START_X + x_positions[i] + x_offset; - size_t y = PARAMS_START_Y + PARAMS_H - 23 + y_positions[i]; + size_t y = PARAMS_START_Y + PARAMS_H - 24 + y_positions[i]; switch (settings.cursor) { case CURSOR_THICK_LINE: { draw_line(x, y, x + cursor_length, y, clr); @@ -614,8 +614,8 @@ draw_parameters_wave(ChannelWaveParams *params, bool global) { size_t y = PARAMS_START_Y + 12; // Wave Patterns. - draw_wave_pattern(wave_a, x, y, COL_ACC_1); - draw_wave_pattern(wave_b, x + 70, y, COL_ACC_2); + draw_wave_pattern(wave_a, x, y + 1, COL_ACC_1); + draw_wave_pattern(wave_b, x + 70, y + 1, COL_ACC_2); // Wave text. x -= 2; @@ -706,7 +706,7 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep, bool global) { // Shape drawing. { size_t x = PARAMS_START_X + x_offset; - size_t y = PARAMS_START_Y + PARAMS_H - 44; + size_t y = PARAMS_START_Y + PARAMS_H - 47; size_t x0 = x + 2; size_t x1 = x0; @@ -764,7 +764,7 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep, bool global) { // Param box. { size_t x = PARAMS_START_X + x_offset; - size_t y = PARAMS_START_Y + PARAMS_H - 25; + size_t y = PARAMS_START_Y + PARAMS_H - 26; draw_line(x, y + 7, x + 2, y + 7, col_fg); draw_line(x + 22, y + 7, x + 24, y + 7, col_fg); draw_line(x, y + 8, x, y + 19, col_fg); @@ -788,14 +788,14 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep, bool global) { // Bounding box. { size_t x0 = PARAMS_START_X + 31 + x_offset; - size_t y0 = PARAMS_START_Y + PARAMS_H - 47; + size_t y0 = PARAMS_START_Y + PARAMS_H - 50; size_t x1 = x0 + 79; size_t y1 = y0 + 21; draw_rect(x0, y0, x1, y1, COL_ACC_2); } size_t x = PARAMS_START_X + 42 + x_offset; - size_t y = PARAMS_START_Y + PARAMS_H - 44; + size_t y = PARAMS_START_Y + PARAMS_H - 47; size_t x0 = x; size_t y0 = y + 15 - params->env_volume; size_t x1 = x + 8 * params->env_time; @@ -815,7 +815,7 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep, bool global) { // Env. volume. { size_t x = PARAMS_START_X + 31 + x_offset; - size_t y = PARAMS_START_Y + PARAMS_H - 25; + size_t y = PARAMS_START_Y + PARAMS_H - 26; draw_line(x, y + 7, x + 4, y + 7, col_fg); draw_line(x + 20, y + 7, x + 24, y + 7, col_fg); draw_line(x, y + 8, x, y + 19, col_fg); @@ -846,7 +846,7 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep, bool global) { // Env. direction { size_t x = PARAMS_START_X + 59 + x_offset; - size_t y = PARAMS_START_Y + PARAMS_H - 25; + size_t y = PARAMS_START_Y + PARAMS_H - 26; draw_line(x, y + 7, x + 4, y + 7, col_fg); draw_line(x + 20, y + 7, x + 24, y + 7, col_fg); draw_line(x, y + 8, x, y + 19, col_fg); @@ -865,7 +865,7 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep, bool global) { // Env. time. { size_t x = PARAMS_START_X + 87 + x_offset; - size_t y = PARAMS_START_Y + PARAMS_H - 25; + size_t y = PARAMS_START_Y + PARAMS_H - 26; draw_line(x, y + 7, x + 2, y + 7, col_fg); draw_line(x + 22, y + 7, x + 24, y + 7, col_fg); draw_line(x, y + 8, x, y + 19, col_fg); @@ -889,7 +889,7 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep, bool global) { // Sweep number. if (sweep) { size_t x = PARAMS_START_X + 118; - size_t y = PARAMS_START_Y + PARAMS_H - 25; + size_t y = PARAMS_START_Y + PARAMS_H - 26; draw_line(x, y + 7, x + 4, y + 7, col_fg); draw_line(x + 20, y + 7, x + 24, y + 7, col_fg); draw_line(x, y + 8, x, y + 19, col_fg); @@ -912,7 +912,7 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep, bool global) { // Sweep time. if (sweep) { size_t x = PARAMS_START_X + 146; - size_t y = PARAMS_START_Y + PARAMS_H - 25; + size_t y = PARAMS_START_Y + PARAMS_H - 26; draw_line(x, y + 7, x + 2, y + 7, col_fg); draw_line(x + 22, y + 7, x + 24, y + 7, col_fg); draw_line(x, y + 8, x, y + 19, col_fg); @@ -935,7 +935,7 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep, bool global) { // Sweep direction. if (sweep) { size_t x = PARAMS_START_X + 132; - size_t y = PARAMS_START_Y + PARAMS_H - 45; + size_t y = PARAMS_START_Y + PARAMS_H - 46; draw_line(x, y + 7, x + 4, y + 7, col_fg); draw_line(x + 20, y + 7, x + 24, y + 7, col_fg); draw_line(x, y + 8, x, y + 19, col_fg); @@ -954,7 +954,7 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep, bool global) { // Labels. { size_t x = PARAMS_START_X + x_offset; - size_t y = PARAMS_START_Y + PARAMS_H - 45; + size_t y = PARAMS_START_Y + PARAMS_H - 48; txt_drawf_small("shape", x + 1, y - 12, col_fg); txt_drawf_small("envelope", x + 54, y - 12, col_fg); if (sweep) { @@ -976,7 +976,7 @@ draw_parameters_noise(ChannelNoiseParams* params, bool global) { // Param box. { size_t x = PARAMS_START_X + x_offset; - size_t y = PARAMS_START_Y + PARAMS_H - 25; + size_t y = PARAMS_START_Y + PARAMS_H - 26; draw_line(x, y + 7, x + 2, y + 7, col_fg); draw_line(x + 22, y + 7, x + 24, y + 7, col_fg); draw_line(x, y + 8, x, y + 19, col_fg); @@ -998,14 +998,14 @@ draw_parameters_noise(ChannelNoiseParams* params, bool global) { // Bounding box. { size_t x0 = PARAMS_START_X + 31 + x_offset; - size_t y0 = PARAMS_START_Y + PARAMS_H - 47; + size_t y0 = PARAMS_START_Y + PARAMS_H - 50; size_t x1 = x0 + 79; size_t y1 = y0 + 21; draw_rect(x0, y0, x1, y1, COL_ACC_2); } size_t x = PARAMS_START_X + 42 + x_offset; - size_t y = PARAMS_START_Y + PARAMS_H - 44; + size_t y = PARAMS_START_Y + PARAMS_H - 47; size_t x0 = x; size_t y0 = y + 15 - params->env_volume; size_t x1 = x + 8 * params->env_time; @@ -1025,7 +1025,7 @@ draw_parameters_noise(ChannelNoiseParams* params, bool global) { // Env. volume. { size_t x = PARAMS_START_X + 31 + x_offset; - size_t y = PARAMS_START_Y + PARAMS_H - 25; + size_t y = PARAMS_START_Y + PARAMS_H - 26; draw_line(x, y + 7, x + 4, y + 7, col_fg); draw_line(x + 20, y + 7, x + 24, y + 7, col_fg); draw_line(x, y + 8, x, y + 19, col_fg); @@ -1056,7 +1056,7 @@ draw_parameters_noise(ChannelNoiseParams* params, bool global) { // Env. direction { size_t x = PARAMS_START_X + 59 + x_offset; - size_t y = PARAMS_START_Y + PARAMS_H - 25; + size_t y = PARAMS_START_Y + PARAMS_H - 26; draw_line(x, y + 7, x + 4, y + 7, col_fg); draw_line(x + 20, y + 7, x + 24, y + 7, col_fg); draw_line(x, y + 8, x, y + 19, col_fg); @@ -1079,7 +1079,7 @@ draw_parameters_noise(ChannelNoiseParams* params, bool global) { // Env. time. { size_t x = PARAMS_START_X + 87 + x_offset; - size_t y = PARAMS_START_Y + PARAMS_H - 25; + size_t y = PARAMS_START_Y + PARAMS_H - 26; draw_line(x, y + 7, x + 2, y + 7, col_fg); draw_line(x + 22, y + 7, x + 24, y + 7, col_fg); draw_line(x, y + 8, x, y + 19, col_fg); @@ -1103,7 +1103,7 @@ draw_parameters_noise(ChannelNoiseParams* params, bool global) { // Labels. { size_t x = PARAMS_START_X + x_offset; - size_t y = PARAMS_START_Y + PARAMS_H - 45; + size_t y = PARAMS_START_Y + PARAMS_H - 48; txt_drawf_small("envelope", x + 54, y - 12, col_fg); } } diff --git a/src/globals.c b/src/globals.c index 5580681..b113d6d 100644 --- a/src/globals.c +++ b/src/globals.c @@ -52,7 +52,7 @@ bool clear_screen = true; #define PARAMS_W 170 #define PARAMS_H 64 #define PARAMS_START_X 30 -#define PARAMS_START_Y 1 +#define PARAMS_START_Y 4 #define R_SIDEBAR_X ((TRIG_START_X) + (TRIG_OFFSET_X) * 8 + 4) #define L_SIDEBAR_X ((CHAN_START_X) - 26) -- cgit v1.2.1