From 31444599394047c521a0a03ba8bd14762c593770 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Mon, 12 Dec 2022 20:45:24 +0000 Subject: [PATCH] Fix issue with text edit boxes being too narrow on wxWidgets 3.2. --- common/widgets/unit_binder.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/common/widgets/unit_binder.cpp b/common/widgets/unit_binder.cpp index d4547aebd0..176ad6e90e 100644 --- a/common/widgets/unit_binder.cpp +++ b/common/widgets/unit_binder.cpp @@ -31,6 +31,7 @@ #include #include "widgets/unit_binder.h" +#include "wx/dcclient.h" wxDEFINE_EVENT( DELAY_FOCUS, wxCommandEvent ); @@ -65,6 +66,13 @@ UNIT_BINDER::UNIT_BINDER( UNITS_PROVIDER* aUnitsProvider, wxWindow* aEventSource if( textEntry ) { + wxClientDC dc( m_valueCtrl ); + wxSize minSize = m_valueCtrl->GetMinSize(); + int minWidth = dc.GetTextExtent( wxT( "XXX.XXXXXXX" ) ).GetWidth(); + + if( minSize.GetWidth() < minWidth ) + m_valueCtrl->SetMinSize( wxSize( minWidth, minSize.GetHeight() ) ); + // Use ChangeValue() instead of SetValue() so we don't generate events. if( m_negativeZero ) textEntry->ChangeValue( wxT( "-0" ) );