Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing vertical mirrored drawing for overlay on macos

Browse Source
This commit is contained in:
Stefan Csomor
2017-09-09 19:32:18 +02:00
parent abfd27db91
commit a0f924191e
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,21 +114,6 @@ void wxOverlayImpl::Init( wxDC* dc, int x , int y , int width , int height )
wxASSERT_MSG(m_overlayWindow != NULL, _("Couldn't create the overlay window")); wxASSERT_MSG(m_overlayWindow != NULL, _("Couldn't create the overlay window"));
m_overlayContext = (CGContextRef) [[m_overlayWindow graphicsContext] graphicsPort]; m_overlayContext = (CGContextRef) [[m_overlayWindow graphicsContext] graphicsPort];
wxASSERT_MSG( m_overlayContext != NULL , _("Couldn't init the context on the overlay window") ); wxASSERT_MSG( m_overlayContext != NULL , _("Couldn't init the context on the overlay window") );
int ySize = 0;
if ( m_window )
{
ySize = m_height;
}
else
{
CGRect cgbounds ;
cgbounds = CGDisplayBounds(CGMainDisplayID());
ySize = cgbounds.size.height;
}
CGContextTranslateCTM(m_overlayContext, 0, ySize);
CGContextScaleCTM(m_overlayContext, 1, -1);
} }
void wxOverlayImpl::BeginDrawing( wxDC* dc) void wxOverlayImpl::BeginDrawing( wxDC* dc)
@@ -137,7 +122,24 @@ void wxOverlayImpl::BeginDrawing( wxDC* dc)
wxGCDCImpl *win_impl = wxDynamicCast(impl,wxGCDCImpl); wxGCDCImpl *win_impl = wxDynamicCast(impl,wxGCDCImpl);
if (win_impl) if (win_impl)
{ {
win_impl->SetGraphicsContext( wxGraphicsContext::CreateFromNative( m_overlayContext ) ); int ySize = 0;
if ( m_window )
{
ySize = m_height;
}
else
{
CGRect cgbounds ;
cgbounds = CGDisplayBounds(CGMainDisplayID());
ySize = cgbounds.size.height;
}
wxGraphicsContext* ctx = wxGraphicsContext::CreateFromNative( m_overlayContext );
ctx->Translate(0, ySize);
ctx->Scale(1,-1);
win_impl->SetGraphicsContext( ctx );
if (m_window) if (m_window)
dc->SetDeviceOrigin(dc->LogicalToDeviceX(-m_x), dc->LogicalToDeviceY(-m_y)); dc->SetDeviceOrigin(dc->LogicalToDeviceX(-m_x), dc->LogicalToDeviceY(-m_y));
dc->SetClippingRegion(m_x, m_y, m_width, m_height); dc->SetClippingRegion(m_x, m_y, m_width, m_height);