X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/998b0cb4170520ced538a6118c8833899deb8c2a..70544c1e6c2c52722a8215ed12724a75a284be08:/src/aui/auibar.cpp?ds=sidebyside diff --git a/src/aui/auibar.cpp b/src/aui/auibar.cpp index 9232f4a867..a64ed0cce5 100644 --- a/src/aui/auibar.cpp +++ b/src/aui/auibar.cpp @@ -1,11 +1,11 @@ /////////////////////////////////////////////////////////////////////////////// -// Name: src/aui/dockart.cpp +// Name: src/aui/auibar.cpp // Purpose: wxaui: wx advanced user interface - docking window manager // Author: Benjamin I. Williams // Modified by: // Created: 2005-05-17 -// RCS-ID: $Id: dockart.cpp 48848 2007-09-21 10:19:53Z SC $ +// RCS-ID: $Id$ // Copyright: (C) Copyright 2005-2006, Kirix Corporation, All Rights Reserved // Licence: wxWindows Library Licence, Version 3.1 /////////////////////////////////////////////////////////////////////////////// @@ -44,11 +44,11 @@ WX_DEFINE_OBJARRAY(wxAuiToolBarItemArray) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_AUITOOLBAR_TOOL_DROPDOWN) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_AUITOOLBAR_OVERFLOW_CLICK) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_AUITOOLBAR_RIGHT_CLICK) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_AUITOOLBAR_MIDDLE_CLICK) -DEFINE_EVENT_TYPE(wxEVT_COMMAND_AUITOOLBAR_BEGIN_DRAG) +wxDEFINE_EVENT( wxEVT_COMMAND_AUITOOLBAR_TOOL_DROPDOWN, wxAuiToolBarEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_AUITOOLBAR_OVERFLOW_CLICK, wxAuiToolBarEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_AUITOOLBAR_RIGHT_CLICK, wxAuiToolBarEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_AUITOOLBAR_MIDDLE_CLICK, wxAuiToolBarEvent ); +wxDEFINE_EVENT( wxEVT_COMMAND_AUITOOLBAR_BEGIN_DRAG, wxAuiToolBarEvent ); IMPLEMENT_CLASS(wxAuiToolBar, wxControl) @@ -69,44 +69,6 @@ const int BUTTON_DROPDOWN_WIDTH = 10; wxBitmap wxAuiBitmapFromBits(const unsigned char bits[], int w, int h, const wxColour& color); -unsigned char wxAuiBlendColour(unsigned char fg, unsigned char bg, double alpha); -wxColor wxAuiStepColour(const wxColor& c, int percent); - -static wxBitmap MakeDisabledBitmap(wxBitmap& bmp) -{ - wxImage image = bmp.ConvertToImage(); - - int mr, mg, mb; - mr = image.GetMaskRed(); - mg = image.GetMaskGreen(); - mb = image.GetMaskBlue(); - - unsigned char* data = image.GetData(); - int width = image.GetWidth(); - int height = image.GetHeight(); - bool has_mask = image.HasMask(); - - for (int y = height-1; y >= 0; --y) - { - for (int x = width-1; x >= 0; --x) - { - data = image.GetData() + (y*(width*3))+(x*3); - unsigned char* r = data; - unsigned char* g = data+1; - unsigned char* b = data+2; - - if (has_mask && *r == mr && *g == mg && *b == mb) - continue; - - *r = wxAuiBlendColour(*r, 255, 0.4); - *g = wxAuiBlendColour(*g, 255, 0.4); - *b = wxAuiBlendColour(*b, 255, 0.4); - } - } - - return wxBitmap(image); -} - static wxColor GetBaseColor() { @@ -122,7 +84,7 @@ static wxColor GetBaseColor() (255-base_colour.Green()) + (255-base_colour.Blue()) < 60) { - base_colour = wxAuiStepColour(base_colour, 92); + base_colour = base_colour.ChangeLightness(92); } return base_colour; @@ -158,7 +120,7 @@ private: static const unsigned char - DISABLED_TEXT_GREY_HUE = wxAuiBlendColour(0, 255, 0.4); + DISABLED_TEXT_GREY_HUE = wxColour::AlphaBlend(0, 255, 0.4); const wxColour DISABLED_TEXT_COLOR(DISABLED_TEXT_GREY_HUE, DISABLED_TEXT_GREY_HUE, DISABLED_TEXT_GREY_HUE); @@ -175,18 +137,18 @@ wxAuiDefaultToolBarArt::wxAuiDefaultToolBarArt() m_gripper_size = 7; m_overflow_size = 16; - wxColor darker1_colour = wxAuiStepColour(m_base_colour, 85); - wxColor darker2_colour = wxAuiStepColour(m_base_colour, 75); - wxColor darker3_colour = wxAuiStepColour(m_base_colour, 60); - wxColor darker4_colour = wxAuiStepColour(m_base_colour, 50); - wxColor darker5_colour = wxAuiStepColour(m_base_colour, 40); + wxColor darker1_colour = m_base_colour.ChangeLightness(85); + wxColor darker2_colour = m_base_colour.ChangeLightness(75); + wxColor darker3_colour = m_base_colour.ChangeLightness(60); + wxColor darker4_colour = m_base_colour.ChangeLightness(50); + wxColor darker5_colour = m_base_colour.ChangeLightness(40); m_gripper_pen1 = wxPen(darker5_colour); m_gripper_pen2 = wxPen(darker3_colour); m_gripper_pen3 = *wxWHITE_PEN; - static unsigned char button_dropdown_bits[] = { 0xe0, 0xf1, 0xfb }; - static unsigned char overflow_bits[] = { 0x80, 0xff, 0x80, 0xc1, 0xe3, 0xf7 }; + static const unsigned char button_dropdown_bits[] = { 0xe0, 0xf1, 0xfb }; + static const unsigned char overflow_bits[] = { 0x80, 0xff, 0x80, 0xc1, 0xe3, 0xf7 }; m_button_dropdown_bmp = wxAuiBitmapFromBits(button_dropdown_bits, 5, 3, *wxBLACK); @@ -225,6 +187,21 @@ void wxAuiDefaultToolBarArt::SetTextOrientation(int orientation) m_text_orientation = orientation; } +unsigned int wxAuiDefaultToolBarArt::GetFlags() +{ + return m_flags; +} + +wxFont wxAuiDefaultToolBarArt::GetFont() +{ + return m_font; +} + +int wxAuiDefaultToolBarArt::GetTextOrientation() +{ + return m_text_orientation; +} + void wxAuiDefaultToolBarArt::DrawBackground( wxDC& dc, wxWindow* WXUNUSED(wnd), @@ -232,8 +209,8 @@ void wxAuiDefaultToolBarArt::DrawBackground( { wxRect rect = _rect; rect.height++; - wxColour start_colour = wxAuiStepColour(m_base_colour, 150); - wxColour end_colour = wxAuiStepColour(m_base_colour, 90); + wxColour start_colour = m_base_colour.ChangeLightness(150); + wxColour end_colour = m_base_colour.ChangeLightness(90); dc.GradientFillLinear(rect, start_colour, end_colour, wxSOUTH); } @@ -259,7 +236,7 @@ void wxAuiDefaultToolBarArt::DrawLabel( int text_x, text_y; text_x = rect.x + 1; text_y = rect.y + (rect.height-text_height)/2; - dc.DrawText(item.label, text_x, text_y); + dc.DrawText(item.GetLabel(), text_x, text_y); dc.DestroyClippingRegion(); } @@ -280,7 +257,7 @@ void wxAuiDefaultToolBarArt::DrawButton( dc.GetTextExtent(wxT("ABCDHgj"), &tx, &text_height); text_width = 0; - dc.GetTextExtent(item.label, &text_width, &ty); + dc.GetTextExtent(item.GetLabel(), &text_width, &ty); } int bmp_x = 0, bmp_y = 0; @@ -290,79 +267,77 @@ void wxAuiDefaultToolBarArt::DrawButton( { bmp_x = rect.x + (rect.width/2) - - (item.bitmap.GetWidth()/2); + (item.GetBitmap().GetWidth()/2); bmp_y = rect.y + ((rect.height-text_height)/2) - - (item.bitmap.GetHeight()/2); + (item.GetBitmap().GetHeight()/2); text_x = rect.x + (rect.width/2) - (text_width/2) + 1; text_y = rect.y + rect.height - text_height - 1; } - else if (m_text_orientation == wxAUI_TBTOOL_TEXT_RIGHT) + else if (m_text_orientation == wxAUI_TBTOOL_TEXT_RIGHT) { bmp_x = rect.x + 3; bmp_y = rect.y + (rect.height/2) - - (item.bitmap.GetHeight()/2); + (item.GetBitmap().GetHeight()/2); - text_x = bmp_x + 3 + item.bitmap.GetWidth(); + text_x = bmp_x + 3 + item.GetBitmap().GetWidth(); text_y = rect.y + (rect.height/2) - (text_height/2); } - if (!(item.state & wxAUI_BUTTON_STATE_DISABLED)) + if (!(item.GetState() & wxAUI_BUTTON_STATE_DISABLED)) { - if (item.state & wxAUI_BUTTON_STATE_PRESSED) + if (item.GetState() & wxAUI_BUTTON_STATE_PRESSED) { dc.SetPen(wxPen(m_highlight_colour)); - dc.SetBrush(wxBrush(wxAuiStepColour(m_highlight_colour, 150))); + dc.SetBrush(wxBrush(m_highlight_colour.ChangeLightness(150))); dc.DrawRectangle(rect); } - else if ((item.state & wxAUI_BUTTON_STATE_HOVER) || item.sticky == true) + else if ((item.GetState() & wxAUI_BUTTON_STATE_HOVER) || item.IsSticky()) { dc.SetPen(wxPen(m_highlight_colour)); - dc.SetBrush(wxBrush(wxAuiStepColour(m_highlight_colour, 170))); + dc.SetBrush(wxBrush(m_highlight_colour.ChangeLightness(170))); // draw an even lighter background for checked item hovers (since // the hover background is the same color as the check background) - if (item.state & wxAUI_BUTTON_STATE_CHECKED) - dc.SetBrush(wxBrush(wxAuiStepColour(m_highlight_colour, 180))); + if (item.GetState() & wxAUI_BUTTON_STATE_CHECKED) + dc.SetBrush(wxBrush(m_highlight_colour.ChangeLightness(180))); dc.DrawRectangle(rect); } - else if (item.state & wxAUI_BUTTON_STATE_CHECKED) + else if (item.GetState() & wxAUI_BUTTON_STATE_CHECKED) { // it's important to put this code in an else statment after the // hover, otherwise hovers won't draw properly for checked items dc.SetPen(wxPen(m_highlight_colour)); - dc.SetBrush(wxBrush(wxAuiStepColour(m_highlight_colour, 170))); + dc.SetBrush(wxBrush(m_highlight_colour.ChangeLightness(170))); dc.DrawRectangle(rect); } } wxBitmap bmp; - if (item.state & wxAUI_BUTTON_STATE_DISABLED) - bmp = item.disabled_bitmap; - else - bmp = item.bitmap; + if (item.GetState() & wxAUI_BUTTON_STATE_DISABLED) + bmp = item.GetDisabledBitmap(); + else + bmp = item.GetBitmap(); - if (!bmp.IsOk()) - return; - - dc.DrawBitmap(bmp, bmp_x, bmp_y, true); + if ( bmp.IsOk() ) + dc.DrawBitmap(bmp, bmp_x, bmp_y, true); // set the item's text color based on if it is disabled dc.SetTextForeground(*wxBLACK); - if (item.state & wxAUI_BUTTON_STATE_DISABLED) + if (item.GetState() & wxAUI_BUTTON_STATE_DISABLED) dc.SetTextForeground(DISABLED_TEXT_COLOR); - if ((m_flags & wxAUI_TB_TEXT) && item.label.Length() > 0) + if ( (m_flags & wxAUI_TB_TEXT) && !item.GetLabel().empty() ) { - dc.DrawText(item.label, text_x, text_y); + dc.DrawText(item.GetLabel(), text_x, text_y); } } @@ -396,7 +371,7 @@ void wxAuiDefaultToolBarArt::DrawDropDownButton( text_width = 0; } - dc.GetTextExtent(item.label, &text_width, &ty); + dc.GetTextExtent(item.GetLabel(), &text_width, &ty); } @@ -413,55 +388,66 @@ void wxAuiDefaultToolBarArt::DrawDropDownButton( { bmp_x = button_rect.x + (button_rect.width/2) - - (item.bitmap.GetWidth()/2); + (item.GetBitmap().GetWidth()/2); bmp_y = button_rect.y + ((button_rect.height-text_height)/2) - - (item.bitmap.GetHeight()/2); + (item.GetBitmap().GetHeight()/2); text_x = rect.x + (rect.width/2) - (text_width/2) + 1; text_y = rect.y + rect.height - text_height - 1; } - else if (m_text_orientation == wxAUI_TBTOOL_TEXT_RIGHT) + else if (m_text_orientation == wxAUI_TBTOOL_TEXT_RIGHT) { bmp_x = rect.x + 3; bmp_y = rect.y + (rect.height/2) - - (item.bitmap.GetHeight()/2); + (item.GetBitmap().GetHeight()/2); - text_x = bmp_x + 3 + item.bitmap.GetWidth(); + text_x = bmp_x + 3 + item.GetBitmap().GetWidth(); text_y = rect.y + (rect.height/2) - (text_height/2); } - if (item.state & wxAUI_BUTTON_STATE_PRESSED) + if (item.GetState() & wxAUI_BUTTON_STATE_PRESSED) + { + dc.SetPen(wxPen(m_highlight_colour)); + dc.SetBrush(wxBrush(m_highlight_colour.ChangeLightness(140))); + dc.DrawRectangle(button_rect); + + dc.SetBrush(wxBrush(m_highlight_colour.ChangeLightness(170))); + dc.DrawRectangle(dropdown_rect); + } + else if (item.GetState() & wxAUI_BUTTON_STATE_HOVER || + item.IsSticky()) { dc.SetPen(wxPen(m_highlight_colour)); - dc.SetBrush(wxBrush(wxAuiStepColour(m_highlight_colour, 140))); + dc.SetBrush(wxBrush(m_highlight_colour.ChangeLightness(170))); dc.DrawRectangle(button_rect); dc.DrawRectangle(dropdown_rect); } - else if (item.state & wxAUI_BUTTON_STATE_HOVER || - item.sticky == true) + else if (item.GetState() & wxAUI_BUTTON_STATE_CHECKED) { + // Notice that this branch must come after the hover one to ensure the + // correct appearance when the mouse hovers over a checked item. dc.SetPen(wxPen(m_highlight_colour)); - dc.SetBrush(wxBrush(wxAuiStepColour(m_highlight_colour, 170))); + dc.SetBrush(wxBrush(m_highlight_colour.ChangeLightness(170))); dc.DrawRectangle(button_rect); dc.DrawRectangle(dropdown_rect); } wxBitmap bmp; wxBitmap dropbmp; - if (item.state & wxAUI_BUTTON_STATE_DISABLED) + if (item.GetState() & wxAUI_BUTTON_STATE_DISABLED) { - bmp = item.disabled_bitmap; + bmp = item.GetDisabledBitmap(); dropbmp = m_disabled_button_dropdown_bmp; } - else + else { - bmp = item.bitmap; + bmp = item.GetBitmap(); dropbmp = m_button_dropdown_bmp; } @@ -473,12 +459,12 @@ void wxAuiDefaultToolBarArt::DrawDropDownButton( // set the item's text color based on if it is disabled dc.SetTextForeground(*wxBLACK); - if (item.state & wxAUI_BUTTON_STATE_DISABLED) + if (item.GetState() & wxAUI_BUTTON_STATE_DISABLED) dc.SetTextForeground(DISABLED_TEXT_COLOR); - if ((m_flags & wxAUI_TB_TEXT) && item.label.Length() > 0) + if ( (m_flags & wxAUI_TB_TEXT) && !item.GetLabel().empty() ) { - dc.DrawText(item.label, text_x, text_y); + dc.DrawText(item.GetLabel(), text_x, text_y); } } @@ -506,7 +492,7 @@ void wxAuiDefaultToolBarArt::DrawControlLabel( text_width = 0; } - dc.GetTextExtent(item.label, &text_width, &ty); + dc.GetTextExtent(item.GetLabel(), &text_width, &ty); // don't draw the label if it is wider than the item width if (text_width > rect.width) @@ -518,9 +504,9 @@ void wxAuiDefaultToolBarArt::DrawControlLabel( text_x = rect.x + (rect.width/2) - (text_width/2) + 1; text_y = rect.y + rect.height - text_height - 1; - if ((m_flags & wxAUI_TB_TEXT) && item.label.Length() > 0) + if ( (m_flags & wxAUI_TB_TEXT) && !item.GetLabel().empty() ) { - dc.DrawText(item.label, text_x, text_y); + dc.DrawText(item.GetLabel(), text_x, text_y); } } @@ -536,7 +522,13 @@ wxSize wxAuiDefaultToolBarArt::GetLabelSize( dc.GetTextExtent(wxT("ABCDHgj"), &width, &height); // get item's width - width = item.min_size.GetWidth(); + width = item.GetMinSize().GetWidth(); + + if (width == -1) + { + // no width specified, measure the text ourselves + width = dc.GetTextExtent(item.GetLabel()).GetX(); + } return wxSize(width, height); } @@ -546,11 +538,11 @@ wxSize wxAuiDefaultToolBarArt::GetToolSize( wxWindow* WXUNUSED(wnd), const wxAuiToolBarItem& item) { - if (!item.bitmap.IsOk() && !(m_flags & wxAUI_TB_TEXT)) + if (!item.GetBitmap().IsOk() && !(m_flags & wxAUI_TB_TEXT)) return wxSize(16,16); - int width = item.bitmap.GetWidth(); - int height = item.bitmap.GetHeight(); + int width = item.GetBitmap().GetWidth(); + int height = item.GetBitmap().GetHeight(); if (m_flags & wxAUI_TB_TEXT) { @@ -562,20 +554,21 @@ wxSize wxAuiDefaultToolBarArt::GetToolSize( dc.GetTextExtent(wxT("ABCDHgj"), &tx, &ty); height += ty; - if (item.label.Length() > 0) + if ( !item.GetLabel().empty() ) { - dc.GetTextExtent(item.label, &tx, &ty); + dc.GetTextExtent(item.GetLabel(), &tx, &ty); width = wxMax(width, tx+6); } } - else if (m_text_orientation == wxAUI_TBTOOL_TEXT_RIGHT && item.label.Length() > 0) + else if ( m_text_orientation == wxAUI_TBTOOL_TEXT_RIGHT && + !item.GetLabel().empty() ) { width += 3; // space between left border and bitmap width += 3; // space between bitmap and text - if (item.label.Length() > 0) + if ( !item.GetLabel().empty() ) { - dc.GetTextExtent(item.label, &tx, &ty); + dc.GetTextExtent(item.GetLabel(), &tx, &ty); width += tx; height = wxMax(height, ty); } @@ -583,7 +576,7 @@ wxSize wxAuiDefaultToolBarArt::GetToolSize( } // if the tool has a dropdown button, add it to the width - if (item.dropdown == true) + if (item.HasDropDown()) width += (BUTTON_DROPDOWN_WIDTH+4); return wxSize(width, height); @@ -608,7 +601,7 @@ void wxAuiDefaultToolBarArt::DrawSeparator( rect.y += (rect.height/2) - (new_height/2); rect.height = new_height; } - else + else { rect.y += (rect.height/2); rect.height = 1; @@ -617,8 +610,8 @@ void wxAuiDefaultToolBarArt::DrawSeparator( rect.width = new_width; } - wxColour start_colour = wxAuiStepColour(m_base_colour, 80); - wxColour end_colour = wxAuiStepColour(m_base_colour, 80); + wxColour start_colour = m_base_colour.ChangeLightness(80); + wxColour end_colour = m_base_colour.ChangeLightness(80); dc.GradientFillLinear(rect, start_colour, end_colour, horizontal ? wxSOUTH : wxEAST); } @@ -638,7 +631,7 @@ void wxAuiDefaultToolBarArt::DrawGripper(wxDC& dc, if (x > rect.GetWidth()-5) break; } - else + else { x = rect.x + 3; y = rect.y + (i*4) + 5; @@ -670,7 +663,7 @@ void wxAuiDefaultToolBarArt::DrawOverflowButton(wxDC& dc, state & wxAUI_BUTTON_STATE_PRESSED) { wxRect cli_rect = wnd->GetClientRect(); - wxColor light_gray_bg = wxAuiStepColour(m_highlight_colour, 170); + wxColor light_gray_bg = m_highlight_colour.ChangeLightness(170); if (m_flags & wxAUI_TB_VERTICAL) { @@ -710,9 +703,9 @@ void wxAuiDefaultToolBarArt::SetElementSize(int element_id, int size) { switch (element_id) { - case wxAUI_TBART_SEPARATOR_SIZE: m_separator_size = size; - case wxAUI_TBART_GRIPPER_SIZE: m_gripper_size = size; - case wxAUI_TBART_OVERFLOW_SIZE: m_overflow_size = size; + case wxAUI_TBART_SEPARATOR_SIZE: m_separator_size = size; break; + case wxAUI_TBART_GRIPPER_SIZE: m_gripper_size = size; break; + case wxAUI_TBART_OVERFLOW_SIZE: m_overflow_size = size; break; } } @@ -728,22 +721,22 @@ int wxAuiDefaultToolBarArt::ShowDropDown(wxWindow* wnd, { wxAuiToolBarItem& item = items.Item(i); - if (item.kind == wxITEM_NORMAL) + if (item.GetKind() == wxITEM_NORMAL) { - wxString text = item.short_help; + wxString text = item.GetShortHelp(); if (text.empty()) - text = item.label; + text = item.GetLabel(); if (text.empty()) text = wxT(" "); - wxMenuItem* m = new wxMenuItem(&menuPopup, item.id, text, item.short_help); + wxMenuItem* m = new wxMenuItem(&menuPopup, item.GetId(), text, item.GetShortHelp()); - m->SetBitmap(item.bitmap); + m->SetBitmap(item.GetBitmap()); menuPopup.Append(m); items_added++; } - else if (item.kind == wxITEM_SEPARATOR) + else if (item.GetKind() == wxITEM_SEPARATOR) { if (items_added > 0) menuPopup.AppendSeparator(); @@ -770,6 +763,22 @@ int wxAuiDefaultToolBarArt::ShowDropDown(wxWindow* wnd, +static wxOrientation GetOrientation(long& style) +{ + switch (style & wxAUI_ORIENTATION_MASK) + { + case wxAUI_TB_HORIZONTAL: + return wxHORIZONTAL; + case wxAUI_TB_VERTICAL: + return wxVERTICAL; + default: + wxFAIL_MSG("toolbar cannot be locked in both horizontal and vertical orientations (maybe no lock was intended?)"); + // fall through + case 0: + return wxBOTH; + } +} + BEGIN_EVENT_TABLE(wxAuiToolBar, wxControl) EVT_SIZE(wxAuiToolBar::OnSize) EVT_IDLE(wxAuiToolBar::OnIdle) @@ -786,6 +795,7 @@ BEGIN_EVENT_TABLE(wxAuiToolBar, wxControl) EVT_MIDDLE_UP(wxAuiToolBar::OnMiddleUp) EVT_MOTION(wxAuiToolBar::OnMotion) EVT_LEAVE_WINDOW(wxAuiToolBar::OnLeaveWindow) + EVT_MOUSE_CAPTURE_LOST(wxAuiToolBar::OnCaptureLost) EVT_SET_CURSOR(wxAuiToolBar::OnSetCursor) END_EVENT_TABLE() @@ -815,16 +825,22 @@ wxAuiToolBar::wxAuiToolBar(wxWindow* parent, m_gripper_sizer_item = NULL; m_overflow_sizer_item = NULL; m_dragging = false; - m_style = style; + m_orientation = GetOrientation(style); + if (m_orientation == wxBOTH) + { + m_orientation = wxHORIZONTAL; + } + m_style = style | wxBORDER_NONE; m_gripper_visible = (m_style & wxAUI_TB_GRIPPER) ? true : false; m_overflow_visible = (m_style & wxAUI_TB_OVERFLOW) ? true : false; m_overflow_state = 0; SetMargins(5, 5, 2, 2); SetFont(*wxNORMAL_FONT); - m_art->SetFlags((unsigned int)m_style); + SetArtFlags(); SetExtraStyle(wxWS_EX_PROCESS_IDLE); - if (style & wxAUI_TB_HORZ_TEXT) + if (style & wxAUI_TB_HORZ_LAYOUT) SetToolTextOrientation(wxAUI_TBTOOL_TEXT_RIGHT); + SetBackgroundStyle(wxBG_STYLE_CUSTOM); } @@ -836,32 +852,40 @@ wxAuiToolBar::~wxAuiToolBar() void wxAuiToolBar::SetWindowStyleFlag(long style) { + GetOrientation(style); // assert if style is invalid + wxCHECK_RET(IsPaneValid(style), + "window settings and pane settings are incompatible"); + wxControl::SetWindowStyleFlag(style); m_style = style; if (m_art) { - m_art->SetFlags((unsigned int)m_style); + SetArtFlags(); } if (m_style & wxAUI_TB_GRIPPER) m_gripper_visible = true; - else + else m_gripper_visible = false; if (m_style & wxAUI_TB_OVERFLOW) m_overflow_visible = true; - else + else m_overflow_visible = false; - if (style & wxAUI_TB_HORZ_TEXT) + if (style & wxAUI_TB_HORZ_LAYOUT) SetToolTextOrientation(wxAUI_TBTOOL_TEXT_RIGHT); - else + else SetToolTextOrientation(wxAUI_TBTOOL_TEXT_BOTTOM); } +long wxAuiToolBar::GetWindowStyleFlag() const +{ + return m_style; +} void wxAuiToolBar::SetArtProvider(wxAuiToolBarArt* art) { @@ -871,7 +895,7 @@ void wxAuiToolBar::SetArtProvider(wxAuiToolBarArt* art) if (m_art) { - m_art->SetFlags((unsigned int)m_style); + SetArtFlags(); m_art->SetTextOrientation(m_tool_text_orientation); } } @@ -884,13 +908,13 @@ wxAuiToolBarArt* wxAuiToolBar::GetArtProvider() const -void wxAuiToolBar::AddTool(int tool_id, +wxAuiToolBarItem* wxAuiToolBar::AddTool(int tool_id, const wxString& label, const wxBitmap& bitmap, const wxString& short_help_string, wxItemKind kind) { - AddTool(tool_id, + return AddTool(tool_id, label, bitmap, wxNullBitmap, @@ -901,13 +925,13 @@ void wxAuiToolBar::AddTool(int tool_id, } -void wxAuiToolBar::AddTool(int tool_id, +wxAuiToolBarItem* wxAuiToolBar::AddTool(int tool_id, const wxString& label, const wxBitmap& bitmap, const wxBitmap& disabled_bitmap, wxItemKind kind, - const wxString& WXUNUSED(short_help_string), - const wxString& WXUNUSED(long_help_string), + const wxString& short_help_string, + const wxString& long_help_string, wxObject* WXUNUSED(client_data)) { wxAuiToolBarItem item; @@ -915,10 +939,12 @@ void wxAuiToolBar::AddTool(int tool_id, item.label = label; item.bitmap = bitmap; item.disabled_bitmap = disabled_bitmap; + item.short_help = short_help_string; + item.long_help = long_help_string; item.active = true; item.dropdown = false; - item.space_pixels = 0; - item.id = tool_id; + item.spacer_pixels = 0; + item.toolid = tool_id; item.state = 0; item.proportion = 0; item.kind = kind; @@ -927,22 +953,22 @@ void wxAuiToolBar::AddTool(int tool_id, item.user_data = 0; item.sticky = false; + if (item.toolid == wxID_ANY) + item.toolid = wxNewId(); + if (!item.disabled_bitmap.IsOk()) { // no disabled bitmap specified, we need to make one if (item.bitmap.IsOk()) { - //wxImage img = item.bitmap.ConvertToImage(); - //wxImage grey_version = img.ConvertToGreyscale(); - //item.disabled_bitmap = wxBitmap(grey_version); - item.disabled_bitmap = MakeDisabledBitmap(item.bitmap); + item.disabled_bitmap = item.bitmap.ConvertToDisabled(); } } - m_items.Add(item); + return &m_items.Last(); } -void wxAuiToolBar::AddControl(wxControl* control, +wxAuiToolBarItem* wxAuiToolBar::AddControl(wxControl* control, const wxString& label) { wxAuiToolBarItem item; @@ -952,8 +978,8 @@ void wxAuiToolBar::AddControl(wxControl* control, item.disabled_bitmap = wxNullBitmap; item.active = true; item.dropdown = false; - item.space_pixels = 0; - item.id = control->GetId(); + item.spacer_pixels = 0; + item.toolid = control->GetId(); item.state = 0; item.proportion = 0; item.kind = wxITEM_CONTROL; @@ -963,9 +989,10 @@ void wxAuiToolBar::AddControl(wxControl* control, item.sticky = false; m_items.Add(item); + return &m_items.Last(); } -void wxAuiToolBar::AddLabel(int tool_id, +wxAuiToolBarItem* wxAuiToolBar::AddLabel(int tool_id, const wxString& label, const int width) { @@ -980,8 +1007,8 @@ void wxAuiToolBar::AddLabel(int tool_id, item.disabled_bitmap = wxNullBitmap; item.active = true; item.dropdown = false; - item.space_pixels = 0; - item.id = tool_id; + item.spacer_pixels = 0; + item.toolid = tool_id; item.state = 0; item.proportion = 0; item.kind = wxITEM_LABEL; @@ -990,10 +1017,14 @@ void wxAuiToolBar::AddLabel(int tool_id, item.user_data = 0; item.sticky = false; + if (item.toolid == wxID_ANY) + item.toolid = wxNewId(); + m_items.Add(item); + return &m_items.Last(); } -void wxAuiToolBar::AddSeparator() +wxAuiToolBarItem* wxAuiToolBar::AddSeparator() { wxAuiToolBarItem item; item.window = NULL; @@ -1002,7 +1033,7 @@ void wxAuiToolBar::AddSeparator() item.disabled_bitmap = wxNullBitmap; item.active = true; item.dropdown = false; - item.id = -1; + item.toolid = -1; item.state = 0; item.proportion = 0; item.kind = wxITEM_SEPARATOR; @@ -1012,9 +1043,10 @@ void wxAuiToolBar::AddSeparator() item.sticky = false; m_items.Add(item); + return &m_items.Last(); } -void wxAuiToolBar::AddSpacer(int pixels) +wxAuiToolBarItem* wxAuiToolBar::AddSpacer(int pixels) { wxAuiToolBarItem item; item.window = NULL; @@ -1023,8 +1055,8 @@ void wxAuiToolBar::AddSpacer(int pixels) item.disabled_bitmap = wxNullBitmap; item.active = true; item.dropdown = false; - item.space_pixels = pixels; - item.id = -1; + item.spacer_pixels = pixels; + item.toolid = -1; item.state = 0; item.proportion = 0; item.kind = wxITEM_SPACER; @@ -1034,9 +1066,10 @@ void wxAuiToolBar::AddSpacer(int pixels) item.sticky = false; m_items.Add(item); + return &m_items.Last(); } -void wxAuiToolBar::AddStretchSpacer(int proportion) +wxAuiToolBarItem* wxAuiToolBar::AddStretchSpacer(int proportion) { wxAuiToolBarItem item; item.window = NULL; @@ -1045,8 +1078,8 @@ void wxAuiToolBar::AddStretchSpacer(int proportion) item.disabled_bitmap = wxNullBitmap; item.active = true; item.dropdown = false; - item.space_pixels = 0; - item.id = -1; + item.spacer_pixels = 0; + item.toolid = -1; item.state = 0; item.proportion = proportion; item.kind = wxITEM_SPACER; @@ -1056,6 +1089,7 @@ void wxAuiToolBar::AddStretchSpacer(int proportion) item.sticky = false; m_items.Add(item); + return &m_items.Last(); } void wxAuiToolBar::Clear() @@ -1102,7 +1136,7 @@ wxAuiToolBarItem* wxAuiToolBar::FindTool(int tool_id) const for (i = 0, count = m_items.GetCount(); i < count; ++i) { wxAuiToolBarItem& item = m_items.Item(i); - if (item.id == tool_id) + if (item.toolid == tool_id) return &item; } @@ -1212,7 +1246,7 @@ int wxAuiToolBar::GetToolSeparation() const { if (m_art) return m_art->GetElementSize(wxAUI_TBART_SEPARATOR_SIZE); - else + else return 5; } @@ -1302,8 +1336,16 @@ int wxAuiToolBar::GetToolPacking() const } -void wxAuiToolBar::SetOrientation(int WXUNUSED(orientation)) +void wxAuiToolBar::SetOrientation(int orientation) { + wxCHECK_RET(orientation == wxHORIZONTAL || + orientation == wxVERTICAL, + "invalid orientation value"); + if (orientation != m_orientation) + { + m_orientation = wxOrientation(orientation); + SetArtFlags(); + } } void wxAuiToolBar::SetMargins(int left, int right, int top, int bottom) @@ -1328,6 +1370,8 @@ void wxAuiToolBar::SetGripperVisible(bool visible) m_gripper_visible = visible; if (visible) m_style |= wxAUI_TB_GRIPPER; + else + m_style &= ~wxAUI_TB_GRIPPER; Realize(); Refresh(false); } @@ -1343,6 +1387,8 @@ void wxAuiToolBar::SetOverflowVisible(bool visible) m_overflow_visible = visible; if (visible) m_style |= wxAUI_TB_OVERFLOW; + else + m_style &= ~wxAUI_TB_OVERFLOW; Refresh(false); } @@ -1430,9 +1476,9 @@ void wxAuiToolBar::RefreshOverflowState() // find out if the mouse cursor is inside the dropdown rectangle if (overflow_rect.Contains(pt.x, pt.y)) { - if (::wxGetMouseState().LeftDown()) + if (::wxGetMouseState().LeftIsDown()) overflow_state = wxAUI_BUTTON_STATE_PRESSED; - else + else overflow_state = wxAUI_BUTTON_STATE_HOVER; } @@ -1450,15 +1496,39 @@ void wxAuiToolBar::ToggleTool(int tool_id, bool state) { wxAuiToolBarItem* tool = FindTool(tool_id); - if (tool) + if (tool && (tool->kind == wxITEM_CHECK || tool->kind == wxITEM_RADIO)) { - if (tool->kind != wxITEM_CHECK) - return; + if (tool->kind == wxITEM_RADIO) + { + int i, idx, count; + idx = GetToolIndex(tool_id); + count = (int)m_items.GetCount(); + + if (idx >= 0 && idx < count) + { + for (i = idx + 1; i < count; ++i) + { + if (m_items[i].kind != wxITEM_RADIO) + break; + m_items[i].state &= ~wxAUI_BUTTON_STATE_CHECKED; + } + for (i = idx - 1; i >= 0; i--) + { + if (m_items[i].kind != wxITEM_RADIO) + break; + m_items[i].state &= ~wxAUI_BUTTON_STATE_CHECKED; + } + } - if (state == true) tool->state |= wxAUI_BUTTON_STATE_CHECKED; - else - tool->state &= ~wxAUI_BUTTON_STATE_CHECKED; + } + else if (tool->kind == wxITEM_CHECK) + { + if (state == true) + tool->state |= wxAUI_BUTTON_STATE_CHECKED; + else + tool->state &= ~wxAUI_BUTTON_STATE_CHECKED; + } } } @@ -1468,7 +1538,7 @@ bool wxAuiToolBar::GetToolToggled(int tool_id) const if (tool) { - if (tool->kind != wxITEM_CHECK) + if ( (tool->kind != wxITEM_CHECK) && (tool->kind != wxITEM_RADIO) ) return false; return (tool->state & wxAUI_BUTTON_STATE_CHECKED) ? true : false; @@ -1485,7 +1555,7 @@ void wxAuiToolBar::EnableTool(int tool_id, bool state) { if (state == true) tool->state &= ~wxAUI_BUTTON_STATE_DISABLED; - else + else tool->state |= wxAUI_BUTTON_STATE_DISABLED; } } @@ -1583,6 +1653,65 @@ void wxAuiToolBar::SetCustomOverflowItems(const wxAuiToolBarItemArray& prepend, m_custom_overflow_append = append; } +// get size of hint rectangle for a particular dock location +wxSize wxAuiToolBar::GetHintSize(int dock_direction) const +{ + switch (dock_direction) + { + case wxAUI_DOCK_TOP: + case wxAUI_DOCK_BOTTOM: + return m_horzHintSize; + case wxAUI_DOCK_RIGHT: + case wxAUI_DOCK_LEFT: + return m_vertHintSize; + default: + wxCHECK_MSG(false, wxDefaultSize, "invalid dock location value"); + } +} + +bool wxAuiToolBar::IsPaneValid(const wxAuiPaneInfo& pane) const +{ + return IsPaneValid(m_style, pane); +} + +bool wxAuiToolBar::IsPaneValid(long style, const wxAuiPaneInfo& pane) +{ + if (style & wxAUI_TB_HORIZONTAL) + { + if (pane.IsLeftDockable() || pane.IsRightDockable()) + { + return false; + } + } + else if (style & wxAUI_TB_VERTICAL) + { + if (pane.IsTopDockable() || pane.IsBottomDockable()) + { + return false; + } + } + return true; +} + +bool wxAuiToolBar::IsPaneValid(long style) const +{ + wxAuiManager* manager = wxAuiManager::GetManager(const_cast(this)); + if (manager) + { + return IsPaneValid(style, manager->GetPane(const_cast(this))); + } + return true; +} + +void wxAuiToolBar::SetArtFlags() const +{ + unsigned int artflags = m_style & ~wxAUI_ORIENTATION_MASK; + if (m_orientation == wxVERTICAL) + { + artflags |= wxAUI_TB_VERTICAL; + } + m_art->SetFlags(artflags); +} size_t wxAuiToolBar::GetToolCount() const { @@ -1600,7 +1729,7 @@ int wxAuiToolBar::GetToolIndex(int tool_id) const for (i = 0; i < count; ++i) { wxAuiToolBarItem& item = m_items.Item(i); - if (item.id == tool_id) + if (item.toolid == tool_id) return i; } @@ -1620,7 +1749,7 @@ bool wxAuiToolBar::GetToolFitsByIndex(int tool_idx) const wxRect rect = m_items[tool_idx].sizer_item->GetRect(); - if (m_style & wxAUI_TB_VERTICAL) + if (m_orientation == wxVERTICAL) { // take the dropdown size into account if (m_overflow_visible) @@ -1629,7 +1758,7 @@ bool wxAuiToolBar::GetToolFitsByIndex(int tool_idx) const if (rect.y+rect.height < cli_h) return true; } - else + else { // take the dropdown size into account if (m_overflow_visible) @@ -1677,11 +1806,40 @@ bool wxAuiToolBar::Realize() if (!dc.IsOk()) return false; - bool horizontal = true; - if (m_style & wxAUI_TB_VERTICAL) - horizontal = false; + // calculate hint sizes for both horizontal and vertical + // in the order that leaves toolbar in correct final state + bool retval = false; + if (m_orientation == wxHORIZONTAL) + { + if (RealizeHelper(dc, false)) + { + m_vertHintSize = GetSize(); + if (RealizeHelper(dc, true)) + { + m_horzHintSize = GetSize(); + retval = true; + } + } + } + else + { + if (RealizeHelper(dc, true)) + { + m_horzHintSize = GetSize(); + if (RealizeHelper(dc, false)) + { + m_vertHintSize = GetSize(); + retval = true; + } + } + } + Refresh(false); + return retval; +} +bool wxAuiToolBar::RealizeHelper(wxClientDC& dc, bool horizontal) +{ // create the new sizer to add toolbar elements to wxBoxSizer* sizer = new wxBoxSizer(horizontal ? wxHORIZONTAL : wxVERTICAL); @@ -1692,10 +1850,10 @@ bool wxAuiToolBar::Realize() { if (horizontal) m_gripper_sizer_item = sizer->Add(gripper_size, 1, 0, wxEXPAND); - else + else m_gripper_sizer_item = sizer->Add(1, gripper_size, 0, wxEXPAND); } - else + else { m_gripper_sizer_item = NULL; } @@ -1705,7 +1863,7 @@ bool wxAuiToolBar::Realize() { if (horizontal) sizer->Add(m_left_padding, 1); - else + else sizer->Add(1, m_left_padding); } @@ -1723,7 +1881,7 @@ bool wxAuiToolBar::Realize() sizer_item = sizer->Add(size.x + (m_tool_border_padding*2), size.y + (m_tool_border_padding*2), item.proportion, - wxALIGN_CENTER); + item.alignment); if (i+1 < count) { sizer->AddSpacer(m_tool_packing); @@ -1734,12 +1892,13 @@ bool wxAuiToolBar::Realize() case wxITEM_CHECK: case wxITEM_NORMAL: + case wxITEM_RADIO: { wxSize size = m_art->GetToolSize(dc, this, item); sizer_item = sizer->Add(size.x + (m_tool_border_padding*2), size.y + (m_tool_border_padding*2), 0, - wxALIGN_CENTER); + item.alignment); // add tool packing if (i+1 < count) { @@ -1753,7 +1912,7 @@ bool wxAuiToolBar::Realize() { if (horizontal) sizer_item = sizer->Add(separator_size, 1, 0, wxEXPAND); - else + else sizer_item = sizer->Add(1, separator_size, 0, wxEXPAND); // add tool packing @@ -1768,8 +1927,8 @@ bool wxAuiToolBar::Realize() case wxITEM_SPACER: if (item.proportion > 0) sizer_item = sizer->AddStretchSpacer(item.proportion); - else - sizer_item = sizer->Add(item.space_pixels, 1); + else + sizer_item = sizer->Add(item.spacer_pixels, 1); break; case wxITEM_CONTROL: @@ -1781,9 +1940,11 @@ bool wxAuiToolBar::Realize() vert_sizer->AddStretchSpacer(1); ctrl_sizer_item = vert_sizer->Add(item.window, 0, wxEXPAND); vert_sizer->AddStretchSpacer(1); - if ((m_style & wxAUI_TB_TEXT) && item.label.Length() > 0) + if ( (m_style & wxAUI_TB_TEXT) && + m_tool_text_orientation == wxAUI_TBTOOL_TEXT_BOTTOM && + !item.GetLabel().empty() ) { - wxSize s = GetLabelSize(item.label); + wxSize s = GetLabelSize(item.GetLabel()); vert_sizer->Add(1, s.y); } @@ -1822,7 +1983,7 @@ bool wxAuiToolBar::Realize() { if (horizontal) sizer->Add(m_right_padding, 1); - else + else sizer->Add(1, m_right_padding); } @@ -1836,10 +1997,10 @@ bool wxAuiToolBar::Realize() { if (horizontal) m_overflow_sizer_item = sizer->Add(overflow_size, 1, 0, wxEXPAND); - else + else m_overflow_sizer_item = sizer->Add(1, overflow_size, 0, wxEXPAND); } - else + else { m_overflow_sizer_item = NULL; } @@ -1854,7 +2015,7 @@ bool wxAuiToolBar::Realize() { if (horizontal) outside_sizer->Add(1, m_top_padding); - else + else outside_sizer->Add(m_top_padding, 1); } @@ -1866,7 +2027,7 @@ bool wxAuiToolBar::Realize() { if (horizontal) outside_sizer->Add(1, m_bottom_padding); - else + else outside_sizer->Add(m_bottom_padding, 1); } @@ -1904,18 +2065,17 @@ bool wxAuiToolBar::Realize() { SetClientSize(new_size); } - else + else { m_sizer->SetDimension(0, 0, cur_size.x, cur_size.y); } } - else + else { wxSize cur_size = GetClientSize(); m_sizer->SetDimension(0, 0, cur_size.x, cur_size.y); } - Refresh(false); return true; } @@ -1930,14 +2090,14 @@ wxRect wxAuiToolBar::GetOverflowRect() const wxRect overflow_rect = m_overflow_sizer_item->GetRect(); int overflow_size = m_art->GetElementSize(wxAUI_TBART_OVERFLOW_SIZE); - if (m_style & wxAUI_TB_VERTICAL) + if (m_orientation == wxVERTICAL) { overflow_rect.y = cli_rect.height - overflow_size; overflow_rect.x = 0; overflow_rect.width = cli_rect.width; overflow_rect.height = overflow_size; } - else + else { overflow_rect.x = cli_rect.width - overflow_size; overflow_rect.y = 0; @@ -1978,10 +2138,10 @@ void wxAuiToolBar::DoIdleUpdate() { wxAuiToolBarItem& item = m_items.Item(i); - if (item.id == -1) + if (item.toolid == -1) continue; - wxUpdateUIEvent evt(item.id); + wxUpdateUIEvent evt(item.toolid); evt.SetEventObject(this); if (handler->ProcessEvent(evt)) @@ -1991,7 +2151,7 @@ void wxAuiToolBar::DoIdleUpdate() bool is_enabled; if (item.window) is_enabled = item.window->IsEnabled(); - else + else is_enabled = (item.state & wxAUI_BUTTON_STATE_DISABLED) ? false : true; bool new_enabled = evt.GetEnabled(); @@ -2001,11 +2161,11 @@ void wxAuiToolBar::DoIdleUpdate() { item.window->Enable(new_enabled); } - else + else { if (new_enabled) item.state &= ~wxAUI_BUTTON_STATE_DISABLED; - else + else item.state |= wxAUI_BUTTON_STATE_DISABLED; } need_refresh = true; @@ -2025,7 +2185,7 @@ void wxAuiToolBar::DoIdleUpdate() { if (new_checked) item.state |= wxAUI_BUTTON_STATE_CHECKED; - else + else item.state &= ~wxAUI_BUTTON_STATE_CHECKED; need_refresh = true; @@ -2048,11 +2208,6 @@ void wxAuiToolBar::OnSize(wxSizeEvent& WXUNUSED(evt)) int x, y; GetClientSize(&x, &y); - if (x > y) - SetOrientation(wxHORIZONTAL); - else - SetOrientation(wxVERTICAL); - if (((x >= y) && m_absolute_min_size.x > x) || ((y > x) && m_absolute_min_size.y > y)) { @@ -2068,7 +2223,7 @@ void wxAuiToolBar::OnSize(wxSizeEvent& WXUNUSED(evt)) } } } - else + else { // show all flexible items size_t i, count; @@ -2087,6 +2242,11 @@ void wxAuiToolBar::OnSize(wxSizeEvent& WXUNUSED(evt)) Refresh(false); Update(); + + // idle events aren't sent while user is resizing frame (why?), + // but resizing toolbar here causes havoc, + // so force idle handler to run after size handling complete + QueueEvent(new wxIdleEvent); } @@ -2109,19 +2269,87 @@ void wxAuiToolBar::DoSetSize(int x, void wxAuiToolBar::OnIdle(wxIdleEvent& evt) { + // if orientation doesn't match dock, fix it + wxAuiManager* manager = wxAuiManager::GetManager(this); + if (manager) + { + wxAuiPaneInfo& pane = manager->GetPane(this); + // pane state member is public, so it might have been changed + // without going through wxPaneInfo::SetFlag() check + bool ok = pane.IsOk(); + wxCHECK2_MSG(!ok || IsPaneValid(m_style, pane), ok = false, + "window settings and pane settings are incompatible"); + if (ok) + { + wxOrientation newOrientation = m_orientation; + if (pane.IsDocked()) + { + switch (pane.dock_direction) + { + case wxAUI_DOCK_TOP: + case wxAUI_DOCK_BOTTOM: + newOrientation = wxHORIZONTAL; + break; + case wxAUI_DOCK_LEFT: + case wxAUI_DOCK_RIGHT: + newOrientation = wxVERTICAL; + break; + default: + wxFAIL_MSG("invalid dock location value"); + } + } + else if (pane.IsResizable() && + GetOrientation(m_style) == wxBOTH) + { + // changing orientation in OnSize causes havoc + int x, y; + GetClientSize(&x, &y); + + if (x > y) + { + newOrientation = wxHORIZONTAL; + } + else + { + newOrientation = wxVERTICAL; + } + } + if (newOrientation != m_orientation) + { + SetOrientation(newOrientation); + Realize(); + if (newOrientation == wxHORIZONTAL) + { + pane.best_size = GetHintSize(wxAUI_DOCK_TOP); + } + else + { + pane.best_size = GetHintSize(wxAUI_DOCK_LEFT); + } + if (pane.IsDocked()) + { + pane.floating_size = wxDefaultSize; + } + else + { + SetSize(GetParent()->GetClientSize()); + } + manager->Update(); + } + } + } + DoIdleUpdate(); evt.Skip(); } void wxAuiToolBar::OnPaint(wxPaintEvent& WXUNUSED(evt)) { - wxBufferedPaintDC dc(this); + wxAutoBufferedPaintDC dc(this); wxRect cli_rect(wxPoint(0,0), GetClientSize()); - bool horizontal = true; - if (m_style & wxAUI_TB_VERTICAL) - horizontal = false; + bool horizontal = m_orientation == wxHORIZONTAL; m_art->DrawBackground(dc, this, cli_rect); @@ -2135,7 +2363,7 @@ void wxAuiToolBar::OnPaint(wxPaintEvent& WXUNUSED(evt)) wxRect gripper_rect = m_gripper_sizer_item->GetRect(); if (horizontal) gripper_rect.width = gripper_size; - else + else gripper_rect.height = gripper_size; m_art->DrawGripper(dc, this, gripper_rect); } @@ -2144,7 +2372,7 @@ void wxAuiToolBar::OnPaint(wxPaintEvent& WXUNUSED(evt)) int last_extent; if (horizontal) last_extent = cli_rect.width; - else + else last_extent = cli_rect.height; if (m_overflow_visible) last_extent -= dropdown_size; @@ -2172,25 +2400,33 @@ void wxAuiToolBar::OnPaint(wxPaintEvent& WXUNUSED(evt)) // draw a separator m_art->DrawSeparator(dc, this, item_rect); } - else if (item.kind == wxITEM_LABEL) + else if (item.kind == wxITEM_LABEL) { // draw a text label only m_art->DrawLabel(dc, this, item, item_rect); } - else if (item.kind == wxITEM_NORMAL) + else if (item.kind == wxITEM_NORMAL) { // draw a regular button or dropdown button if (!item.dropdown) m_art->DrawButton(dc, this, item, item_rect); - else + else + m_art->DrawDropDownButton(dc, this, item, item_rect); + } + else if (item.kind == wxITEM_CHECK) + { + // draw either a regular or dropdown toggle button + if (!item.dropdown) + m_art->DrawButton(dc, this, item, item_rect); + else m_art->DrawDropDownButton(dc, this, item, item_rect); } - else if (item.kind == wxITEM_CHECK) + else if (item.kind == wxITEM_RADIO) { // draw a toggle button m_art->DrawButton(dc, this, item, item_rect); } - else if (item.kind == wxITEM_CONTROL) + else if (item.kind == wxITEM_CONTROL) { // draw the control's label m_art->DrawControlLabel(dc, this, item, item_rect); @@ -2248,13 +2484,13 @@ void wxAuiToolBar::OnLeftDown(wxMouseEvent& evt) e.SetEventObject(this); e.SetToolId(-1); e.SetClickPoint(wxPoint(evt.GetX(), evt.GetY())); - bool processed = ProcessEvent(e); + bool processed = GetEventHandler()->ProcessEvent(e); if (processed) { DoIdleUpdate(); } - else + else { size_t i, count; wxAuiToolBarItemArray overflow_items; @@ -2285,7 +2521,7 @@ void wxAuiToolBar::OnLeftDown(wxMouseEvent& evt) { wxCommandEvent e(wxEVT_COMMAND_MENU_SELECTED, res); e.SetEventObject(this); - GetParent()->ProcessEvent(e); + GetParent()->GetEventHandler()->ProcessEvent(e); } } @@ -2306,33 +2542,45 @@ void wxAuiToolBar::OnLeftDown(wxMouseEvent& evt) return; } - SetPressedItem(m_action_item); + UnsetToolTip(); // fire the tool dropdown event - wxAuiToolBarEvent e(wxEVT_COMMAND_AUITOOLBAR_TOOL_DROPDOWN, m_action_item->id); + wxAuiToolBarEvent e(wxEVT_COMMAND_AUITOOLBAR_TOOL_DROPDOWN, m_action_item->toolid); e.SetEventObject(this); - e.SetToolId(m_action_item->id); - e.SetDropDownClicked(false); + e.SetToolId(m_action_item->toolid); int mouse_x = evt.GetX(); wxRect rect = m_action_item->sizer_item->GetRect(); + const bool dropDownHit = m_action_item->dropdown && + mouse_x >= (rect.x+rect.width-BUTTON_DROPDOWN_WIDTH-1) && + mouse_x < (rect.x+rect.width); + e.SetDropDownClicked(dropDownHit); + + e.SetClickPoint(evt.GetPosition()); + e.SetItemRect(rect); - if (m_action_item->dropdown && - mouse_x >= (rect.x+rect.width-BUTTON_DROPDOWN_WIDTH-1) && - mouse_x < (rect.x+rect.width)) + // we only set the 'pressed button' state if we hit the actual button + // and not just the drop-down + SetPressedItem(dropDownHit ? 0 : m_action_item); + + if(dropDownHit) { - e.SetDropDownClicked(true); + m_action_pos = wxPoint(-1,-1); + m_action_item = NULL; } - e.SetClickPoint(evt.GetPosition()); - e.SetItemRect(rect); - ProcessEvent(e); + if(!GetEventHandler()->ProcessEvent(e) || e.GetSkipped()) + CaptureMouse(); + DoIdleUpdate(); } } void wxAuiToolBar::OnLeftUp(wxMouseEvent& evt) { + if (!HasCapture()) + return; + SetPressedItem(NULL); wxAuiToolBarItem* hit_item = FindToolByPosition(evt.GetX(), evt.GetY()); @@ -2341,54 +2589,53 @@ void wxAuiToolBar::OnLeftUp(wxMouseEvent& evt) SetHoverItem(hit_item); } - if (m_dragging) { - // reset drag and drop member variables - m_dragging = false; - m_action_pos = wxPoint(-1,-1); - m_action_item = NULL; - return; + // TODO: it would make sense to send out an 'END_DRAG' event here, + // otherwise a client would never know what to do with the 'BEGIN_DRAG' + // event + + // OnCaptureLost() will be called now and this will reset all our state + // tracking variables + ReleaseMouse(); } - else + else { wxAuiToolBarItem* hit_item; hit_item = FindToolByPosition(evt.GetX(), evt.GetY()); if (m_action_item && hit_item == m_action_item) { - SetToolTip(NULL); + UnsetToolTip(); + + wxCommandEvent e(wxEVT_COMMAND_MENU_SELECTED, m_action_item->toolid); + e.SetEventObject(this); - if (hit_item->kind == wxITEM_CHECK) + if (hit_item->kind == wxITEM_CHECK || hit_item->kind == wxITEM_RADIO) { - bool toggle = false; + const bool toggle = !(m_action_item->state & wxAUI_BUTTON_STATE_CHECKED); - if (m_action_item->state & wxAUI_BUTTON_STATE_CHECKED) - toggle = false; - else - toggle = true; + ToggleTool(m_action_item->toolid, toggle); - ToggleTool(m_action_item->id, toggle); + // repaint immediately + Refresh(false); + Update(); - wxCommandEvent e(wxEVT_COMMAND_MENU_SELECTED, m_action_item->id); - e.SetEventObject(this); - ProcessEvent(e); - DoIdleUpdate(); - } - else - { - wxCommandEvent e(wxEVT_COMMAND_MENU_SELECTED, m_action_item->id); - e.SetEventObject(this); - ProcessEvent(e); - DoIdleUpdate(); + e.SetInt(toggle); } + + // we have to release the mouse *before* sending the event, because + // we don't know what a handler might do. It could open up a popup + // menu for example and that would make us lose our capture anyway. + + ReleaseMouse(); + + GetEventHandler()->ProcessEvent(e); + DoIdleUpdate(); } + else + ReleaseMouse(); } - - // reset drag and drop member variables - m_dragging = false; - m_action_pos = wxPoint(-1,-1); - m_action_item = NULL; } void wxAuiToolBar::OnRightDown(wxMouseEvent& evt) @@ -2418,15 +2665,14 @@ void wxAuiToolBar::OnRightDown(wxMouseEvent& evt) m_action_pos = wxPoint(evt.GetX(), evt.GetY()); m_action_item = FindToolByPosition(evt.GetX(), evt.GetY()); - if (m_action_item) + if (m_action_item && m_action_item->state & wxAUI_BUTTON_STATE_DISABLED) { - if (m_action_item->state & wxAUI_BUTTON_STATE_DISABLED) - { - m_action_pos = wxPoint(-1,-1); - m_action_item = NULL; - return; - } + m_action_pos = wxPoint(-1,-1); + m_action_item = NULL; + return; } + + UnsetToolTip(); } void wxAuiToolBar::OnRightUp(wxMouseEvent& evt) @@ -2438,22 +2684,22 @@ void wxAuiToolBar::OnRightUp(wxMouseEvent& evt) { if (hit_item->kind == wxITEM_NORMAL) { - wxAuiToolBarEvent e(wxEVT_COMMAND_AUITOOLBAR_RIGHT_CLICK, m_action_item->id); + wxAuiToolBarEvent e(wxEVT_COMMAND_AUITOOLBAR_RIGHT_CLICK, m_action_item->toolid); e.SetEventObject(this); - e.SetToolId(m_action_item->id); + e.SetToolId(m_action_item->toolid); e.SetClickPoint(m_action_pos); - ProcessEvent(e); + GetEventHandler()->ProcessEvent(e); DoIdleUpdate(); } } - else + else { // right-clicked on the invalid area of the toolbar wxAuiToolBarEvent e(wxEVT_COMMAND_AUITOOLBAR_RIGHT_CLICK, -1); e.SetEventObject(this); e.SetToolId(-1); e.SetClickPoint(m_action_pos); - ProcessEvent(e); + GetEventHandler()->ProcessEvent(e); DoIdleUpdate(); } @@ -2498,6 +2744,8 @@ void wxAuiToolBar::OnMiddleDown(wxMouseEvent& evt) return; } } + + UnsetToolTip(); } void wxAuiToolBar::OnMiddleUp(wxMouseEvent& evt) @@ -2509,11 +2757,11 @@ void wxAuiToolBar::OnMiddleUp(wxMouseEvent& evt) { if (hit_item->kind == wxITEM_NORMAL) { - wxAuiToolBarEvent e(wxEVT_COMMAND_AUITOOLBAR_MIDDLE_CLICK, m_action_item->id); + wxAuiToolBarEvent e(wxEVT_COMMAND_AUITOOLBAR_MIDDLE_CLICK, m_action_item->toolid); e.SetEventObject(this); - e.SetToolId(m_action_item->id); + e.SetToolId(m_action_item->toolid); e.SetClickPoint(m_action_pos); - ProcessEvent(e); + GetEventHandler()->ProcessEvent(e); DoIdleUpdate(); } } @@ -2525,82 +2773,104 @@ void wxAuiToolBar::OnMiddleUp(wxMouseEvent& evt) void wxAuiToolBar::OnMotion(wxMouseEvent& evt) { + const bool button_pressed = HasCapture(); + // start a drag event - if (!m_dragging && - m_action_item != NULL && - m_action_pos != wxPoint(-1,-1) && - abs(evt.m_x - m_action_pos.x) + abs(evt.m_y - m_action_pos.y) > 5) + if (!m_dragging && button_pressed && + abs(evt.GetX() - m_action_pos.x) + abs(evt.GetY() - m_action_pos.y) > 5) { - SetToolTip(NULL); - - m_dragging = true; - + // TODO: sending this event only makes sense if there is an 'END_DRAG' + // event sent sometime in the future (see OnLeftUp()) wxAuiToolBarEvent e(wxEVT_COMMAND_AUITOOLBAR_BEGIN_DRAG, GetId()); e.SetEventObject(this); - e.SetToolId(m_action_item->id); - ProcessEvent(e); + e.SetToolId(m_action_item->toolid); + m_dragging = GetEventHandler()->ProcessEvent(e) && !e.GetSkipped(); + DoIdleUpdate(); - return; } + if(m_dragging) + return; + wxAuiToolBarItem* hit_item = FindToolByPosition(evt.GetX(), evt.GetY()); - if (hit_item) + if(button_pressed) { - if (!(hit_item->state & wxAUI_BUTTON_STATE_DISABLED)) - SetHoverItem(hit_item); - else - SetHoverItem(NULL); + // if we have a button pressed we want it to be shown in 'depressed' + // state unless we move the mouse outside the button, then we want it + // to show as just 'highlighted' + if (hit_item == m_action_item) + SetPressedItem(m_action_item); + else + { + SetPressedItem(NULL); + SetHoverItem(m_action_item); + } } - else + else { - // no hit item, remove any hit item - SetHoverItem(hit_item); - } + if (hit_item && (hit_item->state & wxAUI_BUTTON_STATE_DISABLED)) + SetHoverItem(NULL); + else + SetHoverItem(hit_item); - // figure out tooltips - wxAuiToolBarItem* packing_hit_item; - packing_hit_item = FindToolByPositionWithPacking(evt.GetX(), evt.GetY()); - if (packing_hit_item) - { - if (packing_hit_item != m_tip_item) + // tooltips handling + wxAuiToolBarItem* packing_hit_item; + packing_hit_item = FindToolByPositionWithPacking(evt.GetX(), evt.GetY()); + if (packing_hit_item) { - m_tip_item = packing_hit_item; + if (packing_hit_item != m_tip_item) + { + m_tip_item = packing_hit_item; - if (packing_hit_item->short_help.Length() > 0) - SetToolTip(packing_hit_item->short_help); - else - SetToolTip(NULL); + if ( !packing_hit_item->short_help.empty() ) + SetToolTip(packing_hit_item->short_help); + else + UnsetToolTip(); + } + } + else + { + UnsetToolTip(); + m_tip_item = NULL; } - } - else - { - SetToolTip(NULL); - m_tip_item = NULL; - } - // if we've pressed down an item and we're hovering - // over it, make sure it's state is set to pressed - if (m_action_item) - { - if (m_action_item == hit_item) - SetPressedItem(m_action_item); - else - SetPressedItem(NULL); + // figure out the dropdown button state (are we hovering or pressing it?) + RefreshOverflowState(); } - - // figure out the dropdown button state (are we hovering or pressing it?) - RefreshOverflowState(); } -void wxAuiToolBar::OnLeaveWindow(wxMouseEvent& WXUNUSED(evt)) +void wxAuiToolBar::DoResetMouseState() { RefreshOverflowState(); SetHoverItem(NULL); SetPressedItem(NULL); m_tip_item = NULL; + + // we have to reset those here, because the mouse-up handlers which do + // it usually won't be called if we let go of a mouse button while we + // are outside of the window + m_action_pos = wxPoint(-1,-1); + m_action_item = NULL; } +void wxAuiToolBar::OnLeaveWindow(wxMouseEvent& evt) +{ + if(HasCapture()) + { + evt.Skip(); + return; + } + + DoResetMouseState(); +} + +void wxAuiToolBar::OnCaptureLost(wxMouseCaptureLostEvent& WXUNUSED(evt)) +{ + m_dragging = false; + + DoResetMouseState(); +} void wxAuiToolBar::OnSetCursor(wxSetCursorEvent& evt) {