mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-03 03:30:06 +00:00
Code Activity

Android: Make sure nav bars get hidden when asking for full screen mode and avoid retriggering the timer when they are already hidden

Browse source
This commit is contained in:
hogliux 2017-10-18 14:28:33 +01:00
parent 332ad9d489
commit 431c834db2
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
modules/juce_gui_basics/native/juce_android_Windowing.cpp
View file

@ -137,6 +137,7 @@ public:
AndroidComponentPeer (Component& comp, const int windowStyleFlags)
: ComponentPeer (comp, windowStyleFlags),
fullScreen (false),
navBarsHidden (false),
sizeAllocated (0),
scale ((float) Desktop::getInstance().getDisplays().getMainDisplay().scale)
{
@ -289,9 +290,9 @@ public:
return false;
}
bool shouldNavBarsBeHidden() const
bool shouldNavBarsBeHidden (bool shouldBeFullScreen) const
{
if (fullScreen)
if (shouldBeFullScreen)
if (Component* kiosk = Desktop::getInstance().getKioskModeComponent())
if (kiosk->getPeer() == this)
return true;
@ -299,7 +300,7 @@ public:
return false;
}
void setNavBarsHidden (bool hidden) const
void setNavBarsHidden (bool hidden)
{
enum
{
@ -316,18 +317,24 @@ public:
view.callVoidMethod (ComponentPeerView.setSystemUiVisibility,
hidden ? (jint) (SYSTEM_UI_FLAG_HIDE_NAVIGATION | SYSTEM_UI_FLAG_FULLSCREEN | SYSTEM_UI_FLAG_IMMERSIVE_STICKY)
: (jint) (SYSTEM_UI_FLAG_VISIBLE));
navBarsHidden = hidden;
}
void setFullScreen (bool shouldBeFullScreen) override
{
// updating the nav bar visibility is a bit odd on Android - need to wait for
if (shouldNavBarsBeHidden())
if (shouldNavBarsBeHidden (shouldBeFullScreen))
{
if (! isTimerRunning())
if (! navBarsHidden && ! isTimerRunning())
{
startTimer (500);
}
}
else
{
setNavBarsHidden (false);
}
Rectangle<int> r (shouldBeFullScreen ? Desktop::getInstance().getDisplays().getMainDisplay().userArea
: lastNonFullscreenBounds);
@ -349,7 +356,7 @@ public:
void timerCallback() override
{
setNavBarsHidden (shouldNavBarsBeHidden());
setNavBarsHidden (shouldNavBarsBeHidden (fullScreen));
setFullScreen (fullScreen);
stopTimer();
}
@ -608,6 +615,7 @@ private:
GlobalRef view;
GlobalRef buffer;
bool fullScreen;
bool navBarsHidden;
int sizeAllocated;
float scale;
static AndroidComponentPeer* frontWindow;