AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'osx-overlay'

Browse Source 
Fix wxOverlay under recent macOS versions.

Closes https://github.com/wxWidgets/wxWidgets/pull/1977
This commit is contained in:
Vadim Zeitlin 2020-07-19 00:20:36 +02:00
commit 2e51076159
3 changed files with 99 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/drawing/drawing.cpp
View File

@ -2108,7 +2108,7 @@ void MyCanvas::UseGraphicRenderer(wxGraphicsRenderer* renderer)
#if wxUSE_DC_TRANSFORM_MATRIX
#include <wx/valnum.h>
#include "wx/valnum.h"
class TransformDataDialog : public wxDialog
{

2
src/dfb/overlay.cpp
View File

@ -58,7 +58,7 @@ bool wxOverlayImpl::IsOk()
void wxOverlayImpl::Init(wxDC *dc, int x, int y, int width, int height)
{
wxCHECK_RET( dc, "NULL dc pointer" );
wxASSERT_MSG( !IsOk() , _("You cannot Init an overlay twice") );
wxASSERT_MSG( !IsOk() , "You cannot Init an overlay twice" );
wxDFBDCImpl * const dcimpl = wxDynamicCast(dc->GetImpl(), wxDFBDCImpl);
wxCHECK_RET( dcimpl, "must have a DFB wxDC" );

110
src/osx/cocoa/overlay.mm
View File

@ -39,6 +39,90 @@
// implementation
// ============================================================================
@interface wxOSXOverlayView : NSView
{
}
- (instancetype)initWithFrame:(NSRect)frameRect;
- (void)drawRect:(NSRect)dirtyRect;
@property (retain) NSBitmapImageRep *bitmapImageRep;
@end
@interface wxOSXOverlayWindow : NSWindow
{
}
- (instancetype)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)style backing:(NSBackingStoreType)backingStoreType defer:(BOOL)flag;
@property (retain) wxOSXOverlayView *overlayView;
@end
@implementation wxOSXOverlayWindow
- (instancetype)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)style backing:(NSBackingStoreType)backingStoreType defer:(BOOL)flag
{
self = [super initWithContentRect:contentRect styleMask:style backing:backingStoreType defer:flag];
if ( self )
{
self.overlayView = [[wxOSXOverlayView alloc] initWithFrame:contentRect];
[self setContentView:self.overlayView];
[self setOpaque:NO];
[self setIgnoresMouseEvents:YES];
[self setBackgroundColor:[NSColor clearColor]];
[self setAlphaValue:1.0];
}
return self;
}
@end
@implementation wxOSXOverlayView
- (void)drawRect:(NSRect)dirtyRect
{
[self.bitmapImageRep drawInRect:[self bounds]];
}
// from https://developer.apple.com/library/archive/documentation/GraphicsAnimation/Conceptual/HighResolutionOSX/CapturingScreenContents/CapturingScreenContents.html
- (instancetype)initWithFrame:(NSRect)frameRect
{
self = [super initWithFrame:frameRect];
if ( self )
{
NSRect bounds = [self bounds];
NSRect backingBounds = [self convertRectToBacking:bounds];
NSBitmapImageRep* bmp = [[NSBitmapImageRep alloc]
initWithBitmapDataPlanes:NULL
pixelsWide:backingBounds.size.width
pixelsHigh:backingBounds.size.height
bitsPerSample:8
samplesPerPixel:4
hasAlpha:YES
isPlanar:NO
colorSpaceName:NSCalibratedRGBColorSpace
bitmapFormat:NSAlphaFirstBitmapFormat
bytesPerRow:0
bitsPerPixel:0
];
// There isn't a colorspace name constant for sRGB so retag
// using the sRGBColorSpace method
self.bitmapImageRep = [bmp bitmapImageRepByRetaggingWithColorSpace:
[NSColorSpace sRGBColorSpace]];
[bmp release];
// Setting the user size communicates the dpi
[self.bitmapImageRep setSize:bounds.size];
}
return self;
}
@end
wxOverlayImpl::wxOverlayImpl()
{
m_window = NULL ;
@ -73,7 +157,7 @@ void wxOverlayImpl::CreateOverlayWindow( wxDC* dc )
NSRect overlayRect = wxToNSRect(NULL, wxRect(origin, size));
overlayRect = [NSWindow contentRectForFrameRect:overlayRect styleMask:NSBorderlessWindowMask];
m_overlayWindow = [[NSWindow alloc] initWithContentRect:overlayRect
m_overlayWindow = [[wxOSXOverlayWindow alloc] initWithContentRect:overlayRect
styleMask:NSBorderlessWindowMask
backing:NSBackingStoreBuffered
defer:YES];
@ -85,24 +169,19 @@ void wxOverlayImpl::CreateOverlayWindow( wxDC* dc )
CGRect cgbounds;
cgbounds = CGDisplayBounds(CGMainDisplayID());
m_overlayWindow = [[NSWindow alloc] initWithContentRect:NSMakeRect(cgbounds.origin.x, cgbounds.origin.y,
m_overlayWindow = [[wxOSXOverlayWindow alloc] initWithContentRect:NSMakeRect(cgbounds.origin.x, cgbounds.origin.y,
cgbounds.size.width,
cgbounds.size.height)
styleMask:NSBorderlessWindowMask
backing:NSBackingStoreBuffered
defer:YES];
}
[m_overlayWindow setOpaque:NO];
[m_overlayWindow setIgnoresMouseEvents:YES];
[m_overlayWindow setBackgroundColor:[NSColor clearColor]];
[m_overlayWindow setAlphaValue:1.0];
[m_overlayWindow orderFront:nil];
}
void wxOverlayImpl::Init( wxDC* dc, int x , int y , int width , int height )
{
wxASSERT_MSG( !IsOk() , _("You cannot Init an overlay twice") );
wxASSERT_MSG( !IsOk() , "You cannot Init an overlay twice" );
m_window = dc->GetWindow();
m_x = x ;
@ -111,10 +190,7 @@ void wxOverlayImpl::Init( wxDC* dc, int x , int y , int width , int height )
m_height = height ;
CreateOverlayWindow(dc);
wxASSERT_MSG(m_overlayWindow != NULL, _("Couldn't create the overlay window"));
m_overlayContext = [[m_overlayWindow graphicsContext] CGContext];
wxASSERT_MSG( m_overlayContext != NULL , _("Couldn't init the context on the overlay window") );
[(id)m_overlayContext retain];
wxASSERT_MSG(m_overlayWindow != NULL, "Couldn't create the overlay window");
}
void wxOverlayImpl::BeginDrawing( wxDC* dc)
@ -135,6 +211,11 @@ void wxOverlayImpl::BeginDrawing( wxDC* dc)
ySize = cgbounds.size.height;
}
wxOSXOverlayWindow* wxoverlay = (wxOSXOverlayWindow*) m_overlayWindow;
NSBitmapImageRep* rep = wxoverlay.overlayView.bitmapImageRep;
m_overlayContext = [[NSGraphicsContext graphicsContextWithBitmapImageRep:rep] CGContext];
wxASSERT_MSG( m_overlayContext != NULL , "Couldn't init the context on the overlay window" );
wxGraphicsContext* ctx = wxGraphicsContext::CreateFromNative( m_overlayContext );
ctx->Translate(0, ySize);
ctx->Scale(1,-1);
@ -155,11 +236,14 @@ void wxOverlayImpl::EndDrawing( wxDC* dc)
win_impl->SetGraphicsContext(NULL);
CGContextFlush( m_overlayContext );
m_overlayContext = NULL;
wxOSXOverlayWindow* wxoverlay = (wxOSXOverlayWindow*) m_overlayWindow;
[wxoverlay.overlayView setNeedsDisplay:YES];
}
void wxOverlayImpl::Clear(wxDC* dc)
{
wxASSERT_MSG( IsOk() , _("You cannot Clear an overlay that is not inited") );
wxASSERT_MSG( IsOk() , "You cannot Clear an overlay that is not inited" );
dc->GetGraphicsContext()->ClearRectangle(m_x - 1, m_y - 1, m_width + 2, m_height + 2);
}