IK: align BTextView text rect/fix alignment

Preserve passed in text rect in fTextRext (unless in layout)
and create an internal version fAlignedTextRect which is used
in place of fTextRect. fAlignedTextRext is aligned to fit the
text rect bounds and grows to fit. fAlignedTextRect always grows
vertically but only grows horizontally if wrap is off.

Left-aligned text view's grow right, right-aligned ones grow left,
and center center aligned ones grow out.

Set fTextRect to bounds in _DoLayout().

Reduce left and right padding inside text views from full label
spacing to half label spacing. Unify padding between BTextControl
and BTextView.

Fixing padding also fixes right and center-aligned BTextViews.

Undo extra scrolling for non-left text views from hrev24130 fixing
a scrolling left and right with mouse bug when it shouldn't.

Replace max_c and min_c with std::max and std::min respectively.

Remove scrolling from one instance of BTextView::SetText as it
produced undesired results while editing a scrolled text view.

Set text rect in BTextControl::DoLayout() and ScreenSaver
PreviewView::AddPreview().

Don't add padding if BTextView::SetInsets() is called. Set insets
to 0 in Tracker "Edit name" setting which prevents default padding
from being added. This is so that when you rename a file in Tracker
the TextView appears on top of the file name text with no padding.

80 char limit fixes.

Fixes #1651 #12608 #13796 #15189 #15688

Change-Id: I8c6106effc612f49aff374f29742471628b5df86
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3054
Reviewed-by: Adrien Destugues <pulkomandy@gmail.com>

Author: jscipione

3rdparty/mmu_man/irc/Haiku/plugin.py

@@ -136,7 +136,7 @@ def download(self, irc, msg, args):
         to = None
         if len(args) > 0:
             to = args[0]
-        t = "Current release: http://www.haiku-os.org/get-haiku - Nightly builds: http://haiku-files.org/haiku/development/"
+        t = "Current release: http://www.haiku-os.org/get-haiku - Nightly builds: http://download.haiku-os.org"
         irc.reply(t, to = to)
 
     def dl(self, irc, msg, args):

headers/os/interface/TextView.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2009, Haiku, Inc. All rights reserved.
+ * Copyright 2007-2020 Haiku, Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
 #ifndef _TEXTVIEW_H
@@ -416,6 +416,7 @@ class BTextView : public BView {
 			LineBuffer*			fLines;
 			StyleBuffer*		fStyles;
 			BRect				fTextRect;
+			BRect				fAlignedTextRect;
 			int32				fSelStart;
 			int32				fSelEnd;
 			bool				fCaretVisible;
@@ -463,7 +464,7 @@ class BTextView : public BView {
 			bool				fInstalledRemoveCommandWordwiseShortcuts : 1;
 			bool				fInstalledRemoveOptionWordwiseShortcuts : 1;
 
-			uint32				_reserved[6];
+			uint32				_reserved[2];
 };
 
 #endif	// _TEXTVIEW_H

src/kits/interface/TextControl.cpp

@@ -1,11 +1,12 @@
 /*
- * Copyright 2001-2015, Haiku Inc.
+ * Copyright 2001-2020 Haiku Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
  *		Frans van Nispen (xlr8@tref.nl)
  *		Stephan Aßmus <superstippi@gmx.de>
  *		Ingo Weinhold <bonefish@cs.tu-berlin.de>
+ *		John Scipione <jscipione@gmail.com>
  */
 
 
@@ -637,7 +638,6 @@ void
 BTextControl::SetAlignment(alignment labelAlignment, alignment textAlignment)
 {
 	fText->SetAlignment(textAlignment);
-	fText->AlignTextRect();
 
 	if (fLabelAlign != labelAlignment) {
 		fLabelAlign = labelAlignment;
@@ -911,6 +911,7 @@ BTextControl::DoLayout()
 	// place the text view and set the divider
 	textFrame.InsetBy(kFrameMargin, kFrameMargin);
 	BLayoutUtils::AlignInFrame(fText, textFrame);
+	fText->SetTextRect(textFrame.OffsetToCopy(B_ORIGIN));
 
 	fDivider = divider;
 
@@ -1115,7 +1116,6 @@ BTextControl::_InitText(const char* initialText, const BMessage* archive)
 
 		SetText(initialText);
 		fText->SetAlignment(B_ALIGN_LEFT);
-		fText->AlignTextRect();
 	}
 
 	// Although this is not strictly initializing the text view,
@@ -1171,7 +1171,6 @@ BTextControl::_LayoutTextView()
 	frame.InsetBy(kFrameMargin, kFrameMargin);
 	fText->MoveTo(frame.left, frame.top);
 	fText->ResizeTo(frame.Width(), frame.Height());
-	fText->AlignTextRect();
 
 	TRACE("width: %.2f, height: %.2f\n", Frame().Width(), Frame().Height());
 	TRACE("fDivider: %.2f\n", fDivider);

src/kits/interface/TextInput.cpp

@@ -1,10 +1,11 @@
 /*
- * Copyright 2001-2015, Haiku Inc. All rights reserved.
+ * Copyright 2001-2020 Haiku Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
  *		Frans van Nispen (xlr8@tref.nl)
  *		Marc Flerackers (mflerackers@androme.be)
+ *		John Scipione (jscipione@gmail.com)
  */
 
 
@@ -14,7 +15,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <ControlLook.h>
 #include <InterfaceDefs.h>
 #include <LayoutUtils.h>
 #include <Message.h>
@@ -84,8 +84,6 @@ void
 _BTextInput_::FrameResized(float width, float height)
 {
 	BTextView::FrameResized(width, height);
-
-	AlignTextRect();
 }
 
 
@@ -162,42 +160,6 @@ _BTextInput_::MinSize()
 }
 
 
-void
-_BTextInput_::AlignTextRect()
-{
-	// the label font could require the control to be higher than
-	// necessary for the text view, we compensate this by layouting
-	// the text rect to be in the middle, normally this means there
-	// is one pixel spacing on each side
-	BRect textRect(Bounds());
-	float vInset = max_c(1,
-			floorf((textRect.Height() - LineHeight(0)) / 2.0));
-	float hInset = 2;
-	float textFontWidth = TextRect().right;
-
-	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);
-	SetTextRect(textRect);
-}
-
-
 void
 _BTextInput_::SetInitialText()
 {

src/kits/interface/TextInput.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2001-2008, Haiku Inc. All rights reserved.
+ * Copyright 2001-2020 Haiku Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -11,6 +11,7 @@
 #ifndef	_TEXT_CONTROLI_H
 #define	_TEXT_CONTROLI_H
 
+
 #include <TextView.h>
 
 
@@ -36,7 +37,6 @@ virtual	void			MakeFocus(bool focusState = true);
 
 virtual	BSize			MinSize();
 
-		void			AlignTextRect();
 		void			SetInitialText();
 
 virtual	void			Paste(BClipboard *clipboard);