no message

This commit is contained in:
BADIM-PC\Vadim 2017-12-13 16:02:16 +03:00
parent 80695209a4
commit 9c50e5a135
2 changed files with 58 additions and 5 deletions

View File

@ -144,6 +144,11 @@ static struct
} part; } part;
}gamepad; }gamepad;
struct
{
bool show;
} banks;
struct struct
{ {
s32 counter; s32 counter;
@ -251,6 +256,11 @@ static struct
.show = false, .show = false,
}, },
.banks =
{
.show = false,
},
.popup = .popup =
{ {
.counter = 0, .counter = 0,
@ -426,7 +436,7 @@ static const EditorMode Modes[] =
TIC_MUSIC_MODE, TIC_MUSIC_MODE,
}; };
void drawExtrabar(tic_mem* tic) static void drawExtrabar(tic_mem* tic)
{ {
enum {Size = 7}; enum {Size = 7};
@ -520,6 +530,43 @@ const StudioConfig* getConfig()
return &studio.config.data; return &studio.config.data;
} }
#if defined (TIC80_PRO)
static void drawBankIcon(s32 x, s32 y)
{
SDL_Rect rect = {x, y, TIC_FONT_WIDTH, TIC_FONT_HEIGHT};
static const u8 Icon[] =
{
0b00000000,
0b01111100,
0b01000100,
0b01000100,
0b01111100,
0b01111000,
0b00000000,
0b00000000,
};
bool over = false;
if(checkMousePos(&rect))
{
setCursor(SDL_SYSTEM_CURSOR_HAND);
over = true;
showTooltip("SWITCH BANK");
if(checkMouseClick(&rect, SDL_BUTTON_LEFT))
studio.banks.show = !studio.banks.show;
}
drawBitIcon(x, y, Icon, over ? tic_color_blue : tic_color_cyan);
}
#endif
void drawToolbar(tic_mem* tic, u8 color, bool bg) void drawToolbar(tic_mem* tic, u8 color, bool bg)
{ {
if(bg) if(bg)
@ -628,15 +675,22 @@ void drawToolbar(tic_mem* tic, u8 color, bool bg)
"MUSIC EDITOR", "MUSIC EDITOR",
}; };
if(mode >= 0) #if defined (TIC80_PRO)
enum {TextOffset = (COUNT_OF(Modes) + 2) * Size - 2};
drawBankIcon(COUNT_OF(Modes) * Size + 2, 0);
#else
enum {TextOffset = (COUNT_OF(Modes) + 1) * Size};
#endif
if(mode >= 0 && !studio.banks.show)
{ {
if(strlen(studio.tooltip.text)) if(strlen(studio.tooltip.text))
{ {
studio.tic->api.text(tic, studio.tooltip.text, (COUNT_OF(Modes) + 1) * Size, 1, (tic_color_black)); studio.tic->api.text(tic, studio.tooltip.text, TextOffset, 1, (tic_color_black));
} }
else else
{ {
studio.tic->api.text(tic, Names[mode], (COUNT_OF(Modes) + 1) * Size, 1, (tic_color_dark_gray)); studio.tic->api.text(tic, Names[mode], TextOffset, 1, (tic_color_dark_gray));
} }
} }
} }

View File

@ -141,7 +141,6 @@ bool getGesturePos(SDL_Point* pos);
const u8* getKeyboard(); const u8* getKeyboard();
void drawToolbar(tic_mem* tic, u8 color, bool bg); void drawToolbar(tic_mem* tic, u8 color, bool bg);
void drawExtrabar(tic_mem* tic);
void drawBitIcon(s32 x, s32 y, const u8* ptr, u8 color); void drawBitIcon(s32 x, s32 y, const u8* ptr, u8 color);
void studioRomLoaded(); void studioRomLoaded();