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

made Update be window local (before was updating the entire window), ScrollWindow now scrolls also invalidated areas and in the end does an Update

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23306 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-08-30 20:32:46 +00:00
parent 3066bdd62a
commit ba87f54c0d
2 changed files with 104 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1189,6 +1189,9 @@ void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
// Does a physical scroll // Does a physical scroll
void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect) void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
{ {
if( dx == 0 && dy ==0 )
return ;
wxClientDC dc(this) ; wxClientDC dc(this) ;
wxMacPortSetter helper(&dc) ; wxMacPortSetter helper(&dc) ;
@@ -1206,8 +1209,27 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
SectRect( &scrollrect , &r , &scrollrect ) ; SectRect( &scrollrect , &r , &scrollrect ) ;
} }
ScrollRect( &scrollrect , dx , dy , updateRgn ) ; ScrollRect( &scrollrect , dx , dy , updateRgn ) ;
InvalWindowRgn( (WindowRef) MacGetRootWindow() , updateRgn ) ; // we also have to scroll the update rgn in this rectangle
// in order not to loose updates
WindowRef rootWindow = (WindowRef) MacGetRootWindow() ;
RgnHandle formerUpdateRgn = NewRgn() ;
RgnHandle scrollRgn = NewRgn() ;
RectRgn( scrollRgn , &scrollrect ) ;
GetWindowUpdateRgn( rootWindow , formerUpdateRgn ) ;
Point pt = {0,0} ;
LocalToGlobal( &pt ) ;
OffsetRgn( updateRgn , -pt.h , -pt.v ) ;
SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ;
if ( !EmptyRgn( formerUpdateRgn ) )
{
MacOffsetRgn( formerUpdateRgn , dx , dy ) ;
SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ;
InvalWindowRgn(rootWindow , formerUpdateRgn ) ;
}
InvalWindowRgn(rootWindow , updateRgn ) ;
DisposeRgn( updateRgn ) ; DisposeRgn( updateRgn ) ;
DisposeRgn( formerUpdateRgn ) ;
DisposeRgn( scrollRgn ) ;
} }
for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
@@ -1223,6 +1245,8 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
child->GetSize( &w, &h ); child->GetSize( &w, &h );
child->SetSize( x+dx, y+dy, w, h ); child->SetSize( x+dx, y+dy, w, h );
} }
Update() ;
} }
@@ -1523,17 +1547,35 @@ wxString wxWindowMac::MacGetToolTipString( wxPoint &pt )
void wxWindowMac::Update() void wxWindowMac::Update()
{ {
wxTopLevelWindowMac* win = MacGetTopLevelWindow( ) ; wxRegion visRgn = MacGetVisibleRegion( false ) ;
if ( win ) int top = 0 , left = 0 ;
{ MacWindowToRootWindow( &left , &top ) ;
win->MacUpdate( 0 ) ; WindowRef rootWindow = (WindowRef) MacGetRootWindow() ;
RgnHandle updateRgn = NewRgn() ;
// getting the update region in macos local coordinates
GetWindowUpdateRgn( rootWindow , updateRgn ) ;
GrafPtr port ;
::GetPort( &port ) ;
::SetPort( UMAGetWindowPort( rootWindow ) ) ;
Point pt = {0,0} ;
LocalToGlobal( &pt ) ;
::GlobalToLocal( &pt ) ;
::SetPort( port ) ;
OffsetRgn( updateRgn , -pt.h , -pt.v ) ;
// translate to window local coordinates
OffsetRgn( updateRgn , -left , -top ) ;
SectRgn( updateRgn , (RgnHandle) visRgn.GetWXHRGN() , updateRgn ) ;
MacRedraw( updateRgn , 0 , true ) ;
// for flushing and validating we need macos-local coordinates again
OffsetRgn( updateRgn , left , top ) ;
#if TARGET_API_MAC_CARBON #if TARGET_API_MAC_CARBON
if ( QDIsPortBuffered( GetWindowPort( (WindowRef) win->MacGetWindowRef() ) ) ) if ( QDIsPortBuffered( GetWindowPort( rootWindow ) ) )
{ {
QDFlushPortBuffer( GetWindowPort( (WindowRef) win->MacGetWindowRef() ) , NULL ) ; QDFlushPortBuffer( GetWindowPort( rootWindow ) , updateRgn ) ;
} }
#endif #endif
} ValidWindowRgn( rootWindow , updateRgn ) ;
DisposeRgn( updateRgn ) ;
} }
wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const

62
src/mac/window.cpp
View File

