From John Scipione <jscipione@xxxxxxxxx>:
John Scipione has uploaded this change for review. (
https://review.haiku-os.org/c/haiku/+/3153 ;)
Change subject: Revert "IK: align BTextView text rect/fix alignment"
......................................................................
Revert "IK: align BTextView text rect/fix alignment"
This reverts commit a9b301871d06c0ebe42d22b31c685abed5107acd.
---
M 3rdparty/mmu_man/irc/Haiku/plugin.py
M headers/os/interface/TextView.h
M src/kits/interface/TextControl.cpp
M src/kits/interface/TextInput.cpp
M src/kits/interface/TextInput.h
M src/kits/interface/TextView.cpp
M src/kits/tracker/TextWidget.cpp
M src/kits/tracker/infowindow/HeaderView.cpp
M src/preferences/screensaver/PreviewView.cpp
9 files changed, 175 insertions(+), 251 deletions(-)
git pull ssh://git.haiku-os.org:22/haiku refs/changes/53/3153/1
diff --git a/3rdparty/mmu_man/irc/Haiku/plugin.py
b/3rdparty/mmu_man/irc/Haiku/plugin.py
index 246d215..1bdb6cb 100644
--- a/3rdparty/mmu_man/irc/Haiku/plugin.py
+++ b/3rdparty/mmu_man/irc/Haiku/plugin.py
@@ -136,7 +136,7 @@
to = None
if len(args) > 0:
to = args[0]
- t = "Current release: http://www.haiku-os.org/get-haiku - Nightly ;
builds: http://download.haiku-os.org";
+ t = "Current release: http://www.haiku-os.org/get-haiku - Nightly ;
builds: http://haiku-files.org/haiku/development/";
irc.reply(t, to = to)
def dl(self, irc, msg, args):
diff --git a/headers/os/interface/TextView.h b/headers/os/interface/TextView.h
index 6fa7874..b4a684a 100644
--- a/headers/os/interface/TextView.h
+++ b/headers/os/interface/TextView.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2007-2020 Haiku, Inc. All rights reserved.
+ * Copyright 2007-2009, Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*/
#ifndef _TEXTVIEW_H
@@ -416,7 +416,6 @@
LineBuffer* fLines;
StyleBuffer* fStyles;
BRect fTextRect;
- BRect fAlignedTextRect;
int32 fSelStart;
int32 fSelEnd;
bool fCaretVisible;
@@ -464,7 +463,7 @@
bool
fInstalledRemoveCommandWordwiseShortcuts : 1;
bool
fInstalledRemoveOptionWordwiseShortcuts : 1;
- uint32 _reserved[2];
+ uint32 _reserved[6];
};
#endif // _TEXTVIEW_H
diff --git a/src/kits/interface/TextControl.cpp
b/src/kits/interface/TextControl.cpp
index 0eb7c60..a6a8804 100644
--- a/src/kits/interface/TextControl.cpp
+++ b/src/kits/interface/TextControl.cpp
@@ -1,12 +1,11 @@
/*
- * Copyright 2001-2020 Haiku Inc. All rights reserved.
+ * Copyright 2001-2015, Haiku Inc.
* Distributed under the terms of the MIT License.
*
* Authors:
* Frans van Nispen (xlr8@xxxxxxx)
* Stephan Aßmus <superstippi@xxxxxx>
* Ingo Weinhold <bonefish@xxxxxxxxxxxxxxx>
- * John Scipione <jscipione@xxxxxxxxx>
*/
@@ -638,6 +637,7 @@
BTextControl::SetAlignment(alignment labelAlignment, alignment textAlignment)
{
fText->SetAlignment(textAlignment);
+ fText->AlignTextRect();
if (fLabelAlign != labelAlignment) {
fLabelAlign = labelAlignment;
@@ -911,7 +911,6 @@
// place the text view and set the divider
textFrame.InsetBy(kFrameMargin, kFrameMargin);
BLayoutUtils::AlignInFrame(fText, textFrame);
- fText->SetTextRect(textFrame.OffsetToCopy(B_ORIGIN));
fDivider = divider;
@@ -1116,6 +1115,7 @@
SetText(initialText);
fText->SetAlignment(B_ALIGN_LEFT);
+ fText->AlignTextRect();
}
// Although this is not strictly initializing the text view,
@@ -1171,6 +1171,7 @@
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);
diff --git a/src/kits/interface/TextInput.cpp b/src/kits/interface/TextInput.cpp
index dc7380b..d589bf9 100644
--- a/src/kits/interface/TextInput.cpp
+++ b/src/kits/interface/TextInput.cpp
@@ -1,11 +1,10 @@
/*
- * Copyright 2001-2020 Haiku Inc. All rights reserved.
+ * Copyright 2001-2015, Haiku Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
* Frans van Nispen (xlr8@xxxxxxx)
* Marc Flerackers (mflerackers@xxxxxxxxxx)
- * John Scipione (jscipione@xxxxxxxxx)
*/
@@ -15,6 +14,7 @@
#include <stdlib.h>
#include <string.h>
+#include <ControlLook.h>
#include <InterfaceDefs.h>
#include <LayoutUtils.h>
#include <Message.h>
@@ -84,6 +84,8 @@
_BTextInput_::FrameResized(float width, float height)
{
BTextView::FrameResized(width, height);
+
+ AlignTextRect();
}
@@ -161,6 +163,42 @@
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()
{
free(fPreviousText);
diff --git a/src/kits/interface/TextInput.h b/src/kits/interface/TextInput.h
index a90d712..6b1c9a6 100644
--- a/src/kits/interface/TextInput.h
+++ b/src/kits/interface/TextInput.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2020 Haiku Inc. All rights reserved.
+ * Copyright 2001-2008, Haiku Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
@@ -11,7 +11,6 @@
#ifndef _TEXT_CONTROLI_H
#define _TEXT_CONTROLI_H
-
#include <TextView.h>
@@ -37,6 +36,7 @@
virtual BSize MinSize();
+ void AlignTextRect();
void SetInitialText();
virtual void Paste(BClipboard *clipboard);
diff --git a/src/kits/interface/TextView.cpp b/src/kits/interface/TextView.cpp
index 8528af9..5b0b201 100644
--- a/src/kits/interface/TextView.cpp
+++ b/src/kits/interface/TextView.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2020 Haiku, Inc. All rights reserved.
+ * Copyright 2001-2015 Haiku, Inc. All rights reserved.
* Distributed under the terms of the MIT License.
*
* Authors:
@@ -25,7 +25,6 @@
#include <TextView.h>
-#include <algorithm>
#include <new>
#include <stdio.h>
@@ -35,7 +34,6 @@
#include <Beep.h>
#include <Bitmap.h>
#include <Clipboard.h>
-#include <ControlLook.h>
#include <Debug.h>
#include <Entry.h>
#include <Input.h>
@@ -157,17 +155,12 @@
topInset(0),
rightInset(0),
bottomInset(0),
- valid(false),
- overridden(false)
+ valid(false)
{
}
void UpdateInsets(const BRect& bounds, const BRect& textRect)
{
- // do not update insets if SetInsets() was called
- if (overridden)
- return;
-
// we disallow negative insets, as they would cause parts of the
// text to be hidden
leftInset = textRect.left >= bounds.left
@@ -191,8 +184,7 @@
BSize min;
BSize preferred;
- bool valid : 1;
- bool overridden : 1;
+ bool valid;
};
@@ -268,15 +260,7 @@
uint32 resizeMask, uint32 flags)
:
BView(frame, name, resizeMask,
- flags | B_FRAME_EVENTS | B_PULSE_NEEDED | B_INPUT_METHOD_AWARE),
- fText(NULL),
- fLines(NULL),
- fStyles(NULL),
- fDisallowedChars(NULL),
- fUndo(NULL),
- fDragRunner(NULL),
- fClickRunner(NULL),
- fLayoutData(NULL)
+ flags | B_FRAME_EVENTS | B_PULSE_NEEDED | B_INPUT_METHOD_AWARE)
{
_InitObject(textRect, NULL, NULL);
SetViewUIColor(B_DOCUMENT_BACKGROUND_COLOR);
@@ -288,15 +272,7 @@
uint32 resizeMask, uint32 flags)
:
BView(frame, name, resizeMask,
- flags | B_FRAME_EVENTS | B_PULSE_NEEDED | B_INPUT_METHOD_AWARE),
- fText(NULL),
- fLines(NULL),
- fStyles(NULL),
- fDisallowedChars(NULL),
- fUndo(NULL),
- fDragRunner(NULL),
- fClickRunner(NULL),
- fLayoutData(NULL)
+ flags | B_FRAME_EVENTS | B_PULSE_NEEDED | B_INPUT_METHOD_AWARE)
{
_InitObject(textRect, initialFont, initialColor);
SetViewUIColor(B_DOCUMENT_BACKGROUND_COLOR);
@@ -306,15 +282,7 @@
BTextView::BTextView(const char* name, uint32 flags)
:
BView(name,
- flags | B_FRAME_EVENTS | B_PULSE_NEEDED | B_INPUT_METHOD_AWARE),
- fText(NULL),
- fLines(NULL),
- fStyles(NULL),
- fDisallowedChars(NULL),
- fUndo(NULL),
- fDragRunner(NULL),
- fClickRunner(NULL),
- fLayoutData(NULL)
+ flags | B_FRAME_EVENTS | B_PULSE_NEEDED | B_INPUT_METHOD_AWARE)
{
_InitObject(Bounds(), NULL, NULL);
SetViewUIColor(B_DOCUMENT_BACKGROUND_COLOR);
@@ -325,15 +293,7 @@
const rgb_color* initialColor, uint32 flags)
:
BView(name,
- flags | B_FRAME_EVENTS | B_PULSE_NEEDED | B_INPUT_METHOD_AWARE),
- fText(NULL),
- fLines(NULL),
- fStyles(NULL),
- fDisallowedChars(NULL),
- fUndo(NULL),
- fDragRunner(NULL),
- fClickRunner(NULL),
- fLayoutData(NULL)
+ flags | B_FRAME_EVENTS | B_PULSE_NEEDED | B_INPUT_METHOD_AWARE)
{
_InitObject(Bounds(), initialFont, initialColor);
SetViewUIColor(B_DOCUMENT_BACKGROUND_COLOR);
@@ -342,15 +302,7 @@
BTextView::BTextView(BMessage* archive)
:
- BView(archive),
- fText(NULL),
- fLines(NULL),
- fStyles(NULL),
- fDisallowedChars(NULL),
- fUndo(NULL),
- fDragRunner(NULL),
- fClickRunner(NULL),
- fLayoutData(NULL)
+ BView(archive)
{
CALLED();
BRect rect;
@@ -442,8 +394,8 @@
delete fStyles;
delete fDisallowedChars;
delete fUndo;
- delete fDragRunner;
delete fClickRunner;
+ delete fDragRunner;
delete fLayoutData;
}
@@ -1154,6 +1106,7 @@
// recalculate line breaks and draw the text
_Refresh(0, length, false);
fCaretOffset = fSelStart = fSelEnd = 0;
+ ScrollTo(B_ORIGIN);
// draw the caret
_ShowCaret();
@@ -1728,7 +1681,6 @@
int32 lineNum = _LineAt(offset);
if (_IsOnEmptyLastLine(offset))
lineNum++;
-
return lineNum;
}
@@ -1737,7 +1689,7 @@
BTextView::LineAt(BPoint point) const
{
int32 lineNum = _LineAt(point);
- if ((*fLines)[lineNum + 1]->origin <= point.y - fAlignedTextRect.top)
+ if ((*fLines)[lineNum + 1]->origin <= point.y - fTextRect.top)
lineNum++;
return lineNum;
@@ -1760,7 +1712,7 @@
BPoint result;
result.x = 0.0;
- result.y = line->origin + fAlignedTextRect.top;
+ result.y = line->origin + fTextRect.top;
bool onEmptyLastLine = _IsOnEmptyLastLine(offset);
@@ -1786,14 +1738,14 @@
if (fAlignment != B_ALIGN_LEFT) {
float lineWidth = onEmptyLastLine ? 0.0 : LineWidth(lineNum);
- float alignmentOffset = fAlignedTextRect.Width() - lineWidth;
+ float alignmentOffset = fTextRect.Width() - lineWidth;
if (fAlignment == B_ALIGN_CENTER)
- alignmentOffset = floorf(alignmentOffset / 2);
+ alignmentOffset /= 2;
result.x += alignmentOffset;
}
// convert from text rect coordinates
- result.x += fAlignedTextRect.left;
+ result.x += fTextRect.left;
// round up
result.x = lroundf(result.x);
@@ -1811,9 +1763,9 @@
const int32 textLength = fText->Length();
// should we even bother?
- if (point.y >= fAlignedTextRect.bottom)
+ if (point.y >= fTextRect.bottom)
return textLength;
- else if (point.y < fAlignedTextRect.top)
+ else if (point.y < fTextRect.top)
return 0;
int32 lineNum = _LineAt(point);
@@ -1827,22 +1779,21 @@
// lower than the bottom of the last line, return the last offset
// (can happen for newlines)
if (lineNum == (fLines->NumLines() - 1)) {
- if (point.y >= ((line + 1)->origin + fAlignedTextRect.top))
+ if (point.y >= ((line + 1)->origin + fTextRect.top))
return textLength;
}
#endif
// convert to text rect coordinates
if (fAlignment != B_ALIGN_LEFT) {
- float alignmentOffset = fAlignedTextRect.Width()
- - LineWidth(lineNum);
+ float alignmentOffset = fTextRect.Width() - LineWidth(lineNum);
if (fAlignment == B_ALIGN_CENTER)
- alignmentOffset = floorf(alignmentOffset / 2);
+ alignmentOffset /= 2;
point.x -= alignmentOffset;
}
- point.x -= fAlignedTextRect.left;
- point.x = std::max(point.x, 0.0f);
+ point.x -= fTextRect.left;
+ point.x = max_c(point.x, 0.0);
// ToDo: The following code isn't very efficient, because it always
starts
// from the left end, so when the point is near the right end it's very
@@ -2069,7 +2020,6 @@
startOffset = 0;
else if (startOffset > fText->Length())
startOffset = fText->Length();
-
if (endOffset < 0)
endOffset = 0;
else if (endOffset > fText->Length())
@@ -2091,29 +2041,29 @@
if (startPt.y == endPt.y) {
// this is a one-line region
- selRect.left = std::max(startPt.x, fAlignedTextRect.left);
+ selRect.left = max_c(startPt.x, fTextRect.left);
selRect.top = startPt.y;
selRect.right = endPt.x - 1.0;
selRect.bottom = endPt.y + endLineHeight - 1.0;
outRegion->Include(selRect);
} else {
// more than one line in the specified offset range
- selRect.left = std::max(startPt.x, fAlignedTextRect.left);
+ selRect.left = max_c(startPt.x, fTextRect.left);
selRect.top = startPt.y;
- selRect.right = fAlignedTextRect.right;
+ selRect.right = fTextRect.right;
selRect.bottom = startPt.y + startLineHeight - 1.0;
outRegion->Include(selRect);
if (startPt.y + startLineHeight < endPt.y) {
// more than two lines in the range
- selRect.left = fAlignedTextRect.left;
+ selRect.left = fTextRect.left;
selRect.top = startPt.y + startLineHeight;
- selRect.right = fAlignedTextRect.right;
+ selRect.right = fTextRect.right;
selRect.bottom = endPt.y - 1.0;
outRegion->Include(selRect);
}
- selRect.left = fAlignedTextRect.left;
+ selRect.left = fTextRect.left;
selRect.top = endPt.y;
selRect.right = endPt.x - 1.0;
selRect.bottom = endPt.y + endLineHeight - 1.0;
@@ -2132,10 +2082,13 @@
BPoint point = PointAt(offset, &lineHeight);
// horizontal
+ float extraSpace = fAlignment == B_ALIGN_LEFT ?
+ ceilf(bounds.IntegerWidth() / 2) : 0.0;
+
if (point.x < bounds.left)
- xDiff = point.x - bounds.right;
+ xDiff = point.x - bounds.left - extraSpace;
else if (point.x > bounds.right)
- xDiff = point.x - bounds.left;
+ xDiff = point.x - bounds.right + extraSpace;
// vertical
if (point.y < bounds.top)
@@ -2203,9 +2156,6 @@
fLayoutData->UpdateInsets(Bounds().OffsetToCopy(B_ORIGIN), rect);
- fTextRect = rect;
- fAlignedTextRect = fTextRect;
-
_ResetTextRect();
}
@@ -2220,21 +2170,21 @@
void
BTextView::_ResetTextRect()
{
- BRect oldTextRect(fAlignedTextRect);
- // reset text rect to old text bounds minus insets
- fAlignedTextRect = fTextRect;
- fAlignedTextRect.left += fLayoutData->leftInset;
- fAlignedTextRect.top += fLayoutData->topInset;
- fAlignedTextRect.right -= fLayoutData->rightInset;
- fAlignedTextRect.bottom -= fLayoutData->bottomInset;
+ BRect oldTextRect(fTextRect);
+ // reset text rect to bounds minus insets ...
+ fTextRect = Bounds().OffsetToCopy(B_ORIGIN);
+ fTextRect.left += fLayoutData->leftInset;
+ fTextRect.top += fLayoutData->topInset;
+ fTextRect.right -= fLayoutData->rightInset;
+ fTextRect.bottom -= fLayoutData->bottomInset;
// and rewrap (potentially adjusting the right and the bottom of the
text
// rect)
_Refresh(0, TextLength(), false);
// Make sure that the dirty area outside the text is redrawn too.
- BRegion invalid(oldTextRect | fAlignedTextRect);
- invalid.Exclude(fAlignedTextRect);
+ BRegion invalid(oldTextRect | fTextRect);
+ invalid.Exclude(fTextRect);
Invalidate(&invalid);
}
@@ -2253,8 +2203,6 @@
fLayoutData->rightInset = right;
fLayoutData->bottomInset = bottom;
- fLayoutData->overridden = true;
-
InvalidateLayout();
Invalidate();
}
@@ -2376,9 +2324,8 @@
fWrap = wrap;
if (wrap)
- _ResetTextRect(); // calls _Refresh
- else
- _Refresh(0, fText->Length(), false);
+ _ResetTextRect();
+ _Refresh(0, fText->Length(), false);
if (updateOnScreen) {
// show the caret, hilite the selection
@@ -2666,15 +2613,15 @@
}
// TODO: don't change the actual text rect!
- fAlignedTextRect.right = fAlignedTextRect.left + width;
+ fTextRect.right = fTextRect.left + width;
_Refresh(0, TextLength(), false);
if (min != NULL)
- *min = fAlignedTextRect.Height();
+ *min = fTextRect.Height();
if (max != NULL)
*max = B_SIZE_UNLIMITED;
if (preferred != NULL)
- *preferred = fAlignedTextRect.Height();
+ *preferred = fTextRect.Height();
}
@@ -2715,12 +2662,6 @@
if (size.height < fLayoutData->min.height)
size.height = fLayoutData->min.height;
- // reset insets to 0 unless SetInsets() was called
- BRect bounds(Bounds());
- fLayoutData->UpdateInsets(Bounds().OffsetToCopy(B_ORIGIN), bounds);
- // reset text rect to Bounds()
- fTextRect = bounds;
- fAlignedTextRect = fTextRect;
_ResetTextRect();
}
@@ -2744,7 +2685,7 @@
fLayoutData->min = min;
// compute our preferred size
- fLayoutData->preferred.height = fAlignedTextRect.Height()
+ fLayoutData->preferred.height = fTextRect.Height()
+ fLayoutData->topInset + fLayoutData->bottomInset;
if (fWrap)
@@ -3153,7 +3094,6 @@
// to have less code duplication, and a single place where to do changes
// if needed.
fTextRect = textRect;
- fAlignedTextRect = textRect;
// NOTE: The only places where text rect is changed:
// * width is possibly adjusted in _AutoResize(),
// * height is adjusted in _RecalculateLineBreaks().
@@ -3190,7 +3130,7 @@
fTrackingMouse = NULL;
fLayoutData = new LayoutData;
- fLayoutData->UpdateInsets(Bounds().OffsetToCopy(B_ORIGIN), textRect);
+ fLayoutData->UpdateInsets(Bounds().OffsetToCopy(B_ORIGIN), fTextRect);
fLastClickOffset = -1;
@@ -3379,8 +3319,7 @@
if (optionKeyDown && !commandKeyDown &&
!controlKeyDown)
fCaretOffset =
_NextLineEnd(fCaretOffset);
else if (commandKeyDown && !optionKeyDown &&
!controlKeyDown) {
- _ScrollTo(0, fAlignedTextRect.bottom
- + fLayoutData->bottomInset);
+ _ScrollTo(0, fTextRect.bottom +
fLayoutData->bottomInset);
fCaretOffset = fText->Length();
} else {
float height;
@@ -3443,7 +3382,8 @@
}
if (fUndo) {
- TypingUndoBuffer* undoBuffer =
dynamic_cast<TypingUndoBuffer*>(fUndo);
+ TypingUndoBuffer* undoBuffer = dynamic_cast<TypingUndoBuffer*>(
+ fUndo);
if (!undoBuffer) {
delete fUndo;
fUndo = undoBuffer = new TypingUndoBuffer(this);
@@ -3525,13 +3465,11 @@
case B_END:
if (!fEditable) {
fCaretOffset = fText->Length();
- _ScrollTo(0, fAlignedTextRect.bottom
- + fLayoutData->bottomInset);
+ _ScrollTo(0, fTextRect.bottom +
fLayoutData->bottomInset);
break;
} else {
if (commandKeyDown && !optionKeyDown &&
!controlKeyDown) {
- _ScrollTo(0, fAlignedTextRect.bottom
- + fLayoutData->bottomInset);
+ _ScrollTo(0, fTextRect.bottom +
fLayoutData->bottomInset);
fCaretOffset = fText->Length();
} else {
// If we are on the last line, just go
to the last
@@ -3684,6 +3622,7 @@
_DoInsertText(bytes, numBytes, fSelStart, NULL);
fCaretOffset = fSelEnd;
+
ScrollToOffset(fCaretOffset);
}
@@ -3699,8 +3638,8 @@
BTextView::_Refresh(int32 fromOffset, int32 toOffset, bool scroll)
{
// TODO: Cleanup
- float saveHeight = fAlignedTextRect.Height();
- float saveWidth = fAlignedTextRect.Width();
+ float saveHeight = fTextRect.Height();
+ float saveWidth = fTextRect.Width();
int32 fromLine = _LineAt(fromOffset);
int32 toLine = _LineAt(toOffset);
int32 saveFromLine = fromLine;
@@ -3713,7 +3652,7 @@
return;
BRect bounds = Bounds();
- float newHeight = fAlignedTextRect.Height();
+ float newHeight = fTextRect.Height();
// if the line breaks have changed, force an erase
if (fromLine != saveFromLine || toLine != saveToLine
@@ -3723,20 +3662,17 @@
if (newHeight != saveHeight) {
// the text area has changed
- if (newHeight < saveHeight) {
- toLine = _LineAt(BPoint(0.0f,
- saveHeight + fAlignedTextRect.top));
- } else {
- toLine = _LineAt(BPoint(0.0f,
- newHeight + fAlignedTextRect.top));
- }
+ if (newHeight < saveHeight)
+ toLine = _LineAt(BPoint(0.0f, saveHeight +
fTextRect.top));
+ else
+ toLine = _LineAt(BPoint(0.0f, newHeight +
fTextRect.top));
}
// draw only those lines that are visible
int32 fromVisible = _LineAt(BPoint(0.0f, bounds.top));
int32 toVisible = _LineAt(BPoint(0.0f, bounds.bottom));
- fromLine = std::max(fromVisible, fromLine);
- toLine = std::min(toLine, toVisible);
+ fromLine = max_c(fromVisible, fromLine);
+ toLine = min_c(toLine, toVisible);
_AutoResize(false);
@@ -3744,9 +3680,8 @@
// erase the area below the text
BRect eraseRect = bounds;
- eraseRect.top = fAlignedTextRect.top
- + (*fLines)[fLines->NumLines()]->origin;
- eraseRect.bottom = fAlignedTextRect.top + saveHeight;
+ eraseRect.top = fTextRect.top + (*fLines)[fLines->NumLines()]->origin;
+ eraseRect.bottom = fTextRect.top + saveHeight;
if (eraseRect.bottom > eraseRect.top && eraseRect.Intersects(bounds)) {
SetLowColor(ViewColor());
FillRect(eraseRect, B_SOLID_LOW);
@@ -3773,7 +3708,7 @@
{
CALLED();
- float width = fAlignedTextRect.Width();
+ float width = fTextRect.Width();
// Don't try to compute anything if the text rect is not set
if (width <= 0)
@@ -3845,61 +3780,16 @@
// has always a width of 0
(*fLines)[fLines->NumLines()]->width = 0;
- // update fAlignedTextRect, leave fTextRect alone
- fAlignedTextRect = fTextRect;
-
- // adjust insets
- fAlignedTextRect.left += fLayoutData->leftInset;
- fAlignedTextRect.top += fLayoutData->topInset;
- fAlignedTextRect.right -= fLayoutData->rightInset;
- fAlignedTextRect.bottom -= fLayoutData->bottomInset;
-
- // Set new bottom based on text height unless bottom is below
- // the bottom of text height already.
+ // update the text rect
float newHeight = TextHeight(0, fLines->NumLines() - 1);
- fAlignedTextRect.bottom = std::max(fAlignedTextRect.bottom,
- fAlignedTextRect.top + newHeight);
-
- bool doPadding = !fLayoutData->overridden && (fEditable || fSelectable);
- float hPadding = doPadding ? be_control_look->DefaultLabelSpacing() : 0;
-
- // new min width
+ fTextRect.bottom = fTextRect.top + newHeight;
if (!fWrap) {
fMinTextRectWidth = fLines->MaxWidth();
-
- // expand width if needed (including padding)
- switch (fAlignment) {
- default:
- case B_ALIGN_LEFT:
- // grow right
- fAlignedTextRect.right =
std::max(fAlignedTextRect.right,
- fAlignedTextRect.left + hPadding +
fMinTextRectWidth);
- break;
-
- case B_ALIGN_RIGHT:
- // grow left
- fAlignedTextRect.left =
std::min(fAlignedTextRect.left,
- fAlignedTextRect.right - hPadding -
fMinTextRectWidth);
- break;
-
- case B_ALIGN_CENTER:
- // grow out
- if (fMinTextRectWidth + hPadding >
fAlignedTextRect.Width()) {
-
fAlignedTextRect.InsetBy(ceilf((fAlignedTextRect.Width()
- - hPadding - fMinTextRectWidth)
/ 2.0f), 0);
- }
- break;
- }
- }
-
- if (doPadding) {
- float hInset = floorf(hPadding / 2.0f);
- float vInset = 1;
- fAlignedTextRect.InsetBy(hInset, vInset);
+ fTextRect.right = ceilf(fTextRect.left + fMinTextRectWidth);
}
*endLine = lineIndex - 1;
- *startLine = std::min(*startLine, *endLine);
+ *startLine = min_c(*startLine, *endLine);
}
@@ -3990,7 +3880,7 @@
}
}
- delta = std::max(delta, (int32)1);
+ delta = max_c(delta, 1);
// do not include B_ENTER-terminator into width & height
calculations
deltaWidth = _TabExpandedStyledWidth(offset,
@@ -4021,8 +3911,8 @@
}
}
- *_ascent = std::max(ascent, *_ascent);
- *_descent = std::max(descent, *_descent);
+ *_ascent = max_c(ascent, *_ascent);
+ *_descent = max_c(descent, *_descent);
offset += delta;
delta = 0;
@@ -4045,12 +3935,12 @@
break;
}
- *_ascent = std::max(ascent, *_ascent);
- *_descent = std::max(descent, *_descent);
+ *_ascent = max_c(ascent, *_ascent);
+ *_descent = max_c(descent, *_descent);
}
}
- return std::min(offset, limit);
+ return min_c(offset, limit);
}
@@ -4247,8 +4137,8 @@
int32 numBytes;
while ((numBytes = fStyles->Iterate(fromOffset, length, fInline, &font,
NULL, &ascent, &descent)) != 0) {
- maxAscent = std::max(ascent, maxAscent);
- maxDescent = std::max(descent, maxDescent);
+ maxAscent = max_c(ascent, maxAscent);
+ maxDescent = max_c(descent, maxDescent);
#if USE_WIDTHBUFFER
// Use _BWidthBuffer_ if possible
@@ -4326,20 +4216,19 @@
BRegion &inputRegion)
{
STELine* line = (*fLines)[lineNum];
- float startLeft = fAlignedTextRect.left;
-
+ float startLeft = fTextRect.left;
if (startOffset != -1) {
if (ByteAt(startOffset) == B_ENTER) {
// StartOffset is a newline
startLeft = PointAt(line->offset).x;
} else
startLeft = PointAt(startOffset).x;
- } else if (fAlignment != B_ALIGN_LEFT) {
- float alignmentOffset = fAlignedTextRect.Width()
- - LineWidth(lineNum);
+ }
+ else if (fAlignment != B_ALIGN_LEFT) {
+ float alignmentOffset = fTextRect.Width() - LineWidth(lineNum);
if (fAlignment == B_ALIGN_CENTER)
- alignmentOffset = floorf(alignmentOffset / 2);
- startLeft = fAlignedTextRect.left + alignmentOffset;
+ alignmentOffset /= 2;
+ startLeft = fTextRect.left + alignmentOffset;
}
int32 length = (line + 1)->offset;
@@ -4352,12 +4241,11 @@
if (ByteAt((line + 1)->offset - 1) == B_ENTER)
length--;
- view->MovePenTo(startLeft,
- line->origin + line->ascent + fAlignedTextRect.top + 1);
+ view->MovePenTo(startLeft, line->origin + line->ascent + fTextRect.top
+ 1);
if (erase) {
- eraseRect.top = line->origin + fAlignedTextRect.top;
- eraseRect.bottom = (line + 1)->origin + fAlignedTextRect.top;
+ eraseRect.top = line->origin + fTextRect.top;
+ eraseRect.bottom = (line + 1)->origin + fTextRect.top;
view->FillRect(eraseRect, B_SOLID_LOW);
}
@@ -4379,7 +4267,7 @@
view->SetFont(font);
view->SetHighColor(*color);
- tabChars = std::min(numBytes, length);
+ tabChars = min_c(numBytes, length);
do {
foundTab = fText->FindChar(B_TAB, offset, &tabChars);
if (foundTab) {
@@ -4428,12 +4316,11 @@
}
int32 returnedBytes = tabChars;
- const char* stringToDraw
- = fText->GetString(offset, &returnedBytes);
+ const char* stringToDraw = fText->GetString(offset,
&returnedBytes);
view->SetDrawingMode(textRenderingMode);
view->DrawString(stringToDraw, returnedBytes);
if (foundTab) {
- float penPos = PenLocation().x -
fAlignedTextRect.left;
+ float penPos = PenLocation().x - fTextRect.left;
float tabWidth = _ActualTabWidth(penPos);
if (numTabs > 1)
tabWidth += ((numTabs - 1) * fTabWidth);
@@ -4445,7 +4332,7 @@
offset += tabChars;
length -= tabChars;
numBytes -= tabChars;
- tabChars = std::min(numBytes, length);
+ tabChars = min_c(numBytes, length);
numTabs = 0;
} while (foundTab && tabChars > 0);
}
@@ -4460,9 +4347,9 @@
return;
// clip the text
- BRect textRect(fAlignedTextRect);
- float minWidth = Bounds().Width() - fLayoutData->leftInset
- - fLayoutData->rightInset;
+ BRect textRect(fTextRect);
+ float minWidth
+ = Bounds().Width() - fLayoutData->leftInset -
fLayoutData->rightInset;
if (textRect.Width() < minWidth)
textRect.right = textRect.left + minWidth;
BRect clipRect = Bounds() & textRect;
@@ -4508,7 +4395,7 @@
BPoint erasePoint = PointAt(startErase);
eraseRect.left = erasePoint.x;
eraseRect.top = erasePoint.y;
- eraseRect.bottom = (line + 1)->origin + fAlignedTextRect.top;
+ eraseRect.bottom = (line + 1)->origin + fTextRect.top;
view->FillRect(eraseRect, B_SOLID_LOW);
@@ -4563,10 +4450,9 @@
STELine* from = (*fLines)[startLine];
STELine* to = endLine == maxLine ? NULL : (*fLines)[endLine + 1];
- BRect invalidRect(Bounds().left, from->origin + fAlignedTextRect.top,
+ BRect invalidRect(Bounds().left, from->origin + fTextRect.top,
Bounds().right,
- to != NULL ? to->origin + fAlignedTextRect.top
- : fAlignedTextRect.bottom);
+ to != NULL ? to->origin + fTextRect.top : fTextRect.bottom);
Invalidate(invalidRect);
Window()->UpdateIfNeeded();
}
@@ -4577,7 +4463,7 @@
{
float lineHeight;
BPoint caretPoint = PointAt(offset, &lineHeight);
- caretPoint.x = std::min(caretPoint.x, fAlignedTextRect.right);
+ caretPoint.x = min_c(caretPoint.x, fTextRect.right);
BRect caretRect;
caretRect.left = caretRect.right = caretPoint.x;
@@ -4908,15 +4794,15 @@
// R5 does a pretty soft auto-scroll, we try to do the same by
// simply scrolling the distance between cursor and border
- if (fWhere.x > bounds.right)
+ if (fWhere.x > bounds.right) {
scrollBy.x = fWhere.x - bounds.right;
- else if (fWhere.x < bounds.left)
+ } else if (fWhere.x < bounds.left) {
scrollBy.x = fWhere.x - bounds.left; // negative value
+ }
// prevent from scrolling out of view
if (scrollBy.x != 0.0) {
- float rightMax = floorf(fAlignedTextRect.right
- + fLayoutData->rightInset);
+ float rightMax = floorf(fTextRect.right +
fLayoutData->rightInset);
if (bounds.right + scrollBy.x > rightMax)
scrollBy.x = rightMax - bounds.right;
if (bounds.left + scrollBy.x < 0)
@@ -4925,14 +4811,15 @@
if (CountLines() > 1) {
// scroll in Y only if multiple lines!
- if (fWhere.y > bounds.bottom)
+ if (fWhere.y > bounds.bottom) {
scrollBy.y = fWhere.y - bounds.bottom;
- else if (fWhere.y < bounds.top)
+ } else if (fWhere.y < bounds.top) {
scrollBy.y = fWhere.y - bounds.top; // negative value
+ }
// prevent from scrolling out of view
if (scrollBy.y != 0.0) {
- float bottomMax = floorf(fAlignedTextRect.bottom
+ float bottomMax = floorf(fTextRect.bottom
+ fLayoutData->bottomInset);
if (bounds.bottom + scrollBy.y > bottomMax)
scrollBy.y = bottomMax - bounds.bottom;
@@ -4957,11 +4844,11 @@
// do we have a horizontal scroll bar?
if (horizontalScrollBar != NULL) {
long viewWidth = bounds.IntegerWidth();
- long dataWidth = (long)ceilf(fAlignedTextRect.IntegerWidth()
+ long dataWidth = (long)ceilf(fTextRect.IntegerWidth()
+ fLayoutData->leftInset + fLayoutData->rightInset);
long maxRange = dataWidth - viewWidth;
- maxRange = std::max(maxRange, 0l);
+ maxRange = max_c(maxRange, 0);
horizontalScrollBar->SetRange(0, (float)maxRange);
horizontalScrollBar->SetProportion((float)viewWidth /
(float)dataWidth);
@@ -4971,11 +4858,11 @@
// how about a vertical scroll bar?
if (verticalScrollBar != NULL) {
long viewHeight = bounds.IntegerHeight();
- long dataHeight = (long)ceilf(fLayoutData->topInset
- + fAlignedTextRect.IntegerHeight() +
fLayoutData->bottomInset);
+ long dataHeight = (long)ceilf(fTextRect.IntegerHeight()
+ + fLayoutData->topInset + fLayoutData->bottomInset);
long maxRange = dataHeight - viewHeight;
- maxRange = std::max(maxRange, 0L);
+ maxRange = max_c(maxRange, 0);
verticalScrollBar->SetRange(0, maxRange);
verticalScrollBar->SetProportion((float)viewHeight /
(float)dataHeight);
@@ -5001,13 +4888,13 @@
long viewWidth = bounds.IntegerWidth();
long viewHeight = bounds.IntegerHeight();
- if (x > fAlignedTextRect.right - viewWidth)
- x = fAlignedTextRect.right - viewWidth;
+ if (x > fTextRect.right - viewWidth)
+ x = fTextRect.right - viewWidth;
if (x < 0.0)
x = 0.0;
- if (y > fAlignedTextRect.bottom + fLayoutData->bottomInset - viewHeight)
- y = fAlignedTextRect.bottom + fLayoutData->bottomInset -
viewHeight;
+ if (y > fTextRect.bottom + fLayoutData->bottomInset - viewHeight)
+ y = fTextRect.bottom + fLayoutData->bottomInset - viewHeight;
if (y < 0.0)
y = 0.0;
@@ -5023,13 +4910,13 @@
return;
BRect bounds = Bounds();
+ float oldWidth = bounds.Width();
+ float newWidth = ceilf(fLayoutData->leftInset + fTextRect.Width()
+ + fLayoutData->rightInset);
if (fContainerView != NULL) {
// NOTE: This container view thing is only used by Tracker.
// move container view if not left aligned
- float oldWidth = bounds.Width();
- float newWidth = ceilf(fLayoutData->leftInset
- + fAlignedTextRect.Width() + fLayoutData->rightInset);
if (fAlignment == B_ALIGN_CENTER) {
if (fmod(ceilf(newWidth - oldWidth), 2.0) != 0.0)
newWidth += 1;
@@ -5047,8 +4934,8 @@
// erase any potential left over outside the text rect
// (can only be on right hand side)
- BRect dirty(fAlignedTextRect.right + 1, fAlignedTextRect.top,
- bounds.right, fAlignedTextRect.bottom);
+ BRect dirty(fTextRect.right + 1, fTextRect.top, bounds.right,
+ fTextRect.bottom);
if (dirty.IsValid()) {
SetLowColor(ViewColor());
FillRect(dirty, B_SOLID_LOW);
@@ -5064,9 +4951,8 @@
_DeleteOffscreen();
#if USE_DOUBLEBUFFERING
- BRect bitmapRect(0, 0, fAlignedTextRect.Width() + padding,
- fAlignedTextRect.Height());
- fOffscreen = new BBitmap(bitm->Rect, fColorSpace, true, false);
+ BRect bitmapRect(0, 0, fTextRect.Width() + padding, fTextRect.Height());
+ fOffscreen = new BBitmap(bitmapRect, fColorSpace, true, false);
if (fOffscreen != NULL && fOffscreen->Lock()) {
BView* bufferView = new BView(bitmapRect, "drawing view", 0, 0);
fOffscreen->AddChild(bufferView);
@@ -5780,7 +5666,7 @@
int32
BTextView::_LineAt(const BPoint& point) const
{
- return fLines->PixelToLine(point.y - fAlignedTextRect.top);
+ return fLines->PixelToLine(point.y - fTextRect.top);
}
diff --git a/src/kits/tracker/TextWidget.cpp b/src/kits/tracker/TextWidget.cpp
index 8b8ab24..14b6155 100644
--- a/src/kits/tracker/TextWidget.cpp
+++ b/src/kits/tracker/TextWidget.cpp
@@ -379,7 +379,6 @@
textView->SetWordWrap(false);
DisallowMetaKeys(textView);
- textView->SetInsets(0, 0, 0, 0);
fText->SetUpEditing(textView);
textView->AddFilter(new BMessageFilter(B_KEY_DOWN, TextViewFilter));
diff --git a/src/kits/tracker/infowindow/HeaderView.cpp
b/src/kits/tracker/infowindow/HeaderView.cpp
index 6bb4d22..02b4522 100644
--- a/src/kits/tracker/infowindow/HeaderView.cpp
+++ b/src/kits/tracker/infowindow/HeaderView.cpp
@@ -302,6 +302,7 @@
// Font information
font_height fontMetrics;
BFont currentFont;
+ float lineHeight = 0;
float lineBase = 0;
// Draw the main title if the user is not currently editing it
@@ -310,6 +311,7 @@
SetFontSize(be_bold_font->Size());
GetFont(¤tFont);
currentFont.GetHeight(&fontMetrics);
+ lineHeight = CurrentFontHeight() + 5;
lineBase = fTitleRect.bottom - fontMetrics.descent;
SetHighColor(labelColor);
MovePenTo(BPoint(fIconRect.right + 6, lineBase));
diff --git a/src/preferences/screensaver/PreviewView.cpp
b/src/preferences/screensaver/PreviewView.cpp
index e6cea52..8301089 100644
--- a/src/preferences/screensaver/PreviewView.cpp
+++ b/src/preferences/screensaver/PreviewView.cpp
@@ -146,7 +146,6 @@
fNoPreview->SetExplicitSize(BSize(previewWidth, previewHeight));
fNoPreview->ResizeTo(previewWidth, previewHeight);
- fNoPreview->SetTextRect(BRect(0, 0, previewWidth, previewHeight));
fNoPreview->SetInsets(0, previewHeight / 3, 0 , 0);
return fSaverView;
--
To view, visit https://review.haiku-os.org/c/haiku/+/3153
To unsubscribe, or for help writing mail filters, visit
https://review.haiku-os.org/settings
Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: Ife3c834ad98d330f04976d9adf3b1553e7aca034
Gerrit-Change-Number: 3153
Gerrit-PatchSet: 1
Gerrit-Owner: John Scipione <jscipione@xxxxxxxxx>
Gerrit-MessageType: newchange
