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

support metal appearance

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-03-29 06:51:29 +00:00
parent 41218df153
commit 0966d1fe26
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mac/carbon/statbrma.cpp
View File

@@ -53,7 +53,8 @@ bool wxStatusBarMac::Create(wxWindow *parent, wxWindowID id,
if( !wxStatusBarGeneric::Create( parent , id , style , name ) ) if( !wxStatusBarGeneric::Create( parent , id , style , name ) )
return FALSE ; return FALSE ;
m_macBackgroundBrush.MacSetTheme( kThemeBrushDialogBackgroundActive ) ; if ( parent->MacGetTopLevelWindow()->MacGetMetalAppearance() )
MacSetBackgroundBrush( wxNullBrush ) ;
return TRUE ; return TRUE ;
} }
@@ -66,7 +67,7 @@ void wxStatusBarMac::DrawFieldText(wxDC& dc, int i)
wxRect rect; wxRect rect;
GetFieldRect(i, rect); GetFieldRect(i, rect);
if ( !IsWindowHilited( MAC_WXHWND( MacGetTopLevelWindowRef() ) ) ) if ( !MacGetTopLevelWindow()->MacGetMetalAppearance() && !IsWindowHilited( MAC_WXHWND( MacGetTopLevelWindowRef() ) ) )
{ {
dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ; dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
} }
@@ -78,7 +79,7 @@ void wxStatusBarMac::DrawFieldText(wxDC& dc, int i)
dc.GetTextExtent(text, &x, &y); dc.GetTextExtent(text, &x, &y);
int xpos = rect.x + leftMargin + 1 ; int xpos = rect.x + leftMargin + 1 ;
int ypos = 1 ; int ypos = 2 ;
dc.SetClippingRegion(rect.x, 0, rect.width, h); dc.SetClippingRegion(rect.x, 0, rect.width, h);
@@ -118,13 +119,16 @@ void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
int w, h ; int w, h ;
GetSize( &w , &h ) ; GetSize( &w , &h ) ;
if ( IsWindowHilited( MAC_WXHWND( MacGetTopLevelWindowRef() ) ) ) if ( IsWindowHilited( MAC_WXHWND( MacGetTopLevelWindowRef() ) ) || MacGetTopLevelWindow()->MacGetMetalAppearance() )
{ {
wxPen white( wxWHITE , 1 , wxSOLID ) ; wxPen white( wxWHITE , 1 , wxSOLID ) ;
if (major >= 10) if (major >= 10 )
{ {
//Finder statusbar border color: (Project builder similar is 9B9B9B) //Finder statusbar border color: (Project builder similar is 9B9B9B)
dc.SetPen(wxPen(wxColour(0xB1,0xB1,0xB1),1,wxSOLID)); if ( MacGetTopLevelWindow()->MacGetMetalAppearance() )
dc.SetPen(wxPen(wxColour(0x40,40,40) ,1,wxSOLID)) ;
else
dc.SetPen(wxPen(wxColour(0xB1,0xB1,0xB1),1,wxSOLID));
} }
else else
{ {