Skip to content

Commit 72b4e28

Browse files
asiekierkaasiekierka
committed
enable seven pattern view rows
1 parent 5e26238 commit 72b4e28

2 files changed

Lines changed: 29 additions & 26 deletions

File tree

‎arm9/bitmaps/icon_flp.png‎

-95 Bytes
Loading

‎arm9/source/main.cpp‎

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2786,6 +2786,9 @@ void sampleDrawToggle(bool on)
27862786
sampledisplay->setDrawMode(on);
27872787
}
27882788

2789+
#define RIGHT_SIDE_BUTTON_WIDTH 28
2790+
#define RIGHT_SIDE_BUTTON_X 227
2791+
27892792
void setupGUI(bool dldi_enabled)
27902793
{
27912794
gui = new GUI();
@@ -3279,17 +3282,17 @@ void setupGUI(bool dldi_enabled)
32793282

32803283
lbsamples = new ListBox(141, 100, 114, 23, &sub_vram, MAX_INSTRUMENT_SAMPLES, true, false, true);
32813284

3282-
buttonswitchsub = new BitButton(234, 1 , 21, 21, &sub_vram, icon_flp_raw, 18, 18);
3285+
buttonswitchsub = new BitButton(236, 1 , 19, 19, &sub_vram, icon_flp_raw, 15, 15);
32833286
buttonplay = new BitButton(180, 3 , 23, 15, &sub_vram, icon_play_raw, 12, 12, 5, 0, true);
32843287
buttonpause = new BitButton(180, 3 , 23, 15, &sub_vram, icon_pause_raw, 12, 12, 5, 0, false);
32853288
buttonstop = new BitButton(204, 3 , 23, 15, &sub_vram, icon_stop_raw, 12, 12, 5, 0);
32863289

3287-
buttonundo = new BitButton(226, 127, 14, 12, &sub_vram, icon_undo_raw, 8, 8, 3, 2);
3288-
buttonredo = new BitButton(226 + 15, 127, 14, 12, &sub_vram, icon_redo_raw, 8, 8, 3, 2);
3289-
buttoninsnote2 = new Button(225, 140, 30, 12, &sub_vram);
3290-
buttondelnote2 = new Button(225, 153, 30, 12, &sub_vram);
3291-
buttonemptynote = new Button(225, 166, 30, 12, &sub_vram);
3292-
buttonstopnote = new Button(225, 179, 30, 12, &sub_vram);
3290+
buttonundo = new BitButton(RIGHT_SIDE_BUTTON_X, 127, 14, 12, &sub_vram, icon_undo_raw, 8, 8, 3, 2);
3291+
buttonredo = new BitButton(RIGHT_SIDE_BUTTON_X + RIGHT_SIDE_BUTTON_WIDTH - 14, 127, 14, 12, &sub_vram, icon_redo_raw, 8, 8, 3, 2);
3292+
buttoninsnote2 = new Button(RIGHT_SIDE_BUTTON_X, 140, RIGHT_SIDE_BUTTON_WIDTH, 12, &sub_vram);
3293+
buttondelnote2 = new Button(RIGHT_SIDE_BUTTON_X, 153, RIGHT_SIDE_BUTTON_WIDTH, 12, &sub_vram);
3294+
buttonemptynote = new Button(RIGHT_SIDE_BUTTON_X, 166, RIGHT_SIDE_BUTTON_WIDTH, 12, &sub_vram);
3295+
buttonstopnote = new Button(RIGHT_SIDE_BUTTON_X, 179, RIGHT_SIDE_BUTTON_WIDTH, 12, &sub_vram);
32933296
buttonrenamesample = new Button(141, 124, 23, 12, &sub_vram, false);
32943297
buttonrenameinst = new Button(141, 19 , 23, 12, &sub_vram);
32953298

@@ -3344,28 +3347,28 @@ void setupGUI(bool dldi_enabled)
33443347
tbmultisample->setCaption("+");
33453348

33463349
// <Main Screen>
3347-
buttonswitchmain = new BitButton(234, 1 , 21, 21, &main_vram_back, icon_flp_raw, 18, 18);
3350+
buttonswitchmain = new BitButton(236, 1 , 19, 19, &main_vram_back, icon_flp_raw, 15, 15);
33483351
buttonswitchmain->registerPushCallback(switchScreens);
33493352

3350-
buttonunmuteall = new Button(225, 31, 30, 12, &main_vram_back);
3353+
buttonunmuteall = new Button(RIGHT_SIDE_BUTTON_X, 22, RIGHT_SIDE_BUTTON_WIDTH, 12, &main_vram_back);
33513354
buttonunmuteall->setCaption("-m/s");
33523355

3353-
labelnotevol = new Label(230, 44, 23, 10, &main_vram_back, false, true);
3356+
labelnotevol = new Label(RIGHT_SIDE_BUTTON_X + 5, 34, RIGHT_SIDE_BUTTON_WIDTH - 7, 9, &main_vram_back, false, true);
33543357
labelnotevol->setCaption("vol");
33553358

3356-
nsnotevolume = new NumberSlider(225, 54, 30, 17, &main_vram_back, 127, 0, 127, true, true);
3359+
nsnotevolume = new NumberSlider(RIGHT_SIDE_BUTTON_X, 45, RIGHT_SIDE_BUTTON_WIDTH, 17, &main_vram_back, 127, 0, 127, true, true);
33573360
nsnotevolume->registerPostChangeCallback(handleNoteVolumeChanged);
33583361

3359-
buttonsetnotevol = new Button(225, 70, 30, 12, &main_vram_back);
3362+
buttonsetnotevol = new Button(RIGHT_SIDE_BUTTON_X, 61, RIGHT_SIDE_BUTTON_WIDTH, 12, &main_vram_back);
33603363
buttonsetnotevol->setCaption("set");
33613364
buttonsetnotevol->registerPushCallback(handleSetNoteVol);
33623365

3363-
labeltranspose = new Label(200, 1, 48, 12, &main_vram_back, false, true);
3364-
labeltranspose->setCaption("trps");
3365-
buttontransposedown = new Button(199, 13, 12, 12, &main_vram_back);
3366+
/* labeltranspose = new Label(200, 1, 48, 12, &main_vram_back, false, true);
3367+
labeltranspose->setCaption("trps"); */
3368+
buttontransposedown = new Button(RIGHT_SIDE_BUTTON_X, 74, 14, 12, &main_vram_back);
33663369
buttontransposedown->setCaption("-");
33673370
buttontransposedown->registerPushCallback(handleTransposeDown);
3368-
buttontransposeup = new Button(212, 13, 12, 12, &main_vram_back);
3371+
buttontransposeup = new Button(RIGHT_SIDE_BUTTON_X + RIGHT_SIDE_BUTTON_WIDTH - 14, 74, 14, 12, &main_vram_back);
33693372
buttontransposeup->setCaption("+");
33703373
buttontransposeup->registerPushCallback(handleTransposeUp);
33713374

@@ -3399,19 +3402,19 @@ void setupGUI(bool dldi_enabled)
33993402
//buttoncopy = new BitButton(232, 74, 22, 21, &main_vram_back, icon_copy_raw, 16, 16, 3, 3);
34003403
//buttonpaste = new BitButton(232, 96, 22, 21, &main_vram_back, icon_paste_raw, 16, 16, 3, 3);
34013404

3402-
buttoncut = new Button(225, 86, 30, 12, &main_vram_back);
3403-
buttoncopy = new Button(225, 99, 30, 12, &main_vram_back);
3404-
buttonpaste = new Button(225, 112, 30, 12, &main_vram_back);
3405+
buttoncut = new Button(RIGHT_SIDE_BUTTON_X, 88, RIGHT_SIDE_BUTTON_WIDTH, 12, &main_vram_back);
3406+
buttoncopy = new Button(RIGHT_SIDE_BUTTON_X, 101, RIGHT_SIDE_BUTTON_WIDTH, 12, &main_vram_back);
3407+
buttonpaste = new Button(RIGHT_SIDE_BUTTON_X, 114, RIGHT_SIDE_BUTTON_WIDTH, 12, &main_vram_back);
34053408

34063409
buttoncut->setCaption("cut");
34073410
buttoncopy->setCaption("cp");
34083411
buttonpaste->setCaption("pst");
34093412

3410-
buttoncolselect = new Button(225, 125, 30, 12, &main_vram_back);
3411-
buttoninsnote = new Button(225, 140, 30, 12, &main_vram_back);
3412-
buttondelnote = new Button(225, 153, 30, 12, &main_vram_back);
3413-
buttonemptynote2 = new Button(225, 166, 30, 12, &main_vram_back);
3414-
buttonstopnote2 = new Button(225, 179, 30, 12, &main_vram_back);
3413+
buttoncolselect = new Button(RIGHT_SIDE_BUTTON_X, 127, RIGHT_SIDE_BUTTON_WIDTH, 12, &main_vram_back);
3414+
buttoninsnote = new Button(RIGHT_SIDE_BUTTON_X, 140, RIGHT_SIDE_BUTTON_WIDTH, 12, &main_vram_back);
3415+
buttondelnote = new Button(RIGHT_SIDE_BUTTON_X, 153, RIGHT_SIDE_BUTTON_WIDTH, 12, &main_vram_back);
3416+
buttonemptynote2 = new Button(RIGHT_SIDE_BUTTON_X, 166, RIGHT_SIDE_BUTTON_WIDTH, 12, &main_vram_back);
3417+
buttonstopnote2 = new Button(RIGHT_SIDE_BUTTON_X, 179, RIGHT_SIDE_BUTTON_WIDTH, 12, &main_vram_back);
34153418

34163419
buttonunmuteall->registerPushCallback(handleUnmuteAll);
34173420
buttoncut->registerPushCallback(handleCut);
@@ -3429,7 +3432,7 @@ void setupGUI(bool dldi_enabled)
34293432
buttondelnote->setCaption("del");
34303433
buttonemptynote2->setCaption("clr");
34313434

3432-
pv = new PatternView(0, 0, 200, 192, &main_vram_back, state);
3435+
pv = new PatternView(0, 0, RIGHT_SIDE_BUTTON_X, 192, &main_vram_back, state);
34333436
pv->setSong(song);
34343437
pv->registerMuteCallback(handleMuteChannelsChanged);
34353438

@@ -3438,7 +3441,7 @@ void setupGUI(bool dldi_enabled)
34383441
gui->registerWidget(labelnotevol, 0, MAIN_SCREEN);
34393442
gui->registerWidget(nsnotevolume, 0, MAIN_SCREEN);
34403443
gui->registerWidget(buttonsetnotevol, 0, MAIN_SCREEN);
3441-
gui->registerWidget(labeltranspose, 0, MAIN_SCREEN);
3444+
/* gui->registerWidget(labeltranspose, 0, MAIN_SCREEN); */
34423445
gui->registerWidget(buttontransposedown, 0, MAIN_SCREEN);
34433446
gui->registerWidget(buttontransposeup, 0, MAIN_SCREEN);
34443447
#ifdef ENABLE_EFFECT_MENU

0 commit comments

Comments
 (0)