git subrepo pull troposphere/daybreak/nanovg/

This commit is contained in:
Adubbz 2020-12-18 12:06:47 +11:00 committed by SciresM
parent b8471bcd4e
commit 35a6705d55
3 changed files with 7 additions and 7 deletions

View file

@ -4,9 +4,9 @@
; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme ; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme
; ;
[subrepo] [subrepo]
remote = https://github.com/Adubbz/nanovg-deko.git remote = https://github.com/Adubbz/nanovg-deko3d.git
branch = master branch = master
commit = c197ba2f0d1fe2c70e2d49c61f16b4063aef569e commit = a8c9778aff08420b5b4af7b54bef5d4f3b5ac568
parent = 171d97e0ac2eaf1bca1c48727404fec45621f1fd parent = 797e3651d5e425231dd7f252489338e38872b116
method = merge method = merge
cmdver = 0.4.1 cmdver = 0.4.3

View file

@ -30,7 +30,7 @@ constexpr void CApplication::chooseFramebufferSize(uint32_t& width, uint32_t& he
width = 1280; width = 1280;
height = 720; height = 720;
break; break;
case AppletOperationMode_Docked: case AppletOperationMode_Console:
width = 1920; width = 1920;
height = 1080; height = 1080;
break; break;

View file

@ -20,7 +20,7 @@ void CApplication::run()
{ {
u64 tick_ref = armGetSystemTick(); u64 tick_ref = armGetSystemTick();
u64 tick_saved = tick_ref; u64 tick_saved = tick_ref;
bool focused = appletGetFocusState() == AppletFocusState_Focused; bool focused = appletGetFocusState() == AppletFocusState_InFocus;
onOperationMode(appletGetOperationMode()); onOperationMode(appletGetOperationMode());
@ -40,7 +40,7 @@ void CApplication::run()
{ {
bool old_focused = focused; bool old_focused = focused;
AppletFocusState state = appletGetFocusState(); AppletFocusState state = appletGetFocusState();
focused = state == AppletFocusState_Focused; focused = state == AppletFocusState_InFocus;
onFocusState(state); onFocusState(state);
if (focused == old_focused) if (focused == old_focused)