@@ -1189,6 +1189,9 @@ void wxWindowMac::SetScrollbar(int orient, int pos, int thumbVisible,
// Does a physical scroll // Does a physical scroll
void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect) void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
{ {
if( dx == 0 && dy ==0 )
return ;
wxClientDC dc(this) ; wxClientDC dc(this) ;
wxMacPortSetter helper(&dc) ; wxMacPortSetter helper(&dc) ;
@@ -1206,8 +1209,27 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
SectRect( &scrollrect , &r , &scrollrect ) ; SectRect( &scrollrect , &r , &scrollrect ) ;
} }
ScrollRect( &scrollrect , dx , dy , updateRgn ) ; ScrollRect( &scrollrect , dx , dy , updateRgn ) ;
InvalWindowRgn( (WindowRef) MacGetRootWindow() , updateRgn ) ; // we also have to scroll the update rgn in this rectangle
// in order not to loose updates
WindowRef rootWindow = (WindowRef) MacGetRootWindow() ;
RgnHandle formerUpdateRgn = NewRgn() ;
RgnHandle scrollRgn = NewRgn() ;
RectRgn( scrollRgn , &scrollrect ) ;
GetWindowUpdateRgn( rootWindow , formerUpdateRgn ) ;
Point pt = {0,0} ;
LocalToGlobal( &pt ) ;
OffsetRgn( updateRgn , -pt.h , -pt.v ) ;
SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ;
if ( !EmptyRgn( formerUpdateRgn ) )
{
MacOffsetRgn( formerUpdateRgn , dx , dy ) ;
SectRgn( formerUpdateRgn , scrollRgn , formerUpdateRgn ) ;
InvalWindowRgn(rootWindow , formerUpdateRgn ) ;
}
InvalWindowRgn(rootWindow , updateRgn ) ;
DisposeRgn( updateRgn ) ; DisposeRgn( updateRgn ) ;
DisposeRgn( formerUpdateRgn ) ;
DisposeRgn( scrollRgn ) ;
} }
for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext()) for (wxWindowListNode *node = GetChildren().GetFirst(); node; node = node->GetNext())
@@ -1223,6 +1245,8 @@ void wxWindowMac::ScrollWindow(int dx, int dy, const wxRect *rect)
child->GetSize( &w, &h ); child->GetSize( &w, &h );
child->SetSize( x+dx, y+dy, w, h ); child->SetSize( x+dx, y+dy, w, h );
} }
Update() ;
} }
@@ -1523,17 +1547,35 @@ wxString wxWindowMac::MacGetToolTipString( wxPoint &pt )
void wxWindowMac::Update() void wxWindowMac::Update()
{ {
wxTopLevelWindowMac* win = MacGetTopLevelWindow( ) ; wxRegion visRgn = MacGetVisibleRegion( false ) ;
if ( win ) int top = 0 , left = 0 ;
{ MacWindowToRootWindow( &left , &top ) ;
win->MacUpdate( 0 ) ; WindowRef rootWindow = (WindowRef) MacGetRootWindow() ;
RgnHandle updateRgn = NewRgn() ;
// getting the update region in macos local coordinates
GetWindowUpdateRgn( rootWindow , updateRgn ) ;
GrafPtr port ;
::GetPort( &port ) ;
::SetPort( UMAGetWindowPort( rootWindow ) ) ;
Point pt = {0,0} ;
LocalToGlobal( &pt ) ;
::GlobalToLocal( &pt ) ;
::SetPort( port ) ;
OffsetRgn( updateRgn , -pt.h , -pt.v ) ;
// translate to window local coordinates
OffsetRgn( updateRgn , -left , -top ) ;
SectRgn( updateRgn , (RgnHandle) visRgn.GetWXHRGN() , updateRgn ) ;
MacRedraw( updateRgn , 0 , true ) ;
// for flushing and validating we need macos-local coordinates again
OffsetRgn( updateRgn , left , top ) ;
#if TARGET_API_MAC_CARBON #if TARGET_API_MAC_CARBON
if ( QDIsPortBuffered( GetWindowPort( (WindowRef) win->MacGetWindowRef() ) ) ) if ( QDIsPortBuffered( GetWindowPort( rootWindow ) ) )
{ {
QDFlushPortBuffer( GetWindowPort( (WindowRef) win->MacGetWindowRef() ) , NULL ) ; QDFlushPortBuffer( GetWindowPort( rootWindow ) , updateRgn ) ;
} }
#endif #endif
} ValidWindowRgn( rootWindow , updateRgn ) ;
DisposeRgn( updateRgn ) ;
} }
wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const