libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-06 09:48:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GRAPHICS: MACGUI: Incapsulate MacWindow internals

Browse Source
This commit is contained in:
Eugene Sandulenko 2017-08-03 08:40:20 +02:00
parent 04bb7c3e7a
commit 20734108e3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
graphics/macgui/mactextwindow.cpp
View File

@ -77,7 +77,7 @@ void MacTextWindow::resize(int w, int h) {
MacWindow::resize(w, h);
_maxWidth = _innerDims.width();
_maxWidth = getInnerDimensions().width();
_mactext->setMaxWidth(_maxWidth);
}
@ -86,7 +86,7 @@ void MacTextWindow::appendText(Common::String str, const MacFont *macFont, bool
_contentIsDirty = true;
_scrollPos = MAX(0, _mactext->getTextHeight() - _innerDims.height());
_scrollPos = MAX(0, _mactext->getTextHeight() - getInnerDimensions().height());
updateCursorPos();
}
@ -189,7 +189,7 @@ bool MacTextWindow::processEvent(Common::Event &event) {
if (click == kBorderScrollUp || click == kBorderScrollDown) {
if (event.type == Common::EVENT_LBUTTONDOWN) {
int consoleHeight = _innerDims.height();
int consoleHeight = getInnerDimensions().height();
int textFullSize = _mactext->getTextHeight();
float scrollPos = (float)_scrollPos / textFullSize;
float scrollSize = (float)consoleHeight / textFullSize;

2
graphics/macgui/macwindow.h
View File

@ -308,7 +308,6 @@ protected:
ManagedSurface _composeSurface;
bool _borderIsDirty;
Common::Rect _innerDims;
private:
MacWindowBorder _macBorder;
@ -323,6 +322,7 @@ private:
bool _closeable;
int _borderWidth;
Common::Rect _innerDims;
bool _beingDragged, _beingResized;
int _draggedX, _draggedY;