ryan's QT implementation

[wxWidgets.git] / src / mac / carbon / statbrma.cpp

diff --git a/src/mac/carbon/statbrma.cpp b/src/mac/carbon/statbrma.cpp
index b2dba2135d7b7919da99a4da176a3b9415de534c..094c4a081d4148502444146137643ef4a2421b3d 100644 (file)
--- a/src/mac/carbon/statbrma.cpp
+++ b/src/mac/carbon/statbrma.cpp
@@ -27,6 +27,7 @@ END_EVENT_TABLE()
 
 #ifdef __WXMAC__
 #include "wx/mac/private.h"
 
 #ifdef __WXMAC__
 #include "wx/mac/private.h"

+#include "wx/toplevel.h"

 #endif
 
 // ============================================================================
 #endif
 
 // ============================================================================


@@ -50,17 +51,27 @@ bool wxStatusBarMac::Create(wxWindow *parent, wxWindowID id,
                             long style ,
                             const wxString& name)
 {
                             long style ,
                             const wxString& name)
 {

-    return wxStatusBarGeneric::Create( parent , id , style , name ) ;
+    if( !wxStatusBarGeneric::Create( parent , id , style , name ) )
+        return FALSE ;
+    
+    if ( parent->MacGetTopLevelWindow()->MacGetMetalAppearance() )
+        MacSetBackgroundBrush( wxNullBrush ) ;    
+    
+    // normal system font is too tall for fitting into the standard height
+    SetWindowVariant( wxWINDOW_VARIANT_SMALL ) ;
+    
+    return TRUE ;

 }
 
 void wxStatusBarMac::DrawFieldText(wxDC& dc, int i)
 {
     int leftMargin = 2;
 }
 
 void wxStatusBarMac::DrawFieldText(wxDC& dc, int i)
 {
     int leftMargin = 2;

-    
+    int w, h ;
+    GetSize( &w , &h ) ;

     wxRect rect;
     GetFieldRect(i, rect);
     
     wxRect rect;
     GetFieldRect(i, rect);
     

-    if ( !IsWindowHilited( MAC_WXHWND( MacGetRootWindow() ) ) )
+    if ( !MacIsReallyHilited()  )

     {
         dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
     }
     {
         dc.SetTextForeground( wxColour( 0x80 , 0x80 , 0x80 ) ) ;
     }


@@ -74,7 +85,10 @@ void wxStatusBarMac::DrawFieldText(wxDC& dc, int i)
     int xpos = rect.x + leftMargin + 1 ;
     int ypos = 1 ;
     
     int xpos = rect.x + leftMargin + 1 ;
     int ypos = 1 ;
     

-    dc.SetClippingRegion(rect.x, 0, rect.width, m_height);
+    if ( MacGetTopLevelWindow()->MacGetMetalAppearance()  )
+        ypos++ ;
+        
+    dc.SetClippingRegion(rect.x, 0, rect.width, h);

     
     dc.DrawText(text, xpos, ypos);
     
     
     dc.DrawText(text, xpos, ypos);
     


@@ -94,8 +108,10 @@ void wxStatusBarMac::SetStatusText(const wxString& text, int number)
     m_statusStrings[number] = text;
     wxRect rect;
     GetFieldRect(number, rect);
     m_statusStrings[number] = text;
     wxRect rect;
     GetFieldRect(number, rect);

+    int w, h ;
+    GetSize( &w , &h ) ;

     rect.y=0;
     rect.y=0;

-    rect.height = m_height ;
+    rect.height = h ;

     Refresh( TRUE , &rect ) ;
     Update();
 }
     Refresh( TRUE , &rect ) ;
     Update();
 }


@@ -107,14 +123,19 @@ void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
 
     int major,minor;
     wxGetOsVersion( &major, &minor );
 
     int major,minor;
     wxGetOsVersion( &major, &minor );

+    int w, h ;
+    GetSize( &w , &h ) ;

 
 

-       if ( IsWindowHilited( MAC_WXHWND( MacGetRootWindow() ) ) )
+       if ( MacIsReallyHilited() )

        {
                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
         {


@@ -122,10 +143,10 @@ void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
             dc.SetPen(black);
        }
                dc.DrawLine(0, 0 ,
             dc.SetPen(black);
        }
                dc.DrawLine(0, 0 ,

-                      m_width , 0);
+                      w , 0);

                dc.SetPen(white);
                dc.DrawLine(0, 1 ,
                dc.SetPen(white);
                dc.DrawLine(0, 1 ,

-                      m_width , 1);
+                      w , 1);

        }
        else
        {
        }
        else
        {


@@ -136,7 +157,7 @@ void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
             dc.SetPen(wxPen(wxColour(0x80,0x80,0x80),1,wxSOLID));
 
                dc.DrawLine(0, 0 ,
             dc.SetPen(wxPen(wxColour(0x80,0x80,0x80),1,wxSOLID));
 
                dc.DrawLine(0, 0 ,

-                      m_width , 0);
+                      w , 0);

        }
 
        int i;
        }
 
        int i;


@@ -148,8 +169,8 @@ void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) )
                DrawField(dc, i);
 }
 
                DrawField(dc, i);
 }
 

-void wxStatusBarMac::MacSuperEnabled( bool enabled ) 
+void wxStatusBarMac::MacHiliteChanged()

 {
 {

-    Refresh(FALSE) ;
-    wxWindow::MacSuperEnabled( enabled ) ;
+    Refresh() ;
+    Update() ;

 }
 }