aboutsummaryrefslogtreecommitdiff
path: root/graphics/macgui/macwindow.cpp
diff options
context:
space:
mode:
authorBorja Lorente2016-07-30 11:26:21 +0200
committerBorja Lorente2016-08-02 08:33:50 +0200
commit7bc8d472ab879b49f9670cccc16fd0bf8bf0a6a7 (patch)
treeded51de5f281c233a2a2b76481c1e4d68586baa8 /graphics/macgui/macwindow.cpp
parent38f80f10f823d62bbefc25f81a7be8575eb505d6 (diff)
downloadscummvm-rg350-7bc8d472ab879b49f9670cccc16fd0bf8bf0a6a7.tar.gz
scummvm-rg350-7bc8d472ab879b49f9670cccc16fd0bf8bf0a6a7.tar.bz2
scummvm-rg350-7bc8d472ab879b49f9670cccc16fd0bf8bf0a6a7.zip
GRAPHICS: Fix style and spelling
Diffstat (limited to 'graphics/macgui/macwindow.cpp')
-rw-r--r--graphics/macgui/macwindow.cpp32
1 files changed, 16 insertions, 16 deletions
diff --git a/graphics/macgui/macwindow.cpp b/graphics/macgui/macwindow.cpp
index e754f3c593..1b4ed016eb 100644
--- a/graphics/macgui/macwindow.cpp
+++ b/graphics/macgui/macwindow.cpp
@@ -196,6 +196,7 @@ void MacWindow::drawBorder() {
_borderIsDirty = false;
ManagedSurface *g = &_borderSurface;
+
if (_macBorder.hasBorder(_active)) {
drawBorderFromSurface(g);
} else {
@@ -303,19 +304,18 @@ void MacWindow::setHighlight(WindowClick highlightedPart) {
_highlightedPart = highlightedPart;
_borderIsDirty = true;
- }
+}
- void MacWindow::setScroll(float scrollPos, float scrollSize) {
+void MacWindow::setScroll(float scrollPos, float scrollSize) {
if (_scrollPos == scrollPos && _scrollSize == scrollSize)
return;
_scrollPos = scrollPos;
_scrollSize = scrollSize;
_borderIsDirty = true;
- }
-
- void MacWindow::loadBorder(Common::SeekableReadStream &file, bool active, int lo, int ro, int to, int bo) {
+}
+void MacWindow::loadBorder(Common::SeekableReadStream &file, bool active, int lo, int ro, int to, int bo) {
Image::BitmapDecoder bmpDecoder;
Graphics::Surface source;
Graphics::TransparentSurface *surface = new Graphics::TransparentSurface();
@@ -328,20 +328,20 @@ void MacWindow::setHighlight(WindowClick highlightedPart) {
surface->copyFrom(source);
surface->applyColorKey(255, 0, 255, false);
- if (active)
- _macBorder.addActiveBorder(*surface);
- else
- _macBorder.addInactiveBorder(*surface);
+ if (active)
+ _macBorder.addActiveBorder(*surface);
+ else
+ _macBorder.addInactiveBorder(*surface);
- if (!_macBorder.hasOffsets())
- _macBorder.setOffsets(lo, ro, to, bo);
+ if (!_macBorder.hasOffsets())
+ _macBorder.setOffsets(lo, ro, to, bo);
- updateInnerDims();
- }
+ updateInnerDims();
+}
- void MacWindow::setCloseable(bool closeable) {
- _closeable = closeable;
- }
+void MacWindow::setCloseable(bool closeable) {
+ _closeable = closeable;
+}
void MacWindow::drawBox(ManagedSurface *g, int x, int y, int w, int h) {
Common::Rect r(x, y, x + w + 1, y + h + 1);