Ticket #2509: ArcTextControl.diff

src/kits/interface/TextControl.cpp

@@ -733 +733 @@
     if (fText == NULL) {
         BRect frame(fDivider, bounds.top,
                     bounds.right, bounds.bottom);
-        // we are stroking the frame around the text view, which
-        // is 2 pixels wide
-        frame.InsetBy(2.0, 3.0);
-        BRect textRect(frame.OffsetToCopy(B_ORIGIN));
 
-        fText = new BPrivate::_BTextInput_(frame, textRect,
+        fText = new BPrivate::_BTextInput_(frame, frame,
             B_FOLLOW_LEFT_RIGHT | B_FOLLOW_TOP,
             B_WILL_DRAW | B_FRAME_EVENTS | navigableFlags);
         AddChild(fText);

src/kits/interface/TextInput.cpp

@@ -156 +156 @@
     // is one pixel spacing on each side
     BRect textRect(Bounds());
     textRect.left = 0.0;
-    float vInset = max_c(1, floorf((textRect.Height() - LineHeight(0)) / 2.0));
+
+    font_height fontHeight;
+    GetFontHeight(&fontHeight);
+
+    float vInset = max_c(1, floorf((textRect.Height() - fontHeight.ascent
+        - fontHeight.descent - fontHeight.leading) / 2.0));
     textRect.InsetBy(2, vInset);
     SetTextRect(textRect);
 }