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

Ensure that wxComboCtrl is aligned with other controls under OS X

Browse Source 
Positioning wxComboCtrl and wxTextCtrl or wxComboBox in the same column should
align their left borders, but it didn't because of an extra offset for the
focus ring used for wxComboCtrl only.

We need to either apply this offset to all controls or none of them, so remove
it from this one.

Closes #15017.
This commit is contained in:
John Roberts
2016-02-23 01:21:49 +01:00
committed by Vadim Zeitlin
parent fb5ff50eda
commit 505f1fb3a8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/combocmn.cpp
View File

@@ -1279,9 +1279,9 @@ void wxComboCtrlBase::CalculateAreas( int btnWidth )
m_btnArea.width = butAreaWid;
m_btnArea.height = sz.y - ((btnBorder+FOCUS_RING)*2);
m_tcArea.x = ( m_btnSide==wxRIGHT ? 0 : butAreaWid ) + customBorder + FOCUS_RING;
m_tcArea.x = ( m_btnSide==wxRIGHT ? 0 : butAreaWid ) + customBorder;
m_tcArea.y = customBorder + FOCUS_RING;
m_tcArea.width = sz.x - butAreaWid - (customBorder*2) - (FOCUS_RING*2);
m_tcArea.width = sz.x - butAreaWid - (customBorder*2) - FOCUS_RING;
m_tcArea.height = sz.y - ((customBorder+FOCUS_RING)*2);
/*