aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2017-08-02 22:57:46 +0200
committerEugene Sandulenko2017-08-04 21:54:19 +0200
commit085eea68c36b9d1c3ea55fcdaabd371ec39125f2 (patch)
tree235ea4457f35aed4e3746efb11705367cb1a0085
parent91615eb940b766135d15f4d56519de35b5c3ce88 (diff)
downloadscummvm-rg350-085eea68c36b9d1c3ea55fcdaabd371ec39125f2.tar.gz
scummvm-rg350-085eea68c36b9d1c3ea55fcdaabd371ec39125f2.tar.bz2
scummvm-rg350-085eea68c36b9d1c3ea55fcdaabd371ec39125f2.zip
GRAPHICS: MACGUI: Use proper dimensions for maxTextWidth in MacTextWindow
-rw-r--r--graphics/macgui/mactextwindow.cpp6
-rw-r--r--graphics/macgui/macwindow.h3
2 files changed, 4 insertions, 5 deletions
diff --git a/graphics/macgui/mactextwindow.cpp b/graphics/macgui/mactextwindow.cpp
index b3824f66be..e12a9020d8 100644
--- a/graphics/macgui/mactextwindow.cpp
+++ b/graphics/macgui/mactextwindow.cpp
@@ -72,10 +72,10 @@ MacTextWindow::MacTextWindow(MacWindowManager *wm, const MacFont *font, int fgco
void MacTextWindow::resize(int w, int h) {
undrawInput();
- _maxWidth = w - kBorderWidth * 2;
- _mactext->setMaxWidth(_maxWidth);
-
MacWindow::resize(w, h);
+
+ _maxWidth = _innerDims.width();
+ _mactext->setMaxWidth(_maxWidth);
}
void MacTextWindow::appendText(Common::String str, const MacFont *macFont, bool skipAdd) {
diff --git a/graphics/macgui/macwindow.h b/graphics/macgui/macwindow.h
index 2cda99164c..3e7f474f23 100644
--- a/graphics/macgui/macwindow.h
+++ b/graphics/macgui/macwindow.h
@@ -308,6 +308,7 @@ protected:
ManagedSurface _composeSurface;
bool _borderIsDirty;
+ Common::Rect _innerDims;
private:
MacWindowBorder _macBorder;
@@ -329,8 +330,6 @@ private:
WindowClick _highlightedPart;
float _scrollPos, _scrollSize;
- Common::Rect _innerDims;
-
Common::String _title;
};