ft2-clone

Fasttracker 2 clone
Log | Files | Refs | README | LICENSE

commit 63fe6a3c1d5015d84eea470bcc77e1e74ab42f31
parent e5e970f208ebe77b10b66f7bb0e3a7c1504a3b5d
Author: Olav Sørensen <olav.sorensen@live.no>
Date:   Tue, 31 Dec 2024 18:05:53 +0100

Small layout fix for Config -> Miscellaneous

Diffstat:
Msrc/ft2_checkboxes.c | 14+++++++-------
Msrc/ft2_config.c | 26++++++++++++++------------
Msrc/ft2_pushbuttons.c | 4++--
3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/ft2_checkboxes.c b/src/ft2_checkboxes.c @@ -98,13 +98,13 @@ checkBox_t checkBoxes[NUM_CHECKBOXES] = { 212, 15, 153, 12, cbPattCutToBuff }, { 212, 28, 159, 12, cbKillNotesAtStop }, { 212, 41, 149, 12, cbFileOverwriteWarn }, - { 212, 69, 130, 12, cbMultiChanRec }, - { 212, 82, 157, 12, cbMultiChanKeyJazz }, - { 212, 95, 114, 12, cbMultiChanEdit }, - { 212, 108, 143, 12, cbRecKeyOff }, - { 212, 121, 89, 12, cbQuantization }, - { 212, 134, 180, 25, cbChangePattLenInsDel }, - { 212, 159, 182, 12, cbUseOldAboutScreen }, + { 212, 68, 130, 12, cbMultiChanRec }, + { 212, 81, 157, 12, cbMultiChanKeyJazz }, + { 212, 94, 114, 12, cbMultiChanEdit }, + { 212, 107, 143, 12, cbRecKeyOff }, + { 212, 120, 89, 12, cbQuantization }, + { 212, 133, 180, 24, cbChangePattLenInsDel }, + { 212, 159, 169, 12, cbUseOldAboutScreen }, { 411, 93, 83, 12, cbMIDIEnable }, { 530, 106, 29, 12, cbMIDIRecAllChn }, { 411, 119, 121, 12, cbMIDIRecTransp }, diff --git a/src/ft2_config.c b/src/ft2_config.c @@ -741,7 +741,7 @@ static void drawQuantValue(void) { char str[8]; sprintf(str, "%02d", config.recQuantRes); - textOutFixed(354, 123, PAL_FORGRND, PAL_DESKTOP, str); + textOutFixed(354, 122, PAL_FORGRND, PAL_DESKTOP, str); } static void drawMIDIChanValue(void) @@ -1291,11 +1291,13 @@ void showConfigScreen(void) drawFramework(408, 0, 224, 91, FRAMEWORK_TYPE1); drawFramework(110, 43, 99, 57, FRAMEWORK_TYPE1); - drawFramework(209, 55, 199, 118, FRAMEWORK_TYPE1); + drawFramework(209, 55, 199, 118-16, FRAMEWORK_TYPE1); drawFramework(408, 91, 224, 82, FRAMEWORK_TYPE1); drawFramework(110, 100, 99, 73, FRAMEWORK_TYPE1); + drawFramework(209, 157, 199, 16, FRAMEWORK_TYPE1); + // text boxes drawFramework(485, 15, 145, 14, FRAMEWORK_TYPE2); drawFramework(485, 30, 145, 14, FRAMEWORK_TYPE2); @@ -1331,16 +1333,16 @@ void showConfigScreen(void) textOutShadow(130, 143, PAL_FORGRND, PAL_DSKTOP2, "Stretched"); textOutShadow(130, 156, PAL_FORGRND, PAL_DSKTOP2, "Pixel filter"); - textOutShadow(213, 58, PAL_FORGRND, PAL_DSKTOP2, "Rec./Edit/Play:"); - textOutShadow(228, 71, PAL_FORGRND, PAL_DSKTOP2, "Multichannel record"); - textOutShadow(228, 84, PAL_FORGRND, PAL_DSKTOP2, "Multichannel \"key jazz\""); - textOutShadow(228, 97, PAL_FORGRND, PAL_DSKTOP2, "Multichannel edit"); - textOutShadow(228, 110, PAL_FORGRND, PAL_DSKTOP2, "Record key-off notes"); - textOutShadow(228, 123, PAL_FORGRND, PAL_DSKTOP2, "Quantization"); - textOutShadow(338, 123, PAL_FORGRND, PAL_DSKTOP2, "1/"); - textOutShadow(228, 136, PAL_FORGRND, PAL_DSKTOP2, "Change pattern length when"); - textOutShadow(228, 147, PAL_FORGRND, PAL_DSKTOP2, "inserting/deleting line."); - textOutShadow(228, 161, PAL_FORGRND, PAL_DSKTOP2, "Original FT2 \"about screen\""); + textOutShadow(213, 57, PAL_FORGRND, PAL_DSKTOP2, "Rec./Edit/Play:"); + textOutShadow(228, 70, PAL_FORGRND, PAL_DSKTOP2, "Multichannel record"); + textOutShadow(228, 83, PAL_FORGRND, PAL_DSKTOP2, "Multichannel \"key jazz\""); + textOutShadow(228, 96, PAL_FORGRND, PAL_DSKTOP2, "Multichannel edit"); + textOutShadow(228, 109, PAL_FORGRND, PAL_DSKTOP2, "Record key-off notes"); + textOutShadow(228, 122, PAL_FORGRND, PAL_DSKTOP2, "Quantization"); + textOutShadow(338, 122, PAL_FORGRND, PAL_DSKTOP2, "1/"); + textOutShadow(228, 135, PAL_FORGRND, PAL_DSKTOP2, "Change pattern length when"); + textOutShadow(228, 146, PAL_FORGRND, PAL_DSKTOP2, "inserting/deleting line."); + textOutShadow(228, 161, PAL_FORGRND, PAL_DSKTOP2, "Original FT2 About screen"); textOutShadow(428, 95, PAL_FORGRND, PAL_DSKTOP2, "Enable MIDI"); textOutShadow(412, 108, PAL_FORGRND, PAL_DSKTOP2, "Record MIDI chn."); diff --git a/src/ft2_pushbuttons.c b/src/ft2_pushbuttons.c @@ -338,8 +338,8 @@ pushButton_t pushButtons[NUM_PUSHBUTTONS] = // ------ CONFIG MISCELLANEOUS PUSHBUTTONS ------ //x, y, w, h, p, d, text #1, text #2, funcOnDown, funcOnUp - { 370, 121, 18, 13, 1, 4, ARROW_UP_STRING, NULL, configQuantizeUp, NULL }, - { 387, 121, 18, 13, 1, 4, ARROW_DOWN_STRING, NULL, configQuantizeDown, NULL }, + { 370, 120, 18, 13, 1, 4, ARROW_UP_STRING, NULL, configQuantizeUp, NULL }, + { 387, 120, 18, 13, 1, 4, ARROW_DOWN_STRING, NULL, configQuantizeDown, NULL }, { 594, 106, 18, 13, 1, 4, ARROW_UP_STRING, NULL, configMIDIChnUp, NULL }, { 611, 106, 18, 13, 1, 4, ARROW_DOWN_STRING, NULL, configMIDIChnDown, NULL }, { 594, 120, 18, 13, 1, 4, ARROW_UP_STRING, NULL, configMIDITransUp, NULL },