GRAPHICS: Refactor MacWindow to accept MacWindowBorder

1 files changed, 13 insertions, 8 deletions

diff --git a/graphics/macgui/macwindowborder.cpp b/graphics/macgui/macwindowborder.cpp
index cbb2ef0571..761e1b6853 100644
--- a/graphics/macgui/macwindowborder.cpp
+++ b/graphics/macgui/macwindowborder.cpp
@@ -2,9 +2,9 @@
 
 namespace Graphics {
 
-MacWindowBorder::MacWindowBorder() {
+MacWindowBorder::MacWindowBorder() : _activeInitialized(false), _inactiveInitialized(false) {
 	_activeBorder = nullptr;
-	_inactiveBorder = nullptr;
+	_inactiveBorder = nullptr;	
 }
 
 
@@ -15,15 +15,20 @@ MacWindowBorder::~MacWindowBorder() {
 		delete _inactiveBorder;
 }
 
-bool MacWindowBorder::empty() { return !(_activeBorder || _inactiveBorder); }
+bool MacWindowBorder::hasBorder(bool active) { 
+	return active ? _activeInitialized : _inactiveInitialized; 
+}
 
-void MacWindowBorder::addActiveBorder(TransparentSurface *source) {
-	// Assumes NinePatchBitmap invariants hold
-	_activeBorder = new NinePatchBitmap(source, false);	
+void MacWindowBorder::addActiveBorder(TransparentSurface &source) {
+	assert(!_activeBorder);
+	_activeBorder = new NinePatchBitmap(&source, false);	
+	_activeInitialized = true;
 }
 
-void MacWindowBorder::addInactiveBorder(TransparentSurface *source) {
-	_inactiveBorder = new NinePatchBitmap(source, false);
+void MacWindowBorder::addInactiveBorder(TransparentSurface &source) {
+	assert(!_inactiveBorder);
+	_inactiveBorder = new NinePatchBitmap(&source, false);
+	_inactiveInitialized = true;
 }
 
 void MacWindowBorder::blitBorderInto(ManagedSurface &destination, bool active) {