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

added option for getting visible region w/o children clipped, added to redrawing of control code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16356 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2002-08-03 21:05:43 +00:00
parent d835f05e11
commit 7372fd0a3c
4 changed files with 98 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/mac/carbon/control.cpp
View File

@@ -42,6 +42,7 @@ END_EVENT_TABLE()
#endif #endif
#include "wx/mac/uma.h" #include "wx/mac/uma.h"
#include "wx/mac/private.h"
// Item members // Item members
@@ -694,13 +695,14 @@ void wxControl::MacRedrawControl()
{ {
wxClientDC dc(this) ; wxClientDC dc(this) ;
wxMacPortSetter helper(&dc) ; wxMacPortSetter helper(&dc) ;
// the controls sometimes draw outside their boundaries, this int x = 0 , y = 0;
// should be resolved differently but is not trivial (e.g. drop shadows) GetParent()->MacWindowToRootWindow( &x,&y ) ;
// since adding them to the border would yield in enormous gaps between RgnHandle clrgn = NewRgn() ;
// the controls CopyRgn( (RgnHandle) GetParent()->MacGetVisibleRegion().GetWXHRGN() , clrgn ) ;
Rect r = { 0 , 0 , 32000 , 32000 } ; OffsetRgn( clrgn , x , y ) ;
ClipRect( &r ) ; SetClip( clrgn ) ;
wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ; wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ;
UMADrawControl( (ControlHandle) m_macControl ) ; UMADrawControl( (ControlHandle) m_macControl ) ;
} }
@@ -712,12 +714,13 @@ void wxControl::OnPaint(wxPaintEvent& event)
{ {
wxPaintDC dc(this) ; wxPaintDC dc(this) ;
wxMacPortSetter helper(&dc) ; wxMacPortSetter helper(&dc) ;
// the controls sometimes draw outside their boundaries, this
// should be resolved differently but is not trivial (e.g. drop shadows) int x = 0 , y = 0;
// since adding them to the border would yield in enormous gaps between GetParent()->MacWindowToRootWindow( &x,&y ) ;
// the controls RgnHandle clrgn = NewRgn() ;
Rect r = { 0 , 0 , 32000 , 32000 } ; CopyRgn( (RgnHandle) GetParent()->MacGetVisibleRegion().GetWXHRGN() , clrgn ) ;
ClipRect( &r ) ; OffsetRgn( clrgn , x , y ) ;
SetClip( clrgn ) ;
wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ; wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ;
UMADrawControl( (ControlHandle) m_macControl ) ; UMADrawControl( (ControlHandle) m_macControl ) ;

63
src/mac/carbon/window.cpp
View File

@@ -1542,7 +1542,7 @@ wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const
return win ; return win ;
} }
const wxRegion& wxWindowMac::MacGetVisibleRegion() const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSiblings )
{ {
RgnHandle visRgn = NewRgn() ; RgnHandle visRgn = NewRgn() ;
RgnHandle tempRgn = NewRgn() ; RgnHandle tempRgn = NewRgn() ;
@@ -1576,42 +1576,45 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion()
parent = parent->GetParent() ; parent = parent->GetParent() ;
} }
} }
if ( GetWindowStyle() & wxCLIP_CHILDREN ) if ( respectChildrenAndSiblings )
{ {
for (wxNode *node = GetChildren().First(); node; node = node->Next()) if ( GetWindowStyle() & wxCLIP_CHILDREN )
{ {
wxWindowMac *child = (wxWindowMac*)node->Data(); for (wxNode *node = GetChildren().First(); node; node = node->Next())
{
wxWindowMac *child = (wxWindowMac*)node->Data();
if ( !child->IsTopLevel() && child->IsShown() ) if ( !child->IsTopLevel() && child->IsShown() )
{ {
SetRectRgn( tempRgn , child->m_x , child->m_y , child->m_x + child->m_width , child->m_y + child->m_height ) ; SetRectRgn( tempRgn , child->m_x , child->m_y , child->m_x + child->m_width , child->m_y + child->m_height ) ;
DiffRgn( visRgn , tempRgn , visRgn ) ; DiffRgn( visRgn , tempRgn , visRgn ) ;
}
} }
} }
}
if ( (GetWindowStyle() & wxCLIP_SIBLINGS) && GetParent() ) if ( (GetWindowStyle() & wxCLIP_SIBLINGS) && GetParent() )
{ {
bool thisWindowThrough = false ; bool thisWindowThrough = false ;
for (wxNode *node = GetParent()->GetChildren().First(); node; node = node->Next()) for (wxNode *node = GetParent()->GetChildren().First(); node; node = node->Next())
{
wxWindowMac *sibling = (wxWindowMac*)node->Data();
if ( sibling == this )
{ {
thisWindowThrough = true ; wxWindowMac *sibling = (wxWindowMac*)node->Data();
continue ; if ( sibling == this )
} {
if( !thisWindowThrough ) thisWindowThrough = true ;
{ continue ;
continue ; }
} if( !thisWindowThrough )
{
continue ;
}
if ( !sibling->IsTopLevel() && sibling->IsShown() ) if ( !sibling->IsTopLevel() && sibling->IsShown() )
{ {
SetRectRgn( tempRgn , sibling->m_x - m_x , sibling->m_y - m_y , sibling->m_x + sibling->m_width - m_x , sibling->m_y + sibling->m_height - m_y ) ; SetRectRgn( tempRgn , sibling->m_x - m_x , sibling->m_y - m_y , sibling->m_x + sibling->m_width - m_x , sibling->m_y + sibling->m_height - m_y ) ;
DiffRgn( visRgn , tempRgn , visRgn ) ; DiffRgn( visRgn , tempRgn , visRgn ) ;
}
} }
} }
} }
m_macVisibleRegion = visRgn ; m_macVisibleRegion = visRgn ;
DisposeRgn( visRgn ) ; DisposeRgn( visRgn ) ;

