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

Fix clicking on drop down button in wxAuiToolBar on wxMSW

Browse Source 
The code handling the mouse events assumed the drop down button with was
10px, but wxAuiMSWToolBarArt uses a different width (14px). So clicking
on the left-most 4 pixels was not registered as a drop down click.

Allow the get (and set) the width of the drop down button of the
ToolBarArt.

Increase the detection area for drop down events, because the drop down
button is drawn 1 pixel larger than the actual size.

Rename some variables where dropdown was used instead of overflow.

Closes https://github.com/wxWidgets/wxWidgets/pull/939
This commit is contained in:
Maarten Bent
2018-09-20 13:51:54 +02:00
committed by Vadim Zeitlin
parent 8a2dd7f18e
commit 7a8e314736
5 changed files with 41 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/aui/auibar.h
View File

@@ -48,7 +48,8 @@ enum wxAuiToolBarArtSetting
{ {
wxAUI_TBART_SEPARATOR_SIZE = 0, wxAUI_TBART_SEPARATOR_SIZE = 0,
wxAUI_TBART_GRIPPER_SIZE = 1, wxAUI_TBART_GRIPPER_SIZE = 1,
wxAUI_TBART_OVERFLOW_SIZE = 2 wxAUI_TBART_OVERFLOW_SIZE = 2,
wxAUI_TBART_DROPDOWN_SIZE = 3
}; };
enum wxAuiToolBarToolTextOrientation enum wxAuiToolBarToolTextOrientation
@@ -447,6 +448,7 @@ protected:
int m_separatorSize; int m_separatorSize;
int m_gripperSize; int m_gripperSize;
int m_overflowSize; int m_overflowSize;
int m_dropdownSize;
}; };

7
interface/wx/aui/auibar.h
View File

