X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..d351c8ee8fd8fc49e1b185eeac6f9ea1cb589a93:/src/mac/carbon/toolbar.cpp diff --git a/src/mac/carbon/toolbar.cpp b/src/mac/carbon/toolbar.cpp index 4869227f6c..45c2ae0e27 100644 --- a/src/mac/carbon/toolbar.cpp +++ b/src/mac/carbon/toolbar.cpp @@ -9,14 +9,15 @@ // Licence: The wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "toolbar.h" #endif -#include "wx/wx.h" +#include "wx/wxprec.h" #if wxUSE_TOOLBAR +#include "wx/wx.h" #include "wx/toolbar.h" #include "wx/notebook.h" #include "wx/tabctrl.h" @@ -32,6 +33,23 @@ END_EVENT_TABLE() #include "wx/mac/uma.h" #include "wx/geometry.h" + +#ifdef __WXMAC_OSX__ +const short kwxMacToolBarToolDefaultWidth = 24 ; +const short kwxMacToolBarToolDefaultHeight = 24 ; +const short kwxMacToolBarTopMargin = 4 ; +const short kwxMacToolBarLeftMargin = 4 ; +const short kwxMacToolBorder = 0 ; +const short kwxMacToolSpacing = 6 ; +#else +const short kwxMacToolBarToolDefaultWidth = 24 ; +const short kwxMacToolBarToolDefaultHeight = 22 ; +const short kwxMacToolBarTopMargin = 2 ; +const short kwxMacToolBarLeftMargin = 2 ; +const short kwxMacToolBorder = 4 ; +const short kwxMacToolSpacing = 0 ; +#endif + // ---------------------------------------------------------------------------- // private classes // ---------------------------------------------------------------------------- @@ -66,6 +84,7 @@ public: void SetSize(const wxSize& size) ; void SetPosition( const wxPoint& position ) ; + wxSize GetSize() const { if ( IsControl() ) @@ -78,9 +97,12 @@ public: } else { + // separator size wxSize sz = GetToolBar()->GetToolSize() ; - sz.x /= 4 ; - sz.y /= 4 ; + if ( GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL ) + sz.y /= 4 ; + else + sz.x /= 4 ; return sz ; } } @@ -88,6 +110,9 @@ public: { return wxPoint(m_x, m_y); } + bool DoEnable( bool enable ) ; + + void UpdateToggleImage( bool toggle ) ; private : void Init() { @@ -102,6 +127,9 @@ private : static const EventTypeSpec eventList[] = { { kEventClassControl , kEventControlHit } , +#ifdef __WXMAC_OSX__ + { kEventClassControl , kEventControlHitTest } , +#endif } ; static pascal OSStatus wxMacToolBarToolControlEventHandler( EventHandlerCallRef handler , EventRef event , void *data ) @@ -121,13 +149,27 @@ static pascal OSStatus wxMacToolBarToolControlEventHandler( EventHandlerCallRef wxToolBarTool* tbartool = (wxToolBarTool*)data ; if ( tbartool->CanBeToggled() ) { - tbartool->Toggle( GetControl32BitValue( (ControlRef) tbartool->GetControlHandle() ) ) ; + ((wxToolBar*)tbartool->GetToolBar())->ToggleTool(tbartool->GetId(), GetControl32BitValue((ControlRef)tbartool->GetControlHandle())); } ((wxToolBar*)tbartool->GetToolBar())->OnLeftClick( tbartool->GetId() , tbartool -> IsToggled() ) ; - result = noErr; } break ; +#ifdef __WXMAC_OSX__ + case kEventControlHitTest : + { + HIPoint pt = cEvent.GetParameter(kEventParamMouseLocation) ; + HIRect rect ; + HIViewGetBounds( controlRef , &rect ) ; + + ControlPartCode pc = kControlNoPart ; + if ( CGRectContainsPoint( rect , pt ) ) + pc = kControlButtonPart ; + cEvent.SetParameter( kEventParamControlPart , typeControlPartCode, pc ) ; + result = noErr ; + } + break ; +#endif default : break ; } @@ -159,6 +201,28 @@ DEFINE_ONE_SHOT_HANDLER_GETTER( wxMacToolBarToolEventHandler ) // wxToolBarTool // ---------------------------------------------------------------------------- +bool wxToolBarTool::DoEnable(bool enable) +{ + if ( IsControl() ) + { + GetControl()->Enable( enable ) ; + } + else if ( IsButton() ) + { +#if TARGET_API_MAC_OSX + if ( enable ) + EnableControl( m_controlHandle ) ; + else + DisableControl( m_controlHandle ) ; +#else + if ( enable ) + ActivateControl( m_controlHandle ) ; + else + DeactivateControl( m_controlHandle ) ; +#endif + } + return true ; +} void wxToolBarTool::SetSize(const wxSize& size) { if ( IsControl() ) @@ -178,7 +242,9 @@ void wxToolBarTool::SetPosition(const wxPoint& position) x = y = 0 ; int mac_x = position.x ; int mac_y = position.y ; -#if !TARGET_API_MAC_OSX +#ifdef __WXMAC_OSX__ + // already correctly set up +#else WindowRef rootwindow = (WindowRef) GetToolBar()->MacGetTopLevelWindowRef() ; GetToolBar()->MacWindowToRootWindow( &x , &y ) ; mac_x += x; @@ -188,7 +254,7 @@ void wxToolBarTool::SetPosition(const wxPoint& position) GetControlBounds( m_controlHandle , &contrlRect ) ; int former_mac_x = contrlRect.left ; int former_mac_y = contrlRect.top ; - wxSize sz = GetToolBar()->GetToolSize() ; + GetToolBar()->GetToolSize() ; if ( mac_x != former_mac_x || mac_y != former_mac_y ) { @@ -199,12 +265,67 @@ void wxToolBarTool::SetPosition(const wxPoint& position) { GetControl()->Move( position ) ; } + else + { + // separator +#ifdef __WXMAC_OSX__ + int x , y ; + x = y = 0 ; + int mac_x = position.x ; + int mac_y = position.y ; + + Rect contrlRect ; + GetControlBounds( m_controlHandle , &contrlRect ) ; + int former_mac_x = contrlRect.left ; + int former_mac_y = contrlRect.top ; + + if ( mac_x != former_mac_x || mac_y != former_mac_y ) + { + UMAMoveControl( m_controlHandle , mac_x , mac_y ) ; + } +#endif + } } -const short kwxMacToolBarToolDefaultWidth = 24 ; -const short kwxMacToolBarToolDefaultHeight = 22 ; -const short kwxMacToolBarTopMargin = 2 ; -const short kwxMacToolBarLeftMargin = 2 ; +void wxToolBarTool::UpdateToggleImage( bool toggle ) +{ +#ifdef __WXMAC_OSX__ + if ( toggle ) + { + int w = m_bmpNormal.GetWidth() ; + int h = m_bmpNormal.GetHeight() ; + wxBitmap bmp( w , h ) ; + wxMemoryDC dc ; + dc.SelectObject( bmp ) ; + dc.SetPen( wxNullPen ) ; + dc.SetBackground( *wxWHITE ) ; + dc.DrawRectangle( 0 , 0 , w , h ) ; + dc.DrawBitmap( m_bmpNormal , 0 , 0 , true) ; + dc.SelectObject( wxNullBitmap ) ; + ControlButtonContentInfo info ; + wxMacCreateBitmapButton( &info , bmp ) ; + SetControlData( m_controlHandle , 0, kControlIconContentTag, sizeof( info ), + (Ptr)&info ); + wxMacReleaseBitmapButton( &info ) ; + } + else + { + ControlButtonContentInfo info ; + wxMacCreateBitmapButton( &info , m_bmpNormal ) ; + SetControlData( m_controlHandle , 0, kControlIconContentTag, sizeof( info ), + (Ptr)&info ); + wxMacReleaseBitmapButton( &info ) ; + } + + IconTransformType transform = toggle ? kTransformSelected : kTransformNone ; + SetControlData( m_controlHandle, 0, kControlIconTransformTag, sizeof( transform ), + (Ptr)&transform ); + HIViewSetNeedsDisplay( m_controlHandle , true ) ; + +#else + ::SetControl32BitValue( m_controlHandle , toggle ) ; +#endif +} wxToolBarTool::wxToolBarTool(wxToolBar *tbar, int id, @@ -220,37 +341,63 @@ wxToolBarTool::wxToolBarTool(wxToolBar *tbar, { Init(); - if (id == wxID_SEPARATOR) return; - WindowRef window = (WindowRef) tbar->MacGetTopLevelWindowRef() ; wxSize toolSize = tbar->GetToolSize() ; Rect toolrect = { 0, 0 , toolSize.y , toolSize.x } ; - - ControlButtonContentInfo info ; - wxMacCreateBitmapButton( &info , GetNormalBitmap() ) ; - - SInt16 behaviour = kControlBehaviorOffsetContents ; - if ( CanBeToggled() ) - behaviour += kControlBehaviorToggles ; - - CreateBevelButtonControl( window , &toolrect , CFSTR("") , kControlBevelButtonNormalBevel , behaviour , &info , - 0 , 0 , 0 , &m_controlHandle ) ; + + if ( id == wxID_SEPARATOR ) + { + toolSize.x /= 4 ; + toolSize.y /= 4 ; + if ( GetToolBar()->GetWindowStyleFlag() & wxTB_VERTICAL ) + { + toolrect.bottom = toolSize.y ; + } + else + { + toolrect.right = toolSize.x ; + } +#ifdef __WXMAC_OSX__ + // in flat style we need a visual separator + CreateSeparatorControl( window , &toolrect , &m_controlHandle ) ; +#endif + } + else + { + ControlButtonContentInfo info ; + wxMacCreateBitmapButton( &info , GetNormalBitmap() ) ; - InstallControlEventHandler( (ControlRef) m_controlHandle, GetwxMacToolBarToolEventHandlerUPP(), - GetEventTypeCount(eventList), eventList, this,NULL); +#ifdef __WXMAC_OSX__ + CreateIconControl( window , &toolrect , &info , false , &m_controlHandle ) ; +#else + SInt16 behaviour = kControlBehaviorOffsetContents ; + if ( CanBeToggled() ) + behaviour += kControlBehaviorToggles ; + CreateBevelButtonControl( window , &toolrect , CFSTR("") , kControlBevelButtonNormalBevel , behaviour , &info , + 0 , 0 , 0 , &m_controlHandle ) ; +#endif + + wxMacReleaseBitmapButton( &info ) ; + /* + SetBevelButtonTextPlacement( m_controlHandle , kControlBevelButtonPlaceBelowGraphic ) ; + UMASetControlTitle( m_controlHandle , label , wxFont::GetDefaultEncoding() ) ; + */ - UMAShowControl( m_controlHandle ) ; - if ( !IsEnabled() ) - DisableControl( m_controlHandle ) ; + InstallControlEventHandler( (ControlRef) m_controlHandle, GetwxMacToolBarToolEventHandlerUPP(), + GetEventTypeCount(eventList), eventList, this,NULL); - if ( CanBeToggled() && IsToggled() ) - ::SetControl32BitValue( m_controlHandle , 1 ) ; - else - ::SetControl32BitValue( m_controlHandle , 0 ) ; - + } ControlRef container = (ControlRef) tbar->GetHandle() ; wxASSERT_MSG( container != NULL , wxT("No valid mac container control") ) ; - ::EmbedControl( m_controlHandle , container ) ; + if ( m_controlHandle ) + { + UMAShowControl( m_controlHandle ) ; + ::EmbedControl( m_controlHandle , container ) ; + } + if ( CanBeToggled() && IsToggled() ) + { + UpdateToggleImage( true ) ; + } } @@ -283,6 +430,7 @@ void wxToolBar::Init() bool wxToolBar::Create(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name) { + if ( !wxToolBarBase::Create( parent , id , pos , size , style ) ) return FALSE ; @@ -313,7 +461,7 @@ bool wxToolBar::Realize() int maxToolHeight = 0; // Find the maximum tool width and height - wxToolBarToolsList::Node *node = m_tools.GetFirst(); + wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst(); while ( node ) { wxToolBarTool *tool = (wxToolBarTool *)node->GetData(); @@ -327,27 +475,57 @@ bool wxToolBar::Realize() node = node->GetNext(); } + bool lastWasRadio = FALSE; node = m_tools.GetFirst(); while (node) { wxToolBarTool *tool = (wxToolBarTool *)node->GetData(); wxSize cursize = tool->GetSize() ; + bool isRadio = FALSE; + + if ( tool->IsButton() && tool->GetKind() == wxITEM_RADIO ) + { + if ( !lastWasRadio ) + { + if (tool->Toggle(true)) + { + DoToggleTool(tool, true); + } + } + isRadio = TRUE; + } + else + { + isRadio = FALSE; + } + lastWasRadio = isRadio; + // for the moment we just do a single row/column alignement if ( x + cursize.x > maxWidth ) maxWidth = x + cursize.x ; if ( y + cursize.y > maxHeight ) maxHeight = y + cursize.y ; - tool->SetPosition( wxPoint( x , y ) ) ; - + if ( GetWindowStyleFlag() & wxTB_VERTICAL ) + { + int x1 = x + (maxToolWidth - cursize.x)/2 ; + tool->SetPosition( wxPoint( x1 , y ) ) ; + } + else + { + int y1 = y + (maxToolHeight - cursize.y)/2 ; + tool->SetPosition( wxPoint( x , y1 ) ) ; + } if ( GetWindowStyleFlag() & wxTB_VERTICAL ) { y += cursize.y ; + y += kwxMacToolSpacing ; } else { x += cursize.x ; + x += kwxMacToolSpacing ; } node = node->GetNext(); @@ -360,9 +538,10 @@ bool wxToolBar::Realize() // if not set yet, only one row SetRows(1); } + m_minWidth = maxWidth; maxWidth = tw ; maxHeight += m_yMargin + kwxMacToolBarTopMargin; - m_maxHeight = maxHeight ; + m_minHeight = m_maxHeight = maxHeight ; } else { @@ -371,25 +550,27 @@ bool wxToolBar::Realize() // if not set yet, have one column SetRows(GetToolsCount()); } + m_minHeight = maxHeight; maxHeight = th ; maxWidth += m_xMargin + kwxMacToolBarLeftMargin; - m_maxWidth = maxWidth ; + m_minWidth = m_maxWidth = maxWidth ; } SetSize( maxWidth, maxHeight ); + InvalidateBestSize(); return TRUE; } void wxToolBar::SetToolBitmapSize(const wxSize& size) { - m_defaultWidth = size.x+4; m_defaultHeight = size.y+4; + m_defaultWidth = size.x+kwxMacToolBorder; m_defaultHeight = size.y+kwxMacToolBorder; } // The button size is bigger than the bitmap size wxSize wxToolBar::GetToolSize() const { - return wxSize(m_defaultWidth + 4, m_defaultHeight + 4); + return wxSize(m_defaultWidth + kwxMacToolBorder, m_defaultHeight + kwxMacToolBorder); } void wxToolBar::SetRows(int nRows) @@ -411,7 +592,7 @@ void wxToolBar::MacSuperChangedPosition() wxToolBarToolBase *wxToolBar::FindToolForPosition(wxCoord x, wxCoord y) const { - wxToolBarToolsList::Node *node = m_tools.GetFirst(); + wxToolBarToolsList::compatibility_iterator node = m_tools.GetFirst(); while (node) { wxToolBarTool *tool = (wxToolBarTool *)node->GetData() ; @@ -439,32 +620,15 @@ wxString wxToolBar::MacGetToolTipString( wxPoint &pt ) void wxToolBar::DoEnableTool(wxToolBarToolBase *t, bool enable) { - if (!IsShown()) - return ; - - wxToolBarTool *tool = (wxToolBarTool *)t; - if ( tool->IsControl() ) - { - tool->GetControl()->Enable( enable ) ; - } - else if ( tool->IsButton() ) - { - if ( enable ) - UMAActivateControl( (ControlRef) tool->GetControlHandle() ) ; - else - UMADeactivateControl( (ControlRef) tool->GetControlHandle() ) ; - } + ((wxToolBarTool*)t)->DoEnable( enable ) ; } void wxToolBar::DoToggleTool(wxToolBarToolBase *t, bool toggle) { - if (!IsShown()) - return ; - wxToolBarTool *tool = (wxToolBarTool *)t; if ( tool->IsButton() ) { - ::SetControl32BitValue( (ControlRef) tool->GetControlHandle() , toggle ) ; + tool->UpdateToggleImage( toggle ) ; } } @@ -473,6 +637,7 @@ bool wxToolBar::DoInsertTool(size_t WXUNUSED(pos), { // nothing special to do here - we relayout in Realize() later tool->Attach(this); + InvalidateBestSize(); return TRUE; } @@ -484,7 +649,7 @@ void wxToolBar::DoSetToggle(wxToolBarToolBase *WXUNUSED(tool), bool WXUNUSED(tog bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool) { - wxToolBarToolsList::Node *node; + wxToolBarToolsList::compatibility_iterator node; for ( node = m_tools.GetFirst(); node; node = node->GetNext() ) { wxToolBarToolBase *tool2 = node->GetData(); @@ -519,12 +684,16 @@ bool wxToolBar::DoDeleteTool(size_t WXUNUSED(pos), wxToolBarToolBase *tool) tool2->SetPosition( pt ) ; } + InvalidateBestSize(); return TRUE ; } void wxToolBar::OnPaint(wxPaintEvent& event) { wxPaintDC dc(this) ; +#if wxMAC_USE_CORE_GRAPHICS + // leave the background as it is (striped or metal) +#else wxMacPortSetter helper(&dc) ; int w, h ; GetSize( &w , &h ) ; @@ -537,7 +706,42 @@ void wxToolBar::OnPaint(wxPaintEvent& event) if ( toolbarrect.top < 0 ) toolbarrect.top = 0 ; */ - UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ; + if ( !MacGetTopLevelWindow()->MacGetMetalAppearance() ) + { + UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ; + } + else + { +#if TARGET_API_MAC_OSX +#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_2 + if ( UMAGetSystemVersion() >= 0x1030 ) + { + HIRect hiToolbarrect = CGRectMake( dc.YLOG2DEVMAC(0) , dc.XLOG2DEVMAC(0) , + dc.YLOG2DEVREL(h) , dc.XLOG2DEVREL(w) ); + CGContextRef cgContext ; + Rect bounds ; + GetPortBounds( (CGrafPtr) dc.m_macPort , &bounds ) ; + QDBeginCGContext( (CGrafPtr) dc.m_macPort , &cgContext ) ; + CGContextTranslateCTM( cgContext , 0 , bounds.bottom - bounds.top ) ; + CGContextScaleCTM( cgContext , 1 , -1 ) ; + + { + HIThemeBackgroundDrawInfo drawInfo ; + drawInfo.version = 0 ; + drawInfo.state = kThemeStateActive ; + drawInfo.kind = kThemeBackgroundMetal ; + HIThemeApplyBackground( &hiToolbarrect, &drawInfo , cgContext,kHIThemeOrientationNormal) ; + } + QDEndCGContext( (CGrafPtr) dc.m_macPort , &cgContext ) ; + } + else +#endif + { + UMADrawThemePlacard( &toolbarrect , IsEnabled() ? kThemeStateActive : kThemeStateInactive) ; + } +#endif + } +#endif event.Skip() ; }