i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix alignment in TextControl widgets

Browse Source 
* Fixes #8391
preferences.

Signed-off-by: Adrien Destugues <[email protected]>

* This was visible for example in the "double click text area" in Mouse
This commit is contained in:
Laurent Chea
2014-12-09 08:24:14 +01:00
committed by Adrien Destugues
parent f36b3f9b3e
commit 4cec648e86
1 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/TextInput.cpp
+27 -6
View File
@@ -118,6 +118,7 @@ _BTextInput_::KeyDown(const char* bytes, int32 numBytes)
} }
} }
void void
_BTextInput_::MakeFocus(bool state) _BTextInput_::MakeFocus(bool state)
{ {
@@ -155,8 +156,8 @@ _BTextInput_::MinSize()
{ {
BSize min; BSize min;
min.height = ceilf(LineHeight(0) + 2.0); min.height = ceilf(LineHeight(0) + 2.0);
// we always add at least one pixel vertical inset top/bottom for // we always add at least one pixel vertical inset top/bottom for
// the text rect. // the text rect.
min.width = min.height * 3; min.width = min.height * 3;
return BLayoutUtils::ComposeSize(ExplicitMinSize(), min); return BLayoutUtils::ComposeSize(ExplicitMinSize(), min);
} }
@@ -170,12 +171,32 @@ _BTextInput_::AlignTextRect()
// the text rect to be in the middle, normally this means there // the text rect to be in the middle, normally this means there
// is one pixel spacing on each side // is one pixel spacing on each side
BRect textRect(Bounds()); BRect textRect(Bounds());
textRect.left = 0.0; float vInset = max_c(1,
float vInset = max_c(1, floorf((textRect.Height() - LineHeight(0)) / 2.0)); floorf((textRect.Height() - LineHeight(0)) / 2.0));
float hInset = 2; float hInset = 2;
float textFontWidth = TextRect().right;
if (be_control_look != NULL) if (be_control_look != NULL)
hInset = be_control_look->DefaultLabelSpacing(); {
switch(Alignment())
{
case B_ALIGN_LEFT:
hInset = be_control_look->DefaultLabelSpacing();
break;
case B_ALIGN_RIGHT:
hInset = textRect.right - textFontWidth;
hInset -= be_control_look->DefaultLabelSpacing();
break;
case B_ALIGN_CENTER:
hInset = (textRect.right - textFontWidth)/ 2.0;
break;
default:
break;
}
}
textRect.InsetBy(hInset, vInset); textRect.InsetBy(hInset, vInset);
SetTextRect(textRect); SetTextRect(textRect);