@@ -104,6 +104,13 @@ enum wxAuiToolBarArtSetting
*/ */
wxAUI_TBART_OVERFLOW_SIZE = 2 wxAUI_TBART_OVERFLOW_SIZE = 2
/**
Drop down button size in wxAuiToolBar.
@since 3.1.2
*/
wxAUI_TBART_DROPDOWN_SIZE = 3
}; };
/** /**

42
src/aui/auibar.cpp
View File

@@ -62,8 +62,6 @@ enum
wxITEM_SPACER wxITEM_SPACER
}; };
const int BUTTON_DROPDOWN_WIDTH = 10;
wxBitmap wxAuiBitmapFromBits(const unsigned char bits[], int w, int h, wxBitmap wxAuiBitmapFromBits(const unsigned char bits[], int w, int h,
const wxColour& color); const wxColour& color);
@@ -135,6 +133,7 @@ wxAuiGenericToolBarArt::wxAuiGenericToolBarArt()
m_separatorSize = wxWindow::FromDIP( 7, NULL); m_separatorSize = wxWindow::FromDIP( 7, NULL);
m_gripperSize = wxWindow::FromDIP( 7, NULL); m_gripperSize = wxWindow::FromDIP( 7, NULL);
m_overflowSize = wxWindow::FromDIP(16, NULL); m_overflowSize = wxWindow::FromDIP(16, NULL);
m_dropdownSize = wxWindow::FromDIP(10, NULL);
wxColor darker1Colour = m_baseColour.ChangeLightness(85); wxColor darker1Colour = m_baseColour.ChangeLightness(85);
wxColor darker2Colour = m_baseColour.ChangeLightness(75); wxColor darker2Colour = m_baseColour.ChangeLightness(75);
@@ -145,7 +144,7 @@ wxAuiGenericToolBarArt::wxAuiGenericToolBarArt()
int pen_width = wxWindow::FromDIP(1, NULL); int pen_width = wxWindow::FromDIP(1, NULL);
m_gripperPen1 = wxPen(darker5Colour, pen_width); m_gripperPen1 = wxPen(darker5Colour, pen_width);
m_gripperPen2 = wxPen(darker3Colour, pen_width); m_gripperPen2 = wxPen(darker3Colour, pen_width);
m_gripperPen3 = wxPen(*wxStockGDI::GetColour(wxStockGDI::COLOUR_WHITE), pen_width); m_gripperPen3 = wxPen(*wxWHITE, pen_width);
// TODO: Provide x1.5 and x2.0 versions or migrate to SVG. // TODO: Provide x1.5 and x2.0 versions or migrate to SVG.
static const unsigned char buttonDropdownBits[] = { 0xe0, 0xf1, 0xfb }; static const unsigned char buttonDropdownBits[] = { 0xe0, 0xf1, 0xfb };
@@ -389,17 +388,17 @@ void wxAuiGenericToolBarArt::DrawDropDownButton(
const wxAuiToolBarItem& item, const wxAuiToolBarItem& item,
const wxRect& rect) const wxRect& rect)
{ {
wxSize dropdownSize = wnd->FromDIP(wxSize(BUTTON_DROPDOWN_WIDTH, 0)); int dropdownWidth = wnd->FromDIP(GetElementSize(wxAUI_TBART_DROPDOWN_SIZE));
int textWidth = 0, textHeight = 0, textX = 0, textY = 0; int textWidth = 0, textHeight = 0, textX = 0, textY = 0;
int bmpX = 0, bmpY = 0, dropBmpX = 0, dropBmpY = 0; int bmpX = 0, bmpY = 0, dropBmpX = 0, dropBmpY = 0;
wxRect buttonRect = wxRect(rect.x, wxRect buttonRect = wxRect(rect.x,
rect.y, rect.y,
rect.width-dropdownSize.x, rect.width-dropdownWidth,
rect.height); rect.height);
wxRect dropDownRect = wxRect(rect.x+rect.width-dropdownSize.x-1, wxRect dropDownRect = wxRect(rect.x+rect.width-dropdownWidth-1,
rect.y, rect.y,
dropdownSize.x+1, dropdownWidth+1,
rect.height); rect.height);
if (m_flags & wxAUI_TB_TEXT) if (m_flags & wxAUI_TB_TEXT)
@@ -632,10 +631,11 @@ wxSize wxAuiGenericToolBarArt::GetToolSize(
} }
// if the tool has a dropdown button, add it to the width // if the tool has a dropdown button, add it to the width
// and add some extra space in front of the drop down button
if (item.HasDropDown()) if (item.HasDropDown())
{ {
wxSize dropdownSize = wnd->FromDIP(wxSize(BUTTON_DROPDOWN_WIDTH, 0)); int dropdownWidth = wnd->FromDIP(GetElementSize(wxAUI_TBART_DROPDOWN_SIZE));
width += dropdownSize.x + wnd->FromDIP(4); width += dropdownWidth + wnd->FromDIP(4);
} }
return wxSize(width, height); return wxSize(width, height);
@@ -753,6 +753,7 @@ int wxAuiGenericToolBarArt::GetElementSize(int element_id)
case wxAUI_TBART_SEPARATOR_SIZE: return m_separatorSize; case wxAUI_TBART_SEPARATOR_SIZE: return m_separatorSize;
case wxAUI_TBART_GRIPPER_SIZE: return m_gripperSize; case wxAUI_TBART_GRIPPER_SIZE: return m_gripperSize;
case wxAUI_TBART_OVERFLOW_SIZE: return m_overflowSize; case wxAUI_TBART_OVERFLOW_SIZE: return m_overflowSize;
case wxAUI_TBART_DROPDOWN_SIZE: return m_dropdownSize;
default: return 0; default: return 0;
} }
} }
@@ -764,6 +765,7 @@ void wxAuiGenericToolBarArt::SetElementSize(int element_id, int size)
case wxAUI_TBART_SEPARATOR_SIZE: m_separatorSize = size; break; case wxAUI_TBART_SEPARATOR_SIZE: m_separatorSize = size; break;
case wxAUI_TBART_GRIPPER_SIZE: m_gripperSize = size; break; case wxAUI_TBART_GRIPPER_SIZE: m_gripperSize = size; break;
case wxAUI_TBART_OVERFLOW_SIZE: m_overflowSize = size; break; case wxAUI_TBART_OVERFLOW_SIZE: m_overflowSize = size; break;
case wxAUI_TBART_DROPDOWN_SIZE: m_dropdownSize = size; break;
} }
} }
@@ -2439,7 +2441,7 @@ void wxAuiToolBar::OnPaint(wxPaintEvent& WXUNUSED(evt))
m_art->DrawBackground(dc, this, cli_rect); m_art->DrawBackground(dc, this, cli_rect);
int gripperSize = m_art->GetElementSize(wxAUI_TBART_GRIPPER_SIZE); int gripperSize = m_art->GetElementSize(wxAUI_TBART_GRIPPER_SIZE);
int dropdown_size = m_art->GetElementSize(wxAUI_TBART_OVERFLOW_SIZE); int overflowSize = m_art->GetElementSize(wxAUI_TBART_OVERFLOW_SIZE);
// paint the gripper // paint the gripper
if (gripperSize > 0 && m_gripperSizerItem) if (gripperSize > 0 && m_gripperSizerItem)
@@ -2459,7 +2461,7 @@ void wxAuiToolBar::OnPaint(wxPaintEvent& WXUNUSED(evt))
else else
last_extent = cli_rect.height; last_extent = cli_rect.height;
if (m_overflowVisible) if (m_overflowVisible)
last_extent -= dropdown_size; last_extent -= overflowSize;
// paint each individual tool // paint each individual tool
size_t i, count = m_items.GetCount(); size_t i, count = m_items.GetCount();
@@ -2516,7 +2518,7 @@ void wxAuiToolBar::OnPaint(wxPaintEvent& WXUNUSED(evt))
} }
// paint the overflow button // paint the overflow button
if (dropdown_size > 0 && m_overflowSizerItem && m_overflowVisible) if (overflowSize > 0 && m_overflowSizerItem && m_overflowVisible)
{ {
wxRect dropDownRect = GetOverflowRect(); wxRect dropDownRect = GetOverflowRect();
m_art->DrawOverflowButton(dc, this, dropDownRect, m_overflowState); m_art->DrawOverflowButton(dc, this, dropDownRect, m_overflowState);
@@ -2628,9 +2630,9 @@ void wxAuiToolBar::OnLeftDown(wxMouseEvent& evt)
int mouse_x = evt.GetX(); int mouse_x = evt.GetX();
wxRect rect = m_actionItem->m_sizerItem->GetRect(); wxRect rect = m_actionItem->m_sizerItem->GetRect();
wxSize dropdownSize = FromDIP(wxSize(BUTTON_DROPDOWN_WIDTH, 0)); int dropdownWidth = FromDIP(m_art->GetElementSize(wxAUI_TBART_DROPDOWN_SIZE));
const bool dropDownHit = m_actionItem->m_dropDown && const bool dropDownHit = m_actionItem->m_dropDown &&
mouse_x > (rect.x+rect.width-dropdownSize.x) && mouse_x >= (rect.x+rect.width-dropdownWidth) &&
mouse_x < (rect.x+rect.width); mouse_x < (rect.x+rect.width);
e.SetDropDownClicked(dropDownHit); e.SetDropDownClicked(dropDownHit);
@@ -2738,9 +2740,9 @@ void wxAuiToolBar::OnRightDown(wxMouseEvent& evt)
if (m_overflowSizerItem && m_art) if (m_overflowSizerItem && m_art)
{ {
int dropdown_size = m_art->GetElementSize(wxAUI_TBART_OVERFLOW_SIZE); int overflowSize = m_art->GetElementSize(wxAUI_TBART_OVERFLOW_SIZE);
if (dropdown_size > 0 && if (overflowSize > 0 &&
evt.m_x > cli_rect.width - dropdown_size && evt.m_x > cli_rect.width - overflowSize &&
evt.m_y >= 0 && evt.m_y >= 0 &&
evt.m_y < cli_rect.height) evt.m_y < cli_rect.height)
{ {
@@ -2810,9 +2812,9 @@ void wxAuiToolBar::OnMiddleDown(wxMouseEvent& evt)
if (m_overflowSizerItem && m_art) if (m_overflowSizerItem && m_art)
{ {
int dropdown_size = m_art->GetElementSize(wxAUI_TBART_OVERFLOW_SIZE); int overflowSize = m_art->GetElementSize(wxAUI_TBART_OVERFLOW_SIZE);
if (dropdown_size > 0 && if (overflowSize > 0 &&
evt.m_x > cli_rect.width - dropdown_size && evt.m_x > cli_rect.width - overflowSize &&
evt.m_y >= 0 && evt.m_y >= 0 &&
evt.m_y < cli_rect.height) evt.m_y < cli_rect.height)
{ {

14
src/aui/barartmsw.cpp
View File

@@ -54,6 +54,10 @@ wxAuiMSWToolBarArt::wxAuiMSWToolBarArt()
NULL, TS_TRUE, &seperatorSize); NULL, TS_TRUE, &seperatorSize);
m_separatorSize = seperatorSize.cx; m_separatorSize = seperatorSize.cx;
// TP_DROPDOWNBUTTON is only 7px, too small to fit the dropdown arrow,
// use 14px instead.
m_dropdownSize = window->FromDIP(14);
SIZE buttonSize; SIZE buttonSize;
::GetThemePartSize(hThemeToolbar, NULL, TP_BUTTON, 0, ::GetThemePartSize(hThemeToolbar, NULL, TP_BUTTON, 0,
NULL, TS_TRUE, &buttonSize); NULL, TS_TRUE, &buttonSize);
@@ -219,18 +223,16 @@ void wxAuiMSWToolBarArt::DrawDropDownButton(
{ {
wxUxThemeHandle hTheme(wnd, L"Toolbar"); wxUxThemeHandle hTheme(wnd, L"Toolbar");
int dropDownWidth = wnd->FromDIP(14);
int textWidth = 0, textHeight = 0, textX = 0, textY = 0; int textWidth = 0, textHeight = 0, textX = 0, textY = 0;
int bmpX = 0, bmpY = 0; int bmpX = 0, bmpY = 0;
wxRect buttonRect = wxRect(rect.x, wxRect buttonRect = wxRect(rect.x,
rect.y, rect.y,
rect.width - dropDownWidth, rect.width - m_dropdownSize,
rect.height); rect.height);
wxRect dropDownRect = wxRect(rect.x + rect.width - dropDownWidth - 1, wxRect dropDownRect = wxRect(rect.x + rect.width - m_dropdownSize - 1,
rect.y, rect.y,
dropDownWidth + 1, m_dropdownSize + 1,
rect.height); rect.height);
if ( m_flags & wxAUI_TB_TEXT ) if ( m_flags & wxAUI_TB_TEXT )
@@ -444,7 +446,7 @@ wxSize wxAuiMSWToolBarArt::GetToolSize(
wxSize size = wxAuiGenericToolBarArt::GetToolSize(dc, wnd, item); wxSize size = wxAuiGenericToolBarArt::GetToolSize(dc, wnd, item);
size.IncBy(wnd->FromDIP(wxSize(3, 3))); // Add some padding for native theme size.IncBy(wnd->FromDIP(3)); // Add some padding for native theme
return size; return size;
} }

2
src/aui/dockart.cpp
View File

@@ -197,7 +197,7 @@ wxAuiDefaultDockArt::wxAuiDefaultDockArt()
int pen_width = wxWindow::FromDIP(1, NULL); int pen_width = wxWindow::FromDIP(1, NULL);
m_gripperPen1 = wxPen(darker5Colour, pen_width); m_gripperPen1 = wxPen(darker5Colour, pen_width);
m_gripperPen2 = wxPen(darker3Colour, pen_width); m_gripperPen2 = wxPen(darker3Colour, pen_width);
m_gripperPen3 = wxPen(*wxStockGDI::GetColour(wxStockGDI::COLOUR_WHITE), pen_width); m_gripperPen3 = wxPen(*wxWHITE, pen_width);
#ifdef __WXMAC__ #ifdef __WXMAC__
m_captionFont = *wxSMALL_FONT; m_captionFont = *wxSMALL_FONT;