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

More NPAPI FF fixes.

Browse source
This commit is contained in:
Julian Storer 2011-08-02 11:13:38 +01:00
parent 1cc25eb765
commit 8d7194803e
1 changed files with 1252 additions and 1241 deletions
Download patch file Download diff file Expand all files Collapse all files

25
extras/browser plugins/wrapper/juce_NPAPI_GlueCode.cpp
View file

@ -560,21 +560,32 @@ public:
{
if (isFirefox4)
{
// This voodoo is required to keep the plugin clipped to the correct region and
// to stop it overwriting the toolbars in FF4.
const Rectangle<int> clip (window->clipRect.left, window->clipRect.top,
window->clipRect.right - window->clipRect.left,
window->clipRect.bottom - window->clipRect.top);
const Rectangle<int> target ((int) window->x, (int) window->y, (int) window->width, (int) window->height);
const Rectangle<int> intersection (clip.getIntersection (target));
Point<int> clipToTargetOffset;
{
NSView* contentView = [[parentView window] contentView];
NSRect v = [contentView convertRect: [contentView frame] toView: nil];
NSRect w = [[parentView window] frame];
clipToTargetOffset.setX ((int) v.origin.x);
clipToTargetOffset.setY ((int) (w.size.height - (v.origin.y + v.size.height)));
}
if (child != nullptr)
child->setBounds (target.withPosition (target.getPosition() - clip.getPosition()));
child->setBounds (target - clip.getPosition() - clipToTargetOffset);
// This voodoo is required to keep the plugin clipped to the correct region and
// to stop it overwriting the toolbars in FF4.
NSRect parentFrame = [parentView frame];
setBounds (parentFrame.origin.x + target.getWidth() - clip.getRight(),
parentFrame.origin.y + target.getHeight() - clip.getBottom(),
intersection.getWidth(), intersection.getHeight());
[(NSView*) getWindowHandle() setFrame: NSMakeRect (clip.getX() - parentFrame.origin.x,
clip.getY() - parentFrame.origin.y,
clip.getWidth(), clip.getHeight())];
}
else
{