29
src/mac/control.cpp
View File

@@ -42,6 +42,7 @@ END_EVENT_TABLE()
#endif #endif
#include "wx/mac/uma.h" #include "wx/mac/uma.h"
#include "wx/mac/private.h"
// Item members // Item members
@@ -694,13 +695,14 @@ void wxControl::MacRedrawControl()
{ {
wxClientDC dc(this) ; wxClientDC dc(this) ;
wxMacPortSetter helper(&dc) ; wxMacPortSetter helper(&dc) ;
// the controls sometimes draw outside their boundaries, this int x = 0 , y = 0;
// should be resolved differently but is not trivial (e.g. drop shadows) GetParent()->MacWindowToRootWindow( &x,&y ) ;
// since adding them to the border would yield in enormous gaps between RgnHandle clrgn = NewRgn() ;
// the controls CopyRgn( (RgnHandle) GetParent()->MacGetVisibleRegion().GetWXHRGN() , clrgn ) ;
Rect r = { 0 , 0 , 32000 , 32000 } ; OffsetRgn( clrgn , x , y ) ;
ClipRect( &r ) ; SetClip( clrgn ) ;
wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ; wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ;
UMADrawControl( (ControlHandle) m_macControl ) ; UMADrawControl( (ControlHandle) m_macControl ) ;
} }
@@ -712,12 +714,13 @@ void wxControl::OnPaint(wxPaintEvent& event)
{ {
wxPaintDC dc(this) ; wxPaintDC dc(this) ;
wxMacPortSetter helper(&dc) ; wxMacPortSetter helper(&dc) ;
// the controls sometimes draw outside their boundaries, this
// should be resolved differently but is not trivial (e.g. drop shadows) int x = 0 , y = 0;
// since adding them to the border would yield in enormous gaps between GetParent()->MacWindowToRootWindow( &x,&y ) ;
// the controls RgnHandle clrgn = NewRgn() ;
Rect r = { 0 , 0 , 32000 , 32000 } ; CopyRgn( (RgnHandle) GetParent()->MacGetVisibleRegion().GetWXHRGN() , clrgn ) ;
ClipRect( &r ) ; OffsetRgn( clrgn , x , y ) ;
SetClip( clrgn ) ;
wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ; wxDC::MacSetupBackgroundForCurrentPort( MacGetBackgroundBrush() ) ;
UMADrawControl( (ControlHandle) m_macControl ) ; UMADrawControl( (ControlHandle) m_macControl ) ;

63
src/mac/window.cpp
View File

@@ -1542,7 +1542,7 @@ wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const
return win ; return win ;
} }
const wxRegion& wxWindowMac::MacGetVisibleRegion() const wxRegion& wxWindowMac::MacGetVisibleRegion( bool respectChildrenAndSiblings )
{ {
RgnHandle visRgn = NewRgn() ; RgnHandle visRgn = NewRgn() ;
RgnHandle tempRgn = NewRgn() ; RgnHandle tempRgn = NewRgn() ;
@@ -1576,42 +1576,45 @@ const wxRegion& wxWindowMac::MacGetVisibleRegion()
parent = parent->GetParent() ; parent = parent->GetParent() ;
} }
} }
if ( GetWindowStyle() & wxCLIP_CHILDREN ) if ( respectChildrenAndSiblings )
{ {
for (wxNode *node = GetChildren().First(); node; node = node->Next()) if ( GetWindowStyle() & wxCLIP_CHILDREN )
{ {
wxWindowMac *child = (wxWindowMac*)node->Data(); for (wxNode *node = GetChildren().First(); node; node = node->Next())
{
wxWindowMac *child = (wxWindowMac*)node->Data();
if ( !child->IsTopLevel() && child->IsShown() ) if ( !child->IsTopLevel() && child->IsShown() )
{ {
SetRectRgn( tempRgn , child->m_x , child->m_y , child->m_x + child->m_width , child->m_y + child->m_height ) ; SetRectRgn( tempRgn , child->m_x , child->m_y , child->m_x + child->m_width , child->m_y + child->m_height ) ;
DiffRgn( visRgn , tempRgn , visRgn ) ; DiffRgn( visRgn , tempRgn , visRgn ) ;
}
} }
} }
}
if ( (GetWindowStyle() & wxCLIP_SIBLINGS) && GetParent() ) if ( (GetWindowStyle() & wxCLIP_SIBLINGS) && GetParent() )
{ {
bool thisWindowThrough = false ; bool thisWindowThrough = false ;
for (wxNode *node = GetParent()->GetChildren().First(); node; node = node->Next()) for (wxNode *node = GetParent()->GetChildren().First(); node; node = node->Next())
{
wxWindowMac *sibling = (wxWindowMac*)node->Data();
if ( sibling == this )
{ {
thisWindowThrough = true ; wxWindowMac *sibling = (wxWindowMac*)node->Data();
continue ; if ( sibling == this )
} {
if( !thisWindowThrough ) thisWindowThrough = true ;
{ continue ;
continue ; }
} if( !thisWindowThrough )
{
continue ;
}
if ( !sibling->IsTopLevel() && sibling->IsShown() ) if ( !sibling->IsTopLevel() && sibling->IsShown() )
{ {
SetRectRgn( tempRgn , sibling->m_x - m_x , sibling->m_y - m_y , sibling->m_x + sibling->m_width - m_x , sibling->m_y + sibling->m_height - m_y ) ; SetRectRgn( tempRgn , sibling->m_x - m_x , sibling->m_y - m_y , sibling->m_x + sibling->m_width - m_x , sibling->m_y + sibling->m_height - m_y ) ;
DiffRgn( visRgn , tempRgn , visRgn ) ; DiffRgn( visRgn , tempRgn , visRgn ) ;
}
} }
} }
} }
m_macVisibleRegion = visRgn ; m_macVisibleRegion = visRgn ;
DisposeRgn( visRgn ) ; DisposeRgn( visRgn ) ;