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

fixing Update, attempt to speed redrawing by making embedded controls invisible (leading to lesser nested redraws)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23442 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-09-09 15:37:19 +00:00
parent 46d0c7072f
commit fe779e4047
2 changed files with 52 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1192,10 +1192,11 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
if( dx == 0 && dy ==0 ) if( dx == 0 && dy ==0 )
return ; return ;
{
wxClientDC dc(this) ; wxClientDC dc(this) ;
wxMacPortSetter helper(&dc) ; wxMacPortSetter helper(&dc) ;
{
int width , height ; int width , height ;
GetClientSize( &width , &height ) ; GetClientSize( &width , &height ) ;
@@ -1218,7 +1219,7 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
GetWindowUpdateRgn( rootWindow , formerUpdateRgn ) ; GetWindowUpdateRgn( rootWindow , formerUpdateRgn ) ;
Point pt = {0,0} ; Point pt = {0,0} ;
LocalToGlobal( &pt ) ; LocalToGlobal( &pt ) ;
OffsetRgn( updateRgn , -pt.h , -pt.v ) ; OffsetRgn( formerUpdateRgn , -pt.h , -pt.v ) ;
SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ; SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ;
if ( !EmptyRgn( formerUpdateRgn ) ) if ( !EmptyRgn( formerUpdateRgn ) )
{ {
@@ -1559,7 +1560,6 @@ void wxWindowMac::Update()
::SetPort( UMAGetWindowPort( rootWindow ) ) ; ::SetPort( UMAGetWindowPort( rootWindow ) ) ;
Point pt = {0,0} ; Point pt = {0,0} ;
LocalToGlobal( &pt ) ; LocalToGlobal( &pt ) ;
::GlobalToLocal( &pt ) ;
::SetPort( port ) ; ::SetPort( port ) ;
OffsetRgn( updateRgn , -pt.h , -pt.v ) ; OffsetRgn( updateRgn , -pt.h , -pt.v ) ;
// translate to window local coordinates // translate to window local coordinates
@@ -1733,10 +1733,32 @@ void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase)
DisposeRgn( ownUpdateRgn ) ; DisposeRgn( ownUpdateRgn ) ;
if ( !m_updateRegion.Empty() ) if ( !m_updateRegion.Empty() )
{ {
wxWindowList hiddenWindows ;
for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
{
wxControl *child = wxDynamicCast( ( wxWindow*)node->GetData() , wxControl ) ;
if ( child && child->MacGetRootWindow() == window && child->IsShown() && child->GetMacControl() )
{
SetControlVisibility( (ControlHandle) child->GetMacControl() , false , false ) ;
hiddenWindows.Append( child ) ;
}
}
wxPaintEvent event; wxPaintEvent event;
event.m_timeStamp = time ; event.m_timeStamp = time ;
event.SetEventObject(this); event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event); GetEventHandler()->ProcessEvent(event);
for (wxWindowListNode *node = hiddenWindows.GetFirst(); node; node = node->GetNext())
{
wxControl *child = wxDynamicCast( ( wxWindow*)node->GetData() , wxControl ) ;
if ( child && child->GetMacControl() )
{
SetControlVisibility( (ControlHandle) child->GetMacControl() , true , false ) ;
}
}
} }
} }

28
src/mac/window.cpp
View File

@@ -1192,10 +1192,11 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
if( dx == 0 && dy ==0 ) if( dx == 0 && dy ==0 )
return ; return ;
{
wxClientDC dc(this) ; wxClientDC dc(this) ;
wxMacPortSetter helper(&dc) ; wxMacPortSetter helper(&dc) ;
{
int width , height ; int width , height ;
GetClientSize( &width , &height ) ; GetClientSize( &width , &height ) ;
@@ -1218,7 +1219,7 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
GetWindowUpdateRgn( rootWindow , formerUpdateRgn ) ; GetWindowUpdateRgn( rootWindow , formerUpdateRgn ) ;
Point pt = {0,0} ; Point pt = {0,0} ;
LocalToGlobal( &pt ) ; LocalToGlobal( &pt ) ;
OffsetRgn( updateRgn , -pt.h , -pt.v ) ; OffsetRgn( formerUpdateRgn , -pt.h , -pt.v ) ;
SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ; SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ;
if ( !EmptyRgn( formerUpdateRgn ) ) if ( !EmptyRgn( formerUpdateRgn ) )
{ {
@@ -1559,7 +1560,6 @@ void wxWindowMac::Update()
::SetPort( UMAGetWindowPort( rootWindow ) ) ; ::SetPort( UMAGetWindowPort( rootWindow ) ) ;
Point pt = {0,0} ; Point pt = {0,0} ;
LocalToGlobal( &pt ) ; LocalToGlobal( &pt ) ;
::GlobalToLocal( &pt ) ;
::SetPort( port ) ; ::SetPort( port ) ;
OffsetRgn( updateRgn , -pt.h , -pt.v ) ; OffsetRgn( updateRgn , -pt.h , -pt.v ) ;
// translate to window local coordinates // translate to window local coordinates
@@ -1733,10 +1733,32 @@ void wxWindowMac::MacRedraw( WXHRGN updatergnr , long time, bool erase)
DisposeRgn( ownUpdateRgn ) ; DisposeRgn( ownUpdateRgn ) ;
if ( !m_updateRegion.Empty() ) if ( !m_updateRegion.Empty() )
{ {
wxWindowList hiddenWindows ;
for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
{
wxControl *child = wxDynamicCast( ( wxWindow*)node->GetData() , wxControl ) ;
if ( child && child->MacGetRootWindow() == window && child->IsShown() && child->GetMacControl() )
{
SetControlVisibility( (ControlHandle) child->GetMacControl() , false , false ) ;
hiddenWindows.Append( child ) ;
}
}
wxPaintEvent event; wxPaintEvent event;
event.m_timeStamp = time ; event.m_timeStamp = time ;
event.SetEventObject(this); event.SetEventObject(this);
GetEventHandler()->ProcessEvent(event); GetEventHandler()->ProcessEvent(event);
for (wxWindowListNode *node = hiddenWindows.GetFirst(); node; node = node->GetNext())
{
wxControl *child = wxDynamicCast( ( wxWindow*)node->GetData() , wxControl ) ;
if ( child && child->GetMacControl() )
{
SetControlVisibility( (ControlHandle) child->GetMacControl() , true , false ) ;
}
}
} }
} }