gtk3: get the right height for Edit boxes

smuggle the text height down to the native region calculation code instead of
messing around with proxies

Change-Id: I727ceddb5b431be82e6e5a725f9bca588e5b2046

1 files changed, 10 insertions, 3 deletions

diff --git a/vcl/source/outdev/nativecontrols.cxx b/vcl/source/outdev/nativecontrols.cxx
index bfb0447a1953..7a8e70ffc1b3 100644
--- a/vcl/source/outdev/nativecontrols.cxx
+++ b/vcl/source/outdev/nativecontrols.cxx
@@ -247,9 +247,6 @@ static std::shared_ptr< ImplControlValue > TransformControlValue( const ImplCont
             aResult.reset( pNew );
         }
         break;
-    case CTRL_GENERIC:
-            aResult.reset( new ImplControlValue( rVal ) );
-            break;
     case CTRL_MENU_POPUP:
         {
             const MenupopupValue* pMVal = static_cast<const MenupopupValue*>(&rVal);
@@ -258,6 +255,16 @@ static std::shared_ptr< ImplControlValue > TransformControlValue( const ImplCont
             aResult.reset( pNew );
         }
         break;
+    case CTRL_EDITBOX:
+        {
+            auto nTextHeight = rDev.ImplLogicToDevicePixel(Rectangle(0, 0, 0, rVal.getNumericVal())).GetHeight();
+            EditBoxValue* pNew = new EditBoxValue(nTextHeight);
+            aResult.reset(pNew);
+        }
+        break;
+    case CTRL_GENERIC:
+        aResult.reset( new ImplControlValue( rVal ) );
+        break;
     default:
         OSL_FAIL( "unknown ImplControlValue type !" );
         break;