GRAPHICS: Add MacWindowBorder to abstract borders

1 files changed, 6 insertions, 4 deletions

diff --git a/graphics/macgui/macwindow.cpp b/graphics/macgui/macwindow.cpp
index 226037ef56..7ad5666866 100644
--- a/graphics/macgui/macwindow.cpp
+++ b/graphics/macgui/macwindow.cpp
@@ -203,12 +203,12 @@ void MacWindow::prepareBorderSurface(ManagedSurface *g) {
 }
 
 void MacWindow::drawBorderFromSurface(ManagedSurface *g) {
-	TransparentSurface srf;
-	srf.create(_composeSurface.w, _composeSurface.h, _borders->format);
+	assert(_borders);
 
-	_bmp = new NinePatchBitmap(_borders, false);
+	TransparentSurface srf;
+	srf.create(_borderSurface.w, _borderSurface.h, _borders->format);
 
-	_bmp->blit(srf, 0, 0, srf.w, srf.h);
+	_macBorder.blitBorderInto(_borderSurface, false);
 	_borderSurface.transBlitFrom(srf, _borderSurface.format.ARGBToColor(0, 255, 255, 255));
 }
 
@@ -304,6 +304,8 @@ void MacWindow::setHighlight(WindowClick highlightedPart) {
 
  void MacWindow::setBorders(TransparentSurface *source) {
 	 _borders = new TransparentSurface(*source);
+	 if (_borders)
+		 _macBorder.addInactiveBorder(_borders);
  }