Fixed render target properties so they are updated properly

Ensured that editor widget containers have a parent window assigned even when part of a dock manager

BansheeCore/Include/BsRenderTarget.h

@@ -103,6 +103,11 @@ namespace BansheeEngine
 		 */
 		bool requiresTextureFlipping() const { return mRequiresTextureFlipping; }
 
+		/**
+		 * @brief	Copies all data from the provided object to this object.
+		 */
+		virtual void copyFrom(const RenderTargetProperties& other);
+
 	protected:
 		friend class RenderTargetCore;
 		friend class RenderTarget;

BansheeCore/Include/BsRenderTexture.h

@@ -23,6 +23,11 @@ namespace BansheeEngine
 	public:
 		virtual ~RenderTextureProperties() { }
 
+		/**
+		 * @copydoc	RenderTargetProperties::copyFrom
+		 */
+		virtual void copyFrom(const RenderTargetProperties& other);
+
 	private:
 		friend class RenderTextureCore;
 		friend class RenderTexture;

BansheeCore/Include/BsRenderWindow.h

@@ -90,6 +90,11 @@ namespace BansheeEngine
 		 */
 		bool isHidden() const { return mHidden; }
 
+		/**
+		 * @copydoc	RenderTargetProperties::copyFrom
+		 */
+		virtual void copyFrom(const RenderTargetProperties& other);
+
 	protected:
 		friend class RenderWindowCore;
 		friend class RenderWindow;

BansheeCore/Source/BsRenderTarget.cpp

@@ -7,6 +7,11 @@
 
 namespace BansheeEngine 
 {
+	void RenderTargetProperties::copyFrom(const RenderTargetProperties& other)
+	{
+		*this = other;
+	}
+
 	RenderTargetCore::RenderTargetCore(RenderTarget* parent, RenderTargetProperties* properties)
 		:mProperties(properties), mParent(parent)
 	{

BansheeCore/Source/BsRenderTargetManager.cpp

@@ -1,6 +1,8 @@
 #include "BsRenderTargetManager.h"
 #include "BsRenderTarget.h"
 
+#include "BsRenderWindow.h"
+
 namespace BansheeEngine
 {
 	RenderTargetManager::~RenderTargetManager()
@@ -44,7 +46,7 @@ namespace BansheeEngine
 
 			if (rt->getCore()->_isCoreDirty())
 			{
-				*rtData.properties = rt->getCore()->getProperties();
+				rtData.properties->copyFrom(rt->getCore()->getProperties());
 				rtData.dirty = true;
 
 				rt->getCore()->_markCoreClean();
@@ -63,7 +65,7 @@ namespace BansheeEngine
 
 			if (rtData.dirty)
 			{
-				*rt->mProperties = *rtData.properties;
+				rt->mProperties->copyFrom(*rtData.properties);
 
 				rtData.dirty = false;
 			}

BansheeCore/Source/BsRenderTexture.cpp

@@ -8,6 +8,13 @@
 
 namespace BansheeEngine
 {
+	void RenderTextureProperties::copyFrom(const RenderTargetProperties& other)
+	{
+		const RenderTextureProperties& windowProps = static_cast<const RenderTextureProperties&>(other);
+
+		*this = windowProps;
+	}
+
 	RenderTextureCore::RenderTextureCore(RenderTexture* parent, RenderTextureProperties* properties, const RENDER_SURFACE_DESC& colorSurfaceDesc,
 		const RENDER_SURFACE_DESC& depthStencilSurfaceDesc)
 		:RenderTargetCore(parent, properties), mColorSurface(nullptr), mDepthStencilSurface(nullptr)

BansheeCore/Source/BsRenderWindow.cpp

@@ -6,6 +6,13 @@
 
 namespace BansheeEngine 
 {
+	void RenderWindowProperties::copyFrom(const RenderTargetProperties& other)
+	{
+		const RenderWindowProperties& windowProps = static_cast<const RenderWindowProperties&>(other);
+
+		*this = windowProps;
+	}
+
 	RenderWindowCore::RenderWindowCore(RenderWindow* parent, RenderWindowProperties* properties)
 		:RenderTargetCore(parent, properties)
 	{

BansheeEditor/Include/BsDockManager.h

@@ -22,7 +22,7 @@ namespace BansheeEngine
 			~DockContainer();
 
 			void setArea(INT32 x, INT32 y, UINT32 width, UINT32 height);
-			void makeLeaf(GUIWidget* widgetParent, RenderWindow* parentWindow);
+			void makeLeaf(GUIWidget* widgetParent, EditorWindowBase* parentWindow);
 			void makeLeaf(EditorWidgetContainer* existingContainer);
 			void splitContainer(bool horizontal, bool newChildIsFirst, float splitPosition = 0.5f);
 			void makeSplit(GUIWidget* widgetParent, DockManager::DockContainer* first, DockManager::DockContainer* second, bool horizontal, float splitPosition);
@@ -78,7 +78,7 @@ namespace BansheeEngine
 			None
 		};
 	public:
-		static DockManager* create(RenderWindow* parentWindow);
+		static DockManager* create(EditorWindowBase* parentWindow);
 
 		/**
 		 * @brief	Internal method. Called once every frame.
@@ -101,12 +101,12 @@ namespace BansheeEngine
 		void updateClippedBounds();
 
 	private:
-		DockManager(RenderWindow* parentWindow, const GUILayoutOptions& layoutOptions);
+		DockManager(EditorWindowBase* parentWindow, const GUILayoutOptions& layoutOptions);
 
 		static const Color TINT_COLOR;
 		static const Color HIGHLIGHT_COLOR;
 
-		RenderWindow* mParentWindow;
+		EditorWindowBase* mParentWindow;
 		DockContainer mRootContainer;
 		Rect2I mArea;
 

BansheeEditor/Include/BsEditorWidgetContainer.h

@@ -8,7 +8,7 @@ namespace BansheeEngine
 	class BS_ED_EXPORT EditorWidgetContainer
 	{
 	public:
-		EditorWidgetContainer(GUIWidget* parent, RenderWindow* renderWindow, EditorWindow* parentEditorWindow);
+		EditorWidgetContainer(GUIWidget* parent, EditorWindowBase* parentEditorWindow);
 		virtual ~EditorWidgetContainer();
 
 		void add(EditorWidgetBase& widget);
@@ -23,7 +23,7 @@ namespace BansheeEngine
 		EditorWidgetBase* getWidget(UINT32 idx) const;
 		EditorWidgetBase* getActiveWidget() const;
 		GUIWidget& getParentWidget() const { return *mParent; }
-		EditorWindow* getParentWindow() const { return mParentWindow; }
+		EditorWindowBase* getParentWindow() const { return mParentWindow; }
 
 		Rect2I getContentBounds() const;
 		Vector<Rect2I> getDraggableAreas() const;
@@ -34,7 +34,7 @@ namespace BansheeEngine
 
 		Event<void()> onWidgetClosed;
 	private:
-		EditorWindow* mParentWindow;
+		EditorWindowBase* mParentWindow;
 		GUITabbedTitleBar* mTitleBar;
 		GUIArea* mTitleBarArea;
 		GUIWidget* mParent;

BansheeEditor/Include/BsEditorWindowBase.h

@@ -22,6 +22,11 @@ namespace BansheeEngine
 		virtual void close();
 		void hide();
 
+		/**
+		 * @brief	Return true if this is the main editor window.
+		 */
+		virtual bool isMain() const { return false; }
+
 		/**
 		 * @brief	Called once every frame. Internal method.
 		 */

BansheeEditor/Include/BsGUITabbedTitleBar.h

@@ -12,11 +12,10 @@ namespace BansheeEngine
 	public:
 		static const String& getGUITypeName();
 
-		static GUITabbedTitleBar* create(RenderWindow* parentWindow,
-			const String& backgroundStyle = StringUtil::BLANK, const String& tabBtnStyle = StringUtil::BLANK, 
+		static GUITabbedTitleBar* create(const String& backgroundStyle = StringUtil::BLANK, const String& tabBtnStyle = StringUtil::BLANK, 
 			const String& minBtnStyle = StringUtil::BLANK, const String& closeBtnStyle = StringUtil::BLANK);
 
-		static GUITabbedTitleBar* create(RenderWindow* parentWindow, const GUILayoutOptions& layoutOptions, 
+		static GUITabbedTitleBar* create(const GUILayoutOptions& layoutOptions, 
 			const String& backgroundStyle = StringUtil::BLANK, const String& tabBtnStyle = StringUtil::BLANK, 
 			const String& minBtnStyle = StringUtil::BLANK, const String& closeBtnStyle = StringUtil::BLANK);
 
@@ -53,7 +52,6 @@ namespace BansheeEngine
 		GUIButton* mMinBtn;
 		GUIButton* mCloseBtn;
 		GUIToggleGroupPtr mTabToggleGroup;
-		RenderWindow* mParentWindow;
 
 		EditorWidgetBase* mTempDraggedWidget;
 		UINT32 mTempDraggedTabIdx;
@@ -68,7 +66,7 @@ namespace BansheeEngine
 		String mMinimizeBtnStyle;
 		String mTabBtnStyle;
 
-		GUITabbedTitleBar(RenderWindow* parentWindow, const String& backgroundStyle, const String& tabBtnStyle, 
+		GUITabbedTitleBar(const String& backgroundStyle, const String& tabBtnStyle, 
 			const String& minBtnStyle, const String& closeBtnStyle, const GUILayoutOptions& layoutOptions);
 
 		virtual bool mouseEvent(const GUIMouseEvent& ev);

BansheeEditor/Include/BsMainEditorWindow.h

@@ -12,6 +12,11 @@ namespace BansheeEngine
 
 		void update();
 
+		/**
+		 * @copydoc	EditorWindowBase::isMain
+		 */
+		virtual bool isMain() const { return true; }
+
 		DockManager& getDockManager() const { return *mDockManager; }
 
 		static MainEditorWindow* create(const RenderWindowPtr& renderWindow);

BansheeEditor/Source/BsDockManager.cpp

@@ -22,6 +22,7 @@
 #include "BsGUISkin.h"
 #include "BsBuiltinResources.h"
 #include "BsDockManagerLayout.h"
+#include "BsEditorWindow.h"
 
 #include "BsGUISkin.h"
 #include "BsGUIButton.h"
@@ -132,10 +133,10 @@ namespace BansheeEngine
 		}
 	}
 
-	void DockManager::DockContainer::makeLeaf(GUIWidget* widgetParent, RenderWindow* parentWindow)
+	void DockManager::DockContainer::makeLeaf(GUIWidget* widgetParent, EditorWindowBase* parentWindow)
 	{
 		mIsLeaf = true;
-		mWidgets = bs_new<EditorWidgetContainer>(widgetParent, parentWindow, nullptr);
+		mWidgets = bs_new<EditorWidgetContainer>(widgetParent, parentWindow);
 
 		mWidgets->onWidgetClosed.connect(std::bind(&DockManager::DockContainer::widgetRemoved, this));
 
@@ -407,9 +408,9 @@ namespace BansheeEngine
 		}
 	}
 
-	DockManager::DockManager(RenderWindow* parentWindow, const GUILayoutOptions& layoutOptions)
-		:GUIElementContainer(layoutOptions), mParentWindow(parentWindow), mMouseOverContainer(nullptr), mHighlightedDropLoc(DockLocation::None),
-		mShowOverlay(false), mRootContainer(this)
+	DockManager::DockManager(EditorWindowBase* parentWindow, const GUILayoutOptions& layoutOptions)
+		:GUIElementContainer(layoutOptions), mMouseOverContainer(nullptr), mHighlightedDropLoc(DockLocation::None),
+		mShowOverlay(false), mRootContainer(this), mParentWindow(parentWindow)
 	{
 		mTopDropPolygon = bs_newN<Vector2>(4);
 		mBotDropPolygon = bs_newN<Vector2>(4);
@@ -431,7 +432,7 @@ namespace BansheeEngine
 		bs_deleteN(mRightDropPolygon, 4);
 	}
 
-	DockManager* DockManager::create(RenderWindow* parentWindow)
+	DockManager* DockManager::create(EditorWindowBase* parentWindow)
 	{
 		return new (bs_alloc<DockManager, PoolAlloc>()) DockManager(parentWindow, GUILayoutOptions::create());
 	}

BansheeEditor/Source/BsEditorWidget.cpp

@@ -66,7 +66,7 @@ namespace BansheeEngine
 
 	Vector2I EditorWidgetBase::screenToWidgetPos(const Vector2I& screenPos) const
 	{
-		EditorWindow* parentEditorWindow = mParent->getParentWindow();
+		EditorWindowBase* parentEditorWindow = mParent->getParentWindow();
 		RenderWindowPtr parentRenderWindow = parentEditorWindow->_getRenderWindow();
 
 		Vector2I windowPos = parentRenderWindow->screenToWindowPos(screenPos);
@@ -78,7 +78,7 @@ namespace BansheeEngine
 
 	Vector2I EditorWidgetBase::widgetToScreenPos(const Vector2I& widgetPos) const
 	{
-		EditorWindow* parentEditorWindow = mParent->getParentWindow();
+		EditorWindowBase* parentEditorWindow = mParent->getParentWindow();
 		RenderWindowPtr parentRenderWindow = parentEditorWindow->_getRenderWindow();
 
 		Vector2I windowPos = widgetPos;

BansheeEditor/Source/BsEditorWidgetContainer.cpp

@@ -16,13 +16,13 @@ namespace BansheeEngine
 {
 	const UINT32 EditorWidgetContainer::TitleBarHeight = 13;
 
-	EditorWidgetContainer::EditorWidgetContainer(GUIWidget* parent, RenderWindow* renderWindow, EditorWindow* parentEditorWindow)
+	EditorWidgetContainer::EditorWidgetContainer(GUIWidget* parent, EditorWindowBase* parentEditorWindow)
 		:mParent(parent), mX(0), mY(0), mWidth(0), mHeight(0), mTitleBar(nullptr), mActiveWidget(-1),
 		mTitleBarArea(nullptr), mParentWindow(parentEditorWindow)
 	{
 		mTitleBarArea = GUIArea::create(*parent, 0, 0, 0, 0, 9900);
 
-		mTitleBar = GUITabbedTitleBar::create(renderWindow);
+		mTitleBar = GUITabbedTitleBar::create();
 		mTitleBar->onTabActivated.connect(std::bind(&EditorWidgetContainer::tabActivated, this, _1));
 		mTitleBar->onTabClosed.connect(std::bind(&EditorWidgetContainer::tabClosed, this, _1));
 		mTitleBar->onTabDraggedOff.connect(std::bind(&EditorWidgetContainer::tabDraggedOff, this, _1));

BansheeEditor/Source/BsEditorWidgetManager.cpp

@@ -152,8 +152,8 @@ namespace BansheeEngine
 
 			entry.widgetNames = GetWidgetNamesInContainer(widgetContainer);
 
-			EditorWindow* parentWindow = widgetContainer->getParentWindow();
-			entry.isDocked = parentWindow == nullptr;
+			EditorWindowBase* parentWindow = widgetContainer->getParentWindow();
+			entry.isDocked = parentWindow->isMain(); // Assumed widget is docked if part of main window
 			
 			if(!entry.isDocked)
 			{
@@ -218,14 +218,7 @@ namespace BansheeEngine
 		{
 			EditorWidgetBase* widget = widgetData.second;
 			EditorWidgetContainer* parentContainer = widget->_getParent();
-			EditorWindow* parentWindow = parentContainer->getParentWindow();
-
-			if (parentWindow == nullptr)
-			{
-				widget->_setHasFocus(false);
-				continue;
-			}
-
+			EditorWindowBase* parentWindow = parentContainer->getParentWindow();
 			RenderWindowPtr parentRenderWindow = parentWindow->_getRenderWindow();
 			const RenderWindowProperties& props = parentRenderWindow->getProperties();
 

BansheeEditor/Source/BsEditorWindow.cpp

@@ -6,7 +6,7 @@
 namespace BansheeEngine
 {
 	EditorWindow::EditorWindow()
-		:EditorWindowBase(), mWidgets(bs_new<EditorWidgetContainer>(mGUI.get(), mRenderWindow.get(), this))
+		:EditorWindowBase(), mWidgets(bs_new<EditorWidgetContainer>(mGUI.get(), this))
 	{
 		updateSize();
 		

BansheeEditor/Source/BsGUITabbedTitleBar.cpp

@@ -21,9 +21,9 @@ namespace BansheeEngine
 	const UINT32 GUITabbedTitleBar::TAB_SPACING = 20;
 	const UINT32 GUITabbedTitleBar::OPTION_BTN_SPACING = 3;
 
-	GUITabbedTitleBar::GUITabbedTitleBar(RenderWindow* parentWindow, const String& backgroundStyle, const String& tabBtnStyle, 
+	GUITabbedTitleBar::GUITabbedTitleBar(const String& backgroundStyle, const String& tabBtnStyle, 
 		const String& minBtnStyle, const String& closeBtnStyle, const GUILayoutOptions& layoutOptions)
-		:GUIElementContainer(layoutOptions), mParentWindow(parentWindow), mMinBtn(nullptr), 
+		:GUIElementContainer(layoutOptions), mMinBtn(nullptr), 
 		mCloseBtn(nullptr), mBackgroundImage(nullptr), mUniqueTabIdx(0), mActiveTabIdx(0),
 		mDragInProgress(false), mDraggedBtn(nullptr), mDragBtnOffset(0), mInitialDragOffset(0), mBackgroundStyle(backgroundStyle),
 		mTabBtnStyle(tabBtnStyle), mMinimizeBtnStyle(minBtnStyle), mCloseBtnStyle(closeBtnStyle), mTempDraggedWidget(nullptr),
@@ -60,17 +60,17 @@ namespace BansheeEngine
 
 	}
 
-	GUITabbedTitleBar* GUITabbedTitleBar::create(RenderWindow* parentWindow, const String& backgroundStyle, 
-		const String& tabBtnStyle, const String& minBtnStyle, const String& closeBtnStyle)
+	GUITabbedTitleBar* GUITabbedTitleBar::create(const String& backgroundStyle, const String& tabBtnStyle, 
+		const String& minBtnStyle, const String& closeBtnStyle)
 	{
-		return new (bs_alloc<GUITabbedTitleBar, PoolAlloc>()) GUITabbedTitleBar(parentWindow, backgroundStyle, tabBtnStyle, 
+		return new (bs_alloc<GUITabbedTitleBar, PoolAlloc>()) GUITabbedTitleBar(backgroundStyle, tabBtnStyle, 
 			minBtnStyle, closeBtnStyle, GUILayoutOptions::create());
 	}
 
-	GUITabbedTitleBar* GUITabbedTitleBar::create(RenderWindow* parentWindow, const GUILayoutOptions& layoutOptions, 
-		const String& backgroundStyle, const String& tabBtnStyle, const String& minBtnStyle, const String& closeBtnStyle)
+	GUITabbedTitleBar* GUITabbedTitleBar::create(const GUILayoutOptions& layoutOptions, const String& backgroundStyle, 
+		const String& tabBtnStyle, const String& minBtnStyle, const String& closeBtnStyle)
 	{
-		return new (bs_alloc<GUITabbedTitleBar, PoolAlloc>()) GUITabbedTitleBar(parentWindow, backgroundStyle, tabBtnStyle, 
+		return new (bs_alloc<GUITabbedTitleBar, PoolAlloc>()) GUITabbedTitleBar(backgroundStyle, tabBtnStyle, 
 			minBtnStyle, closeBtnStyle, layoutOptions);
 	}
 

BansheeEditor/Source/BsMainEditorWindow.cpp

@@ -33,7 +33,7 @@ namespace BansheeEngine
 		:EditorWindowBase(renderWindow), mDockManager(nullptr), 
 		mMenuBar(bs_new<GUIMenuBar>(mGUI.get(), mRenderWindow.get()))
 	{
-		mDockManager = DockManager::create(mRenderWindow.get());
+		mDockManager = DockManager::create(this);
 
 		GUIArea* dockArea = GUIArea::createStretchedXY(*mGUI.get(), 0, 0, 0, 0);
 		dockArea->getLayout().addElement(mDockManager);