Merge pull request #813 from cuu/master

fix -fullscreen
This commit is contained in:
Vadim Grigoruk 2019-02-24 11:15:52 +03:00 committed by GitHub
commit 613c2df6fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 5 deletions

View File

@ -1875,11 +1875,6 @@ Studio* studioInit(s32 argc, char **argv, s32 samplerate, const char* folder, Sy
setStudioMode(TIC_CONSOLE_MODE); setStudioMode(TIC_CONSOLE_MODE);
} }
if(impl.console->goFullscreen)
{
goFullscreen();
}
if(impl.console->crtMonitor) if(impl.console->crtMonitor)
{ {
impl.config->data.crtMonitor = true; impl.config->data.crtMonitor = true;
@ -1895,6 +1890,15 @@ Studio* studioInit(s32 argc, char **argv, s32 samplerate, const char* folder, Sy
return &impl.studio; return &impl.studio;
} }
void studioInitPost() {
if(impl.console->goFullscreen)
{
goFullscreen();
}
}
System* getSystem() System* getSystem()
{ {
return impl.system; return impl.system;

View File

@ -101,3 +101,4 @@ typedef struct
} Studio; } Studio;
TIC80_API Studio* studioInit(s32 argc, char **argv, s32 samplerate, const char* appFolder, System* system); TIC80_API Studio* studioInit(s32 argc, char **argv, s32 samplerate, const char* appFolder, System* system);
TIC80_API void studioInitPost();

View File

@ -1456,6 +1456,8 @@ static s32 start(s32 argc, char **argv, const char* folder)
GPU_SetWindowResolution(w, h); GPU_SetWindowResolution(w, h);
} }
studioInitPost();
initTouchGamepad(); initTouchGamepad();
initTouchKeyboard(); initTouchKeyboard();