diff options
| -rw-r--r-- | graphics/macgui/macwindow.cpp | 32 | ||||
| -rw-r--r-- | graphics/nine_patch.h | 6 |
2 files changed, 19 insertions, 19 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); diff --git a/graphics/nine_patch.h b/graphics/nine_patch.h index d0fc1af05a..b40f3bf980 100644 --- a/graphics/nine_patch.h +++ b/graphics/nine_patch.h @@ -51,8 +51,8 @@ namespace Graphics { - class TransparentSurface; - class Surface; +class TransparentSurface; +class Surface; struct NinePatchMark { int offset; @@ -86,7 +86,7 @@ public: NinePatchBitmap(Graphics::TransparentSurface *bmp, bool owns_bitmap); ~NinePatchBitmap(); - void blit(Graphics::Surface &target, int dx, int dy, int dw, int dh, byte *palette = NULL, byte numColours = 0); + void blit(Graphics::Surface &target, int dx, int dy, int dw, int dh, byte *palette = NULL, byte numColors = 0); void blitClip(Graphics::Surface &target, Common::Rect clip, int dx, int dy, int dw, int dh); int getWidth() { return _width; } |