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

Applied patch [ 637982 ] wxComboBox needs margin

Browse Source 
wxComboBox doesn't have a margin between the text and
the dropdown button when the default size is used.
Since wxTextctrl currently returns a rather long minmal
size, this error is only visible if a long text (around
20 chars) is used. This patch introduces a margin
(analog wxSpinctrl).

Otto Wyss


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18120 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-12-08 21:43:43 +00:00
parent 11d667e7eb
commit 1b489359c4
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/univ/combobox.cpp
View File

@@ -55,6 +55,12 @@
3. which passes them to the popup window if it is popped up 3. which passes them to the popup window if it is popped up
*/ */
// constants
// ----------------------------------------------------------------------------
// the margin between the text control and the combo button
static const wxCoord g_comboMargin = 2;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// wxComboButton is just a normal button except that it sends commands to the // wxComboButton is just a normal button except that it sends commands to the
// combobox and not its parent // combobox and not its parent
@@ -294,7 +300,7 @@ wxSize wxComboControl::DoGetBestClientSize() const
wxSize sizeBtn = m_btn->GetBestSize(), wxSize sizeBtn = m_btn->GetBestSize(),
sizeText = m_text->GetBestSize(); sizeText = m_text->GetBestSize();
return wxSize(sizeBtn.x + sizeText.x, wxMax(sizeBtn.y, sizeText.y)); return wxSize(sizeText.x + g_comboMargin + sizeBtn.x, wxMax(sizeBtn.y, sizeText.y));
} }
void wxComboControl::DoMoveWindow(int x, int y, int width, int height) void wxComboControl::DoMoveWindow(int x, int y, int width, int height)