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

applying correct offsets

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2006-10-29 21:00:02 +00:00
parent a3e949b551
commit b2e2f9507b
1 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/mac/carbon/overlay.cpp
View File

@@ -57,12 +57,18 @@ bool wxOverlayImpl::IsOk()
void wxOverlayImpl::MacGetBounds( Rect *bounds ) void wxOverlayImpl::MacGetBounds( Rect *bounds )
{ {
wxPoint origin(0,0); int x, y;
origin = m_window->ClientToScreen( origin ); x=y=0;
bounds->top = origin.y; m_window->MacWindowToRootWindow( &x , &y ) ;
bounds->left = origin.x; WindowRef window = (WindowRef) m_window->MacGetTopLevelWindowRef() ;
bounds->bottom = origin.y+m_y+m_height;
bounds->right = origin.x+m_x+m_width; Point localwhere = { y, x };
wxMacLocalToGlobal( window, &localwhere ) ;
bounds->top = localwhere.v;
bounds->left = localwhere.h;
bounds->bottom = localwhere.v+m_y+m_height;
bounds->right = localwhere.h+m_x+m_width;
} }
OSStatus wxOverlayImpl::CreateOverlayWindow() OSStatus wxOverlayImpl::CreateOverlayWindow()
@@ -106,6 +112,12 @@ void wxOverlayImpl::Init( wxWindowDC* dc, int x , int y , int width , int height
m_window = dc->GetWindow(); m_window = dc->GetWindow();
m_x = x ; m_x = x ;
m_y = y ; m_y = y ;
if ( dc->IsKindOf( CLASSINFO( wxClientDC ) ))
{
wxPoint origin = m_window->GetClientAreaOrigin();
m_x += origin.x;
m_y += origin.y;
}
m_width = width ; m_width = width ;
m_height = height ; m_height = height ;
@@ -123,15 +135,8 @@ void wxOverlayImpl::BeginDrawing( wxWindowDC* dc)
{ {
// TODO CS // TODO CS
dc->SetGraphicsContext( wxGraphicsContext::CreateFromNative( m_overlayContext ) ); dc->SetGraphicsContext( wxGraphicsContext::CreateFromNative( m_overlayContext ) );
/* // triggers an application of the already set device origins to the native context
delete dc->m_graphicContext ; dc->SetUserScale(1,1);
dc->m_graphicContext = new wxMacCGContext( m_overlayContext );
// we are right now startin at 0,0 not at the wxWindow's origin, so most of the calculations
// int dc are already corect
// just to make sure :
dc->m_macLocalOrigin.x = 0 ;
dc->m_macLocalOrigin.y = 0 ;
*/
wxSize size = dc->GetSize() ; wxSize size = dc->GetSize() ;
dc->SetClippingRegion( 0 , 0 , size.x , size.y ) ; dc->SetClippingRegion( 0 , 0 , size.x , size.y ) ;
} }