UI Changes, moved hamburger menu (#317)
This commit is contained in:
BIN
assets/back.png
BIN
assets/back.png
Binary file not shown.
|
Before Width: | Height: | Size: 632 B After Width: | Height: | Size: 606 B |
@@ -695,7 +695,7 @@ void draw_interface(Entry_List_s * list, Instructions_s instructions, DrawMode d
|
||||
{
|
||||
char * shuffle_count_string = NULL;
|
||||
asprintf(&shuffle_count_string, language.draw.shuffle, list->shuffle_count);
|
||||
draw_text(7, 3, 0.6, 0.6, 0.6f, list->shuffle_count <= 10 && list->shuffle_count >= 2 ? colors[COLOR_WHITE] : colors[COLOR_RED], shuffle_count_string);
|
||||
draw_text(30, 3, 0.6, 0.6, 0.6f, list->shuffle_count <= 10 && list->shuffle_count >= 2 ? colors[COLOR_WHITE] : colors[COLOR_RED], shuffle_count_string);
|
||||
free(shuffle_count_string);
|
||||
}
|
||||
|
||||
@@ -706,10 +706,10 @@ void draw_interface(Entry_List_s * list, Instructions_s instructions, DrawMode d
|
||||
draw_image(sprites_exit_idx, 320-72, 0);
|
||||
draw_image(sprites_preview_idx, 320-48, 0);
|
||||
draw_text(320-24+2.5, -3, 0.6, 1.0f, 0.9f, colors[COLOR_WHITE], mode_switch_char[!current_mode]);
|
||||
draw_image(sprites_menu_idx, 320-144, 0);
|
||||
draw_image(sprites_menu_idx, 2, 0);
|
||||
if (current_mode == MODE_THEMES)
|
||||
{
|
||||
draw_image(sprites_shuffle_idx, 320-168, 0);
|
||||
draw_image(sprites_shuffle_idx, 320-144, 0);
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -720,14 +720,14 @@ void draw_interface(Entry_List_s * list, Instructions_s instructions, DrawMode d
|
||||
draw_image(sprites_shuffle_idx, 320-48, 0);
|
||||
draw_image(sprites_shuffle_no_bgm_idx, 320-72, 0);
|
||||
draw_image(sprites_bgm_only_idx, 320-96, 0);
|
||||
draw_image(sprites_back_idx, 320-120, 0);
|
||||
draw_image(sprites_back_idx, 2, 0);
|
||||
} else if (draw_mode == DRAW_MODE_EXTRA)
|
||||
{
|
||||
draw_image(sprites_browse_idx, 320-24, 0);
|
||||
draw_image(sprites_dump_idx, 320-48, 0);
|
||||
draw_image(sprites_sort_idx, 320-72, 0);
|
||||
draw_image(sprites_badge_idx, 320-96, 0);
|
||||
draw_image(sprites_back_idx, 320-120, 0);
|
||||
draw_image(sprites_back_idx, 2, 0);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -640,7 +640,7 @@ int main(void)
|
||||
} else if (BETWEEN(320-96, x, 320-72))
|
||||
{
|
||||
goto install_theme_bgm_only;
|
||||
} else if (BETWEEN(320-120, x, 320-96))
|
||||
} else if (BETWEEN(2, x, 26))
|
||||
{
|
||||
goto install_leave;
|
||||
}
|
||||
@@ -791,7 +791,7 @@ int main(void)
|
||||
} else if (BETWEEN(320-96, x, 320-72))
|
||||
{
|
||||
goto badge_install;
|
||||
} else if (BETWEEN(320-120, x, 320-96))
|
||||
} else if (BETWEEN(2, x, 26))
|
||||
{
|
||||
extra_mode = false;
|
||||
extra_index = 1;
|
||||
@@ -1036,14 +1036,14 @@ int main(void)
|
||||
{
|
||||
if(y < 24)
|
||||
{
|
||||
if(BETWEEN(320-168, x, 320-144))
|
||||
if(BETWEEN(320-144, x, 320-120))
|
||||
{
|
||||
if (current_mode == MODE_THEMES)
|
||||
{
|
||||
toggle_shuffle(current_list);
|
||||
}
|
||||
}
|
||||
else if(BETWEEN(320-144, x, 320-120))
|
||||
else if(BETWEEN(2, x, 26))
|
||||
{
|
||||
extra_mode = true;
|
||||
draw_mode = DRAW_MODE_EXTRA;
|
||||
|
||||
Reference in New Issue
Block a user