From df5f11feeeccf3b8d33266944c0cde8f853b7ae0 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 19 May 2011 14:14:58 +0000
Subject: [PATCH] Make picker control at least as high as the associated text
and square.
Ensure that the height of the picker control is at least as big as the height
of the associated text control and that it's at least as wide as it is high as
it looks bad otherwise.
Closes #13232.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67763 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
src/common/pickerbase.cpp | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/src/common/pickerbase.cpp b/src/common/pickerbase.cpp
index 1d3dbbc30d..81583028ac 100644
--- a/src/common/pickerbase.cpp
+++ b/src/common/pickerbase.cpp
@@ -123,6 +123,16 @@ void wxPickerBase::PostCreation()
// associated with it - in that case it defaults to 0
m_sizer->Add(m_picker, HasTextCtrl() ? 0 : 1, GetDefaultPickerCtrlFlag(), 5);
+ // For aesthetic reasons, make sure the picker is at least as high as the
+ // associated text control and is always at least square.
+ const wxSize pickerBestSize(m_picker->GetBestSize());
+ const wxSize textBestSize(m_text->GetBestSize());
+ wxSize pickerMinSize;
+ pickerMinSize.y = wxMax(pickerBestSize.y, textBestSize.y);
+ pickerMinSize.x = wxMax(pickerMinSize.x, pickerMinSize.y);
+ if ( pickerMinSize != pickerBestSize )
+ m_picker->SetMinSize(pickerMinSize);
+
SetSizer(m_sizer);
SetInitialSize( GetMinSize() );
--
2.49.0