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

moving focus rect overlap problems to the vis region of a window

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28696 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-08-07 14:09:39 +00:00
parent fd926bccac
commit 0fa8508d0c
2 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,6 +36,8 @@
#include "wx/log.h"
#include "wx/geometry.h"
#include "wx/textctrl.h"
#include "wx/laywin.h"
#include "wx/splitter.h"
#include "wx/toolbar.h"
#include "wx/dc.h"
@@ -2591,7 +2593,11 @@ wxTopLevelWindowMac* wxWindowMac::MacGetTopLevelWindow() const
}
wxRegion wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures )
{
// includeOuterStructures is true if we try to draw somthing like a focus ring etc.
// also a window dc uses this, in this case we only clip in the hierarchy for hard
// borders like a scrollwindow, splitter etc otherwise we end up in a paranoia having
// to add focus borders everywhere
Rect r ;
RgnHandle visRgn = NewRgn() ;
RgnHandle tempRgn = NewRgn() ;
@@ -2644,12 +2650,19 @@ wxRegion wxWindowMac::MacGetVisibleRegion( bool includeOuterStructures )
parent->MacWindowToRootWindow( &x, &y ) ;
MacRootWindowToWindow( &x , &y ) ;
SetRectRgn( tempRgn ,
x + parent->MacGetLeftBorderSize() , y + parent->MacGetTopBorderSize() ,
x + size.x - parent->MacGetRightBorderSize(),
y + size.y - parent->MacGetBottomBorderSize()) ;
if ( !includeOuterStructures || (
parent->IsKindOf( CLASSINFO( wxScrolledWindow ) ) ||
parent->IsKindOf( CLASSINFO( wxSashLayoutWindow ) ) ||
( parent->GetParent() && parent->GetParent()->IsKindOf( CLASSINFO( wxSplitterWindow ) ) )
) )
{
SetRectRgn( tempRgn ,
x + parent->MacGetLeftBorderSize() , y + parent->MacGetTopBorderSize() ,
x + size.x - parent->MacGetRightBorderSize(),
y + size.y - parent->MacGetBottomBorderSize()) ;
SectRgn( visRgn , tempRgn , visRgn ) ;
SectRgn( visRgn , tempRgn , visRgn ) ;
}
if ( parent->IsTopLevel() )
break ;
child = parent ;