aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBad Diode <bd@badd10de.dev>2023-05-30 14:59:04 +0200
committerBad Diode <bd@badd10de.dev>2023-05-30 14:59:04 +0200
commitd50d02469bef6d5e9bcb5030e6fa32ef951961ae (patch)
tree93ad83fa370a477daec66d658528b82273018569
parentbf1a3b45e06152c34a2c6d30948fbb7324bc8b9b (diff)
downloadstepper-d50d02469bef6d5e9bcb5030e6fa32ef951961ae.tar.gz
stepper-d50d02469bef6d5e9bcb5030e6fa32ef951961ae.zip
Fix parameter alignments
-rw-r--r--src/drawing.c44
-rw-r--r--src/globals.c2
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) {
514 }; 514 };
515 size_t cursor_length = 24; 515 size_t cursor_length = 24;
516 size_t x = PARAMS_START_X + x_positions[i] + 30; 516 size_t x = PARAMS_START_X + x_positions[i] + 30;
517 size_t y = PARAMS_START_Y + PARAMS_H - 23 + y_positions[i]; 517 size_t y = PARAMS_START_Y + PARAMS_H - 24 + y_positions[i];
518 switch (settings.cursor) { 518 switch (settings.cursor) {
519 case CURSOR_THICK_LINE: { 519 case CURSOR_THICK_LINE: {
520 draw_line(x, y, x + cursor_length, y, clr); 520 draw_line(x, y, x + cursor_length, y, clr);
@@ -549,7 +549,7 @@ draw_params_cursor_square(size_t i, u8 clr, bool sweep) {
549 }; 549 };
550 size_t cursor_length = 24; 550 size_t cursor_length = 24;
551 size_t x = PARAMS_START_X + x_positions[i] + x_offset; 551 size_t x = PARAMS_START_X + x_positions[i] + x_offset;
552 size_t y = PARAMS_START_Y + PARAMS_H - 23 + y_positions[i]; 552 size_t y = PARAMS_START_Y + PARAMS_H - 24 + y_positions[i];
553 switch (settings.cursor) { 553 switch (settings.cursor) {
554 case CURSOR_THICK_LINE: { 554 case CURSOR_THICK_LINE: {
555 draw_line(x, y, x + cursor_length, y, clr); 555 draw_line(x, y, x + cursor_length, y, clr);
@@ -614,8 +614,8 @@ draw_parameters_wave(ChannelWaveParams *params, bool global) {
614 size_t y = PARAMS_START_Y + 12; 614 size_t y = PARAMS_START_Y + 12;
615 615
616 // Wave Patterns. 616 // Wave Patterns.
617 draw_wave_pattern(wave_a, x, y, COL_ACC_1); 617 draw_wave_pattern(wave_a, x, y + 1, COL_ACC_1);
618 draw_wave_pattern(wave_b, x + 70, y, COL_ACC_2); 618 draw_wave_pattern(wave_b, x + 70, y + 1, COL_ACC_2);
619 619
620 // Wave text. 620 // Wave text.
621 x -= 2; 621 x -= 2;
@@ -706,7 +706,7 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep, bool global) {
706 // Shape drawing. 706 // Shape drawing.
707 { 707 {
708 size_t x = PARAMS_START_X + x_offset; 708 size_t x = PARAMS_START_X + x_offset;
709 size_t y = PARAMS_START_Y + PARAMS_H - 44; 709 size_t y = PARAMS_START_Y + PARAMS_H - 47;
710 710
711 size_t x0 = x + 2; 711 size_t x0 = x + 2;
712 size_t x1 = x0; 712 size_t x1 = x0;
@@ -764,7 +764,7 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep, bool global) {
764 // Param box. 764 // Param box.
765 { 765 {
766 size_t x = PARAMS_START_X + x_offset; 766 size_t x = PARAMS_START_X + x_offset;
767 size_t y = PARAMS_START_Y + PARAMS_H - 25; 767 size_t y = PARAMS_START_Y + PARAMS_H - 26;
768 draw_line(x, y + 7, x + 2, y + 7, col_fg); 768 draw_line(x, y + 7, x + 2, y + 7, col_fg);
769 draw_line(x + 22, y + 7, x + 24, y + 7, col_fg); 769 draw_line(x + 22, y + 7, x + 24, y + 7, col_fg);
770 draw_line(x, y + 8, x, y + 19, col_fg); 770 draw_line(x, y + 8, x, y + 19, col_fg);
@@ -788,14 +788,14 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep, bool global) {
788 // Bounding box. 788 // Bounding box.
789 { 789 {
790 size_t x0 = PARAMS_START_X + 31 + x_offset; 790 size_t x0 = PARAMS_START_X + 31 + x_offset;
791 size_t y0 = PARAMS_START_Y + PARAMS_H - 47; 791 size_t y0 = PARAMS_START_Y + PARAMS_H - 50;
792 size_t x1 = x0 + 79; 792 size_t x1 = x0 + 79;
793 size_t y1 = y0 + 21; 793 size_t y1 = y0 + 21;
794 draw_rect(x0, y0, x1, y1, COL_ACC_2); 794 draw_rect(x0, y0, x1, y1, COL_ACC_2);
795 } 795 }
796 796
797 size_t x = PARAMS_START_X + 42 + x_offset; 797 size_t x = PARAMS_START_X + 42 + x_offset;
798 size_t y = PARAMS_START_Y + PARAMS_H - 44; 798 size_t y = PARAMS_START_Y + PARAMS_H - 47;
799 size_t x0 = x; 799 size_t x0 = x;
800 size_t y0 = y + 15 - params->env_volume; 800 size_t y0 = y + 15 - params->env_volume;
801 size_t x1 = x + 8 * params->env_time; 801 size_t x1 = x + 8 * params->env_time;
@@ -815,7 +815,7 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep, bool global) {
815 // Env. volume. 815 // Env. volume.
816 { 816 {
817 size_t x = PARAMS_START_X + 31 + x_offset; 817 size_t x = PARAMS_START_X + 31 + x_offset;
818 size_t y = PARAMS_START_Y + PARAMS_H - 25; 818 size_t y = PARAMS_START_Y + PARAMS_H - 26;
819 draw_line(x, y + 7, x + 4, y + 7, col_fg); 819 draw_line(x, y + 7, x + 4, y + 7, col_fg);
820 draw_line(x + 20, y + 7, x + 24, y + 7, col_fg); 820 draw_line(x + 20, y + 7, x + 24, y + 7, col_fg);
821 draw_line(x, y + 8, x, y + 19, col_fg); 821 draw_line(x, y + 8, x, y + 19, col_fg);
@@ -846,7 +846,7 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep, bool global) {
846 // Env. direction 846 // Env. direction
847 { 847 {
848 size_t x = PARAMS_START_X + 59 + x_offset; 848 size_t x = PARAMS_START_X + 59 + x_offset;
849 size_t y = PARAMS_START_Y + PARAMS_H - 25; 849 size_t y = PARAMS_START_Y + PARAMS_H - 26;
850 draw_line(x, y + 7, x + 4, y + 7, col_fg); 850 draw_line(x, y + 7, x + 4, y + 7, col_fg);
851 draw_line(x + 20, y + 7, x + 24, y + 7, col_fg); 851 draw_line(x + 20, y + 7, x + 24, y + 7, col_fg);
852 draw_line(x, y + 8, x, y + 19, col_fg); 852 draw_line(x, y + 8, x, y + 19, col_fg);
@@ -865,7 +865,7 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep, bool global) {
865 // Env. time. 865 // Env. time.
866 { 866 {
867 size_t x = PARAMS_START_X + 87 + x_offset; 867 size_t x = PARAMS_START_X + 87 + x_offset;
868 size_t y = PARAMS_START_Y + PARAMS_H - 25; 868 size_t y = PARAMS_START_Y + PARAMS_H - 26;
869 draw_line(x, y + 7, x + 2, y + 7, col_fg); 869 draw_line(x, y + 7, x + 2, y + 7, col_fg);
870 draw_line(x + 22, y + 7, x + 24, y + 7, col_fg); 870 draw_line(x + 22, y + 7, x + 24, y + 7, col_fg);
871 draw_line(x, y + 8, x, y + 19, col_fg); 871 draw_line(x, y + 8, x, y + 19, col_fg);
@@ -889,7 +889,7 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep, bool global) {
889 // Sweep number. 889 // Sweep number.
890 if (sweep) { 890 if (sweep) {
891 size_t x = PARAMS_START_X + 118; 891 size_t x = PARAMS_START_X + 118;
892 size_t y = PARAMS_START_Y + PARAMS_H - 25; 892 size_t y = PARAMS_START_Y + PARAMS_H - 26;
893 draw_line(x, y + 7, x + 4, y + 7, col_fg); 893 draw_line(x, y + 7, x + 4, y + 7, col_fg);
894 draw_line(x + 20, y + 7, x + 24, y + 7, col_fg); 894 draw_line(x + 20, y + 7, x + 24, y + 7, col_fg);
895 draw_line(x, y + 8, x, y + 19, col_fg); 895 draw_line(x, y + 8, x, y + 19, col_fg);
@@ -912,7 +912,7 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep, bool global) {
912 // Sweep time. 912 // Sweep time.
913 if (sweep) { 913 if (sweep) {
914 size_t x = PARAMS_START_X + 146; 914 size_t x = PARAMS_START_X + 146;
915 size_t y = PARAMS_START_Y + PARAMS_H - 25; 915 size_t y = PARAMS_START_Y + PARAMS_H - 26;
916 draw_line(x, y + 7, x + 2, y + 7, col_fg); 916 draw_line(x, y + 7, x + 2, y + 7, col_fg);
917 draw_line(x + 22, y + 7, x + 24, y + 7, col_fg); 917 draw_line(x + 22, y + 7, x + 24, y + 7, col_fg);
918 draw_line(x, y + 8, x, y + 19, col_fg); 918 draw_line(x, y + 8, x, y + 19, col_fg);
@@ -935,7 +935,7 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep, bool global) {
935 // Sweep direction. 935 // Sweep direction.
936 if (sweep) { 936 if (sweep) {
937 size_t x = PARAMS_START_X + 132; 937 size_t x = PARAMS_START_X + 132;
938 size_t y = PARAMS_START_Y + PARAMS_H - 45; 938 size_t y = PARAMS_START_Y + PARAMS_H - 46;
939 draw_line(x, y + 7, x + 4, y + 7, col_fg); 939 draw_line(x, y + 7, x + 4, y + 7, col_fg);
940 draw_line(x + 20, y + 7, x + 24, y + 7, col_fg); 940 draw_line(x + 20, y + 7, x + 24, y + 7, col_fg);
941 draw_line(x, y + 8, x, y + 19, col_fg); 941 draw_line(x, y + 8, x, y + 19, col_fg);
@@ -954,7 +954,7 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep, bool global) {
954 // Labels. 954 // Labels.
955 { 955 {
956 size_t x = PARAMS_START_X + x_offset; 956 size_t x = PARAMS_START_X + x_offset;
957 size_t y = PARAMS_START_Y + PARAMS_H - 45; 957 size_t y = PARAMS_START_Y + PARAMS_H - 48;
958 txt_drawf_small("shape", x + 1, y - 12, col_fg); 958 txt_drawf_small("shape", x + 1, y - 12, col_fg);
959 txt_drawf_small("envelope", x + 54, y - 12, col_fg); 959 txt_drawf_small("envelope", x + 54, y - 12, col_fg);
960 if (sweep) { 960 if (sweep) {
@@ -976,7 +976,7 @@ draw_parameters_noise(ChannelNoiseParams* params, bool global) {
976 // Param box. 976 // Param box.
977 { 977 {
978 size_t x = PARAMS_START_X + x_offset; 978 size_t x = PARAMS_START_X + x_offset;
979 size_t y = PARAMS_START_Y + PARAMS_H - 25; 979 size_t y = PARAMS_START_Y + PARAMS_H - 26;
980 draw_line(x, y + 7, x + 2, y + 7, col_fg); 980 draw_line(x, y + 7, x + 2, y + 7, col_fg);
981 draw_line(x + 22, y + 7, x + 24, y + 7, col_fg); 981 draw_line(x + 22, y + 7, x + 24, y + 7, col_fg);
982 draw_line(x, y + 8, x, y + 19, col_fg); 982 draw_line(x, y + 8, x, y + 19, col_fg);
@@ -998,14 +998,14 @@ draw_parameters_noise(ChannelNoiseParams* params, bool global) {
998 // Bounding box. 998 // Bounding box.
999 { 999 {
1000 size_t x0 = PARAMS_START_X + 31 + x_offset; 1000 size_t x0 = PARAMS_START_X + 31 + x_offset;
1001 size_t y0 = PARAMS_START_Y + PARAMS_H - 47; 1001 size_t y0 = PARAMS_START_Y + PARAMS_H - 50;
1002 size_t x1 = x0 + 79; 1002 size_t x1 = x0 + 79;
1003 size_t y1 = y0 + 21; 1003 size_t y1 = y0 + 21;
1004 draw_rect(x0, y0, x1, y1, COL_ACC_2); 1004 draw_rect(x0, y0, x1, y1, COL_ACC_2);
1005 } 1005 }
1006 1006
1007 size_t x = PARAMS_START_X + 42 + x_offset; 1007 size_t x = PARAMS_START_X + 42 + x_offset;
1008 size_t y = PARAMS_START_Y + PARAMS_H - 44; 1008 size_t y = PARAMS_START_Y + PARAMS_H - 47;
1009 size_t x0 = x; 1009 size_t x0 = x;
1010 size_t y0 = y + 15 - params->env_volume; 1010 size_t y0 = y + 15 - params->env_volume;
1011 size_t x1 = x + 8 * params->env_time; 1011 size_t x1 = x + 8 * params->env_time;
@@ -1025,7 +1025,7 @@ draw_parameters_noise(ChannelNoiseParams* params, bool global) {
1025 // Env. volume. 1025 // Env. volume.
1026 { 1026 {
1027 size_t x = PARAMS_START_X + 31 + x_offset; 1027 size_t x = PARAMS_START_X + 31 + x_offset;
1028 size_t y = PARAMS_START_Y + PARAMS_H - 25; 1028 size_t y = PARAMS_START_Y + PARAMS_H - 26;
1029 draw_line(x, y + 7, x + 4, y + 7, col_fg); 1029 draw_line(x, y + 7, x + 4, y + 7, col_fg);
1030 draw_line(x + 20, y + 7, x + 24, y + 7, col_fg); 1030 draw_line(x + 20, y + 7, x + 24, y + 7, col_fg);
1031 draw_line(x, y + 8, x, y + 19, col_fg); 1031 draw_line(x, y + 8, x, y + 19, col_fg);
@@ -1056,7 +1056,7 @@ draw_parameters_noise(ChannelNoiseParams* params, bool global) {
1056 // Env. direction 1056 // Env. direction
1057 { 1057 {
1058 size_t x = PARAMS_START_X + 59 + x_offset; 1058 size_t x = PARAMS_START_X + 59 + x_offset;
1059 size_t y = PARAMS_START_Y + PARAMS_H - 25; 1059 size_t y = PARAMS_START_Y + PARAMS_H - 26;
1060 draw_line(x, y + 7, x + 4, y + 7, col_fg); 1060 draw_line(x, y + 7, x + 4, y + 7, col_fg);
1061 draw_line(x + 20, y + 7, x + 24, y + 7, col_fg); 1061 draw_line(x + 20, y + 7, x + 24, y + 7, col_fg);
1062 draw_line(x, y + 8, x, y + 19, col_fg); 1062 draw_line(x, y + 8, x, y + 19, col_fg);
@@ -1079,7 +1079,7 @@ draw_parameters_noise(ChannelNoiseParams* params, bool global) {
1079 // Env. time. 1079 // Env. time.
1080 { 1080 {
1081 size_t x = PARAMS_START_X + 87 + x_offset; 1081 size_t x = PARAMS_START_X + 87 + x_offset;
1082 size_t y = PARAMS_START_Y + PARAMS_H - 25; 1082 size_t y = PARAMS_START_Y + PARAMS_H - 26;
1083 draw_line(x, y + 7, x + 2, y + 7, col_fg); 1083 draw_line(x, y + 7, x + 2, y + 7, col_fg);
1084 draw_line(x + 22, y + 7, x + 24, y + 7, col_fg); 1084 draw_line(x + 22, y + 7, x + 24, y + 7, col_fg);
1085 draw_line(x, y + 8, x, y + 19, col_fg); 1085 draw_line(x, y + 8, x, y + 19, col_fg);
@@ -1103,7 +1103,7 @@ draw_parameters_noise(ChannelNoiseParams* params, bool global) {
1103 // Labels. 1103 // Labels.
1104 { 1104 {
1105 size_t x = PARAMS_START_X + x_offset; 1105 size_t x = PARAMS_START_X + x_offset;
1106 size_t y = PARAMS_START_Y + PARAMS_H - 45; 1106 size_t y = PARAMS_START_Y + PARAMS_H - 48;
1107 txt_drawf_small("envelope", x + 54, y - 12, col_fg); 1107 txt_drawf_small("envelope", x + 54, y - 12, col_fg);
1108 } 1108 }
1109} 1109}
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;
52#define PARAMS_W 170 52#define PARAMS_W 170
53#define PARAMS_H 64 53#define PARAMS_H 64
54#define PARAMS_START_X 30 54#define PARAMS_START_X 30
55#define PARAMS_START_Y 1 55#define PARAMS_START_Y 4
56 56
57#define R_SIDEBAR_X ((TRIG_START_X) + (TRIG_OFFSET_X) * 8 + 4) 57#define R_SIDEBAR_X ((TRIG_START_X) + (TRIG_OFFSET_X) * 8 + 4)
58#define L_SIDEBAR_X ((CHAN_START_X) - 26) 58#define L_SIDEBAR_X ((CHAN_START_X) - 26)