mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Android: Fix scaling of bounds and input coordinates for components using a custom desktop scale factor

Browse source
This commit is contained in:
reuk 2025-06-26 17:19:47 +01:00
parent 90b89e92b2
commit 17e13c22fc
No known key found for this signature in database
2 changed files with 36 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

31
modules/juce_opengl/native/juce_OpenGL_android.h
View file

@ -147,10 +147,7 @@ public:
AndroidViewGroup.addView, surfaceView.get());
// initialise the geometry of the view
auto bounds = component.getTopLevelComponent()->getLocalArea (&component, component.getLocalBounds());
bounds *= component.getDesktopScaleFactor();
updateWindowPosition (bounds);
updateWindowPosition (component.localAreaToGlobal (component.getLocalBounds()));
hasInitialised = true;
}
@ -221,16 +218,17 @@ public:
//==============================================================================
void updateWindowPosition (Rectangle<int> bounds)
{
if (lastBounds != bounds)
{
auto env = getEnv();
const auto physical = Desktop::getInstance().getDisplays().logicalToPhysical (bounds.toFloat()).toNearestInt();
lastBounds = bounds;
auto r = bounds * Desktop::getInstance().getDisplays().getPrimaryDisplay()->scale;
if (std::exchange (physicalBounds, physical) == physical)
return;
env->CallVoidMethod (surfaceView.get(), JuceOpenGLViewSurface.layout,
(jint) r.getX(), (jint) r.getY(), (jint) r.getRight(), (jint) r.getBottom());
}
getEnv()->CallVoidMethod (surfaceView.get(),
JuceOpenGLViewSurface.layout,
(jint) physical.getX(),
(jint) physical.getY(),
(jint) physical.getRight(),
(jint) physical.getBottom());
}
//==============================================================================
@ -401,7 +399,7 @@ private:
bool hasInitialised = false;
GlobalRef surfaceView;
Rectangle<int> lastBounds;
Rectangle<int> physicalBounds;
struct SurfaceDestructor
{
@ -421,15 +419,12 @@ private:
GlobalRef surfaceHolderCallback;
static EGLDisplay display;
static EGLConfig config;
inline static EGLDisplay display = EGL_NO_DISPLAY;
inline static EGLConfig config;
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (NativeContext)
};
EGLDisplay OpenGLContext::NativeContext::display = EGL_NO_DISPLAY;
EGLDisplay OpenGLContext::NativeContext::config;
//==============================================================================
bool OpenGLHelpers::isContextActive()
{