New controls (#106)

* make theme delete function general and clean it up

* add steam big picture-like controls

* aesthetic changes
This commit is contained in:
LiquidFenrir
2017-12-09 04:25:49 +01:00
committed by GitHub
parent 78bdb0d738
commit a92db32d67
8 changed files with 157 additions and 119 deletions

View File

@@ -63,7 +63,7 @@ enum TextureID {
TEXTURE_BATTERY_CHARGE,
TEXTURE_QR,
TEXTURE_PREVIEW,
TEXTURE_SELECT_BUTTON, //Add the new select texture
TEXTURE_SELECT_BUTTON,
TEXTURE_ICON, // always the last
};

View File

@@ -37,8 +37,10 @@ typedef enum {
INSTALL_SINGLE,
INSTALL_SHUFFLE,
INSTALL_BGM,
INSTALL_NO_BGM,
INSTALL_DOWNLOAD,
INSTALL_ENTRY_DELETE,
} InstallType;
typedef enum {
@@ -46,15 +48,17 @@ typedef enum {
ERROR_LEVEL_WARNING,
} ErrorLevel;
#define BUTTONS_START_Y 140
#define BUTTONS_STEP 25
#define BUTTONS_START_Y 130
#define BUTTONS_STEP 22
enum {
BUTTONS_Y_PREVIEW = BUTTONS_START_Y+5,
BUTTONS_Y_LINE_1 = BUTTONS_START_Y + BUTTONS_STEP*1,
BUTTONS_Y_INFO = BUTTONS_Y_LINE_1+5,
BUTTONS_Y_LINE_2 = BUTTONS_START_Y + BUTTONS_STEP*2,
BUTTONS_Y_LINE_3 = BUTTONS_START_Y + BUTTONS_STEP*3,
BUTTONS_Y_LINE_4 = BUTTONS_START_Y + BUTTONS_STEP*4,
BUTTONS_X_LEFT = 20,
BUTTONS_X_RIGHT = 200,
@@ -70,6 +74,6 @@ void draw_preview(int preview_offset);
void draw_install(InstallType type);
void draw_interface(Entry_List_s* list, EntryMode current_mode);
void draw_interface(Entry_List_s* list, EntryMode current_mode, bool install_mode);
#endif

View File

@@ -68,6 +68,7 @@ typedef struct {
int shuffle_count;
} Entry_List_s;
void delete_entry(Entry_s entry);
Result load_entries(const char * loading_path, Entry_List_s * list);
bool load_preview(Entry_List_s list, int * preview_offset);
u32 load_data(char * filename, Entry_s entry, char ** buf);

View File

@@ -69,8 +69,6 @@ typedef struct {
u32 shuffle_music_sizes[MAX_SHUFFLE_THEMES];
} ThemeManage_bin_s;
void delete_theme(Entry_s theme);
Result theme_install(Entry_s theme);
Result no_bgm_install(Entry_s theme);
Result bgm_install(Entry_s theme);