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

OpenGL: Revert commits 515f484 and 0a15be7 and calculate scale factor using relative bounds instead

Browse source
This commit is contained in:
ed 2018-01-22 14:46:02 +00:00
parent d668adb81b
commit c715b069b5
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
modules/juce_opengl/opengl/juce_OpenGLContext.cpp
View file

@ -157,9 +157,7 @@ public:
bool invalidate (const Rectangle<int>& area) override
{
auto scaled = area.toFloat() * scale;
validArea.subtract (scaled.transformedBy (transform).getSmallestIntegerContainer());
validArea.subtract (area.toFloat().transformedBy (transform).getSmallestIntegerContainer());
triggerRepaint();
return false;
}
@ -287,17 +285,18 @@ public:
auto newScale = Desktop::getInstance().getDisplays()
.getDisplayContaining (lastScreenBounds.getCentre()).scale;
auto newArea = peer->getComponent().getLocalArea (&component, component.getLocalBounds())
auto localBounds = component.getLocalBounds();
auto newArea = peer->getComponent().getLocalArea (&component, localBounds)
.withZeroOrigin()
* newScale;
auto newTransform = component.getTransform();
if (scale != newScale || viewportArea != newArea || transform != newTransform)
if (scale != newScale || viewportArea != newArea)
{
scale = newScale;
viewportArea = newArea;
transform = newTransform;
transform = AffineTransform::scale ((float) newArea.getRight() / (float) localBounds.getRight(),
(float) newArea.getBottom() / (float) localBounds.getBottom());
if (canTriggerUpdate)
invalidateAll();
@ -340,7 +339,7 @@ public:
{
ScopedPointer<LowLevelGraphicsContext> g (createOpenGLGraphicsContext (context, cachedImageFrameBuffer));
g->clipToRectangleList (invalid);
g->addTransform (transform.followedBy (AffineTransform::scale ((float) scale)));
g->addTransform (transform);
paintOwner (*g);
JUCE_CHECK_OPENGL_ERROR