X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8dba8632c5bcd64724e2e9e2d40e295555a0cb86..8064223b7b1b3657363b7a635c381b9269d95e55:/src/mac/carbon/statbrma.cpp?ds=sidebyside diff --git a/src/mac/carbon/statbrma.cpp b/src/mac/carbon/statbrma.cpp index a88dc6f72c..926198c3b0 100644 --- a/src/mac/carbon/statbrma.cpp +++ b/src/mac/carbon/statbrma.cpp @@ -1,41 +1,50 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: statbar.cpp +// Name: src/mac/carbon/statbarma.cpp // Purpose: native implementation of wxStatusBar (optional) -// Author: AUTHOR -// Modified by: -// Created: ??/??/98 +// Author: Stefan Csomor +// Modified by: +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) 1998 AUTHOR +// Copyright: (c) 1998 Stefan Csomor // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "statbrma.h" -#endif +#include "wx/wxprec.h" -// ---------------------------------------------------------------------------- -// headers -// ---------------------------------------------------------------------------- +#if wxUSE_STATUSBAR #include "wx/statusbr.h" -#include "wx/dc.h" -#include "wx/dcclient.h" + +#ifndef WX_PRECOMP + #include "wx/dc.h" + #include "wx/dcclient.h" + #include "wx/toplevel.h" +#endif + +#include "wx/mac/private.h" + BEGIN_EVENT_TABLE(wxStatusBarMac, wxStatusBarGeneric) - EVT_PAINT(wxStatusBarMac::OnPaint) + EVT_PAINT(wxStatusBarMac::OnPaint) END_EVENT_TABLE() -// ============================================================================ -// implementation -// ============================================================================ -// ---------------------------------------------------------------------------- -// wxStatusBarMac class -// ---------------------------------------------------------------------------- +wxStatusBarMac::wxStatusBarMac(wxWindow *parent, + wxWindowID id, + long style, + const wxString& name) + : + wxStatusBarGeneric() +{ + SetParent( NULL ); + Create( parent, id, style, name ); +} wxStatusBarMac::wxStatusBarMac() + : + wxStatusBarGeneric() { - SetParent(NULL); + SetParent( NULL ); } wxStatusBarMac::~wxStatusBarMac() @@ -43,33 +52,48 @@ wxStatusBarMac::~wxStatusBarMac() } 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() ) + SetBackgroundStyle( wxBG_STYLE_TRANSPARENT ); + + // 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; + int w, h; + GetSize( &w , &h ); + wxRect rect; + GetFieldRect( i, rect ); + + if ( !MacIsReallyHilited() ) + dc.SetTextForeground( wxColour( 0x80, 0x80, 0x80 ) ); - wxRect rect; - GetFieldRect(i, rect); + wxString text(GetStatusText( i )); - wxString text(GetStatusText(i)); + wxCoord x, y; + dc.GetTextExtent(text, &x, &y); - long x, y; + int leftMargin = 2; + int xpos = rect.x + leftMargin + 1; + int ypos = 1; - dc.GetTextExtent(text, &x, &y); + if ( MacGetTopLevelWindow()->MacGetMetalAppearance() ) + ypos++; - int xpos = rect.x + leftMargin + 1 ; - int ypos = 2 ; - - dc.SetClippingRegion(rect.x, 0, rect.width, m_height); + dc.SetClippingRegion(rect.x, 0, rect.width, h); - dc.DrawText(text, xpos, ypos); + dc.DrawText(text, xpos, ypos); - dc.DestroyClippingRegion(); + dc.DestroyClippingRegion(); } void wxStatusBarMac::DrawField(wxDC& dc, int i) @@ -80,47 +104,78 @@ void wxStatusBarMac::DrawField(wxDC& dc, int i) void wxStatusBarMac::SetStatusText(const wxString& text, int number) { wxCHECK_RET( (number >= 0) && (number < m_nFields), - _T("invalid status bar field index") ); + wxT("invalid status bar field index") ); + + if ( m_statusStrings[number] == text ) + return ; m_statusStrings[number] = text; wxRect rect; GetFieldRect(number, rect); - Refresh( TRUE , &rect ) ; - /* - // TODO make clear work again also when using themes - wxClientDC dc(this); - dc.SetBackground( wxBrush(GetBackgroundColour(), wxSOLID) ); - dc.SetClippingRegion( rect.x+1, rect.y+1, rect.width-1, rect.height-1 ); + int w, h; + GetSize( &w, &h ); + rect.y = 0; + rect.height = h ; + Refresh( true, &rect ); + Update(); +} + +void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event)) +{ + wxPaintDC dc(this); dc.Clear(); - dc.DestroyClippingRegion(); - DrawFieldText( dc, number ); - */ + int major, minor; + wxGetOsVersion( &major, &minor ); + int w, h; + GetSize( &w, &h ); + + if ( MacIsReallyHilited() ) + { + wxPen white( *wxWHITE , 1 , wxSOLID ); + if (major >= 10) + { + // Finder statusbar border color: (Project Builder similar is 9B9B9B) + if ( MacGetTopLevelWindow()->MacGetMetalAppearance() ) + dc.SetPen(wxPen(wxColour(0x40, 0x40, 0x40), 1, wxSOLID)); + else + dc.SetPen(wxPen(wxColour(0xB1, 0xB1, 0xB1), 1, wxSOLID)); + } + else + { + wxPen black( *wxBLACK , 1 , wxSOLID ); + dc.SetPen(black); + } + + dc.DrawLine(0, 0, w, 0); + dc.SetPen(white); + dc.DrawLine(0, 1, w, 1); + } + else + { + if (major >= 10) + // Finder statusbar border color: (Project Builder similar is 9B9B9B) + dc.SetPen(wxPen(wxColour(0xB1, 0xB1, 0xB1), 1, wxSOLID)); + else + dc.SetPen(wxPen(wxColour(0x80, 0x80, 0x80), 1, wxSOLID)); + + dc.DrawLine(0, 0, w, 0); + } + + int i; + if ( GetFont().Ok() ) + dc.SetFont(GetFont()); + dc.SetBackgroundMode(wxTRANSPARENT); + + for ( i = 0; i < m_nFields; i ++ ) + DrawField(dc, i); } -void wxStatusBarMac::OnPaint(wxPaintEvent& WXUNUSED(event) ) +void wxStatusBarMac::MacHiliteChanged() { - wxPaintDC dc(this); - wxPen black( wxBLACK , 1 , wxSOLID ) ; - wxPen white( wxWHITE , 1 , wxSOLID ) ; - - dc.SetPen(black); - dc.DrawLine(0, 0 , - m_width , 0); - dc.SetPen(white); - dc.DrawLine(0, 1 , - m_width , 1); - - - int i; - if ( GetFont().Ok() ) - dc.SetFont(GetFont()); - dc.SetBackgroundMode(wxTRANSPARENT); - - for ( i = 0; i < m_nFields; i ++ ) - DrawField(dc, i); - -# ifdef __WXMSW__ - dc.SetFont(wxNullFont); -# endif // MSW + Refresh(); + Update(); } + +#endif // wxUSE_STATUSBAR +