From 29da8b6f2ac614a4828df288a126bfe2de90bfe1 Mon Sep 17 00:00:00 2001
From: turanszkij <turanszkij@gmail.com>
Date: Sun, 28 Oct 2018 12:07:26 +0000
Subject: [PATCH] fixed some gui issues

---
 WickedEngine/wiFont.h      |  4 ++--
 WickedEngine/wiVersion.cpp |  2 +-
 WickedEngine/wiWidget.cpp  | 43 +++++++++++++++++++++++++++-----------
 3 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/WickedEngine/wiFont.h b/WickedEngine/wiFont.h
index 15c97a542..64fd97828 100644
--- a/WickedEngine/wiFont.h
+++ b/WickedEngine/wiFont.h
@@ -72,8 +72,8 @@ public:
 	int textWidth();
 	int textHeight();
 
-	static void addFontStyle( const std::string& toAdd );
-	static int getFontStyleByName( const std::string& get );
+	static void addFontStyle(const std::string& toAdd);
+	static int getFontStyleByName(const std::string& get);
 
 	void SetText(const std::string& text);
 	void SetText(const std::wstring& text);
diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp
index b31c92648..424021fc0 100644
--- a/WickedEngine/wiVersion.cpp
+++ b/WickedEngine/wiVersion.cpp
@@ -9,7 +9,7 @@ namespace wiVersion
 	// minor features, major updates
 	const int minor = 21;
 	// minor bug fixes, alterations, refactors, updates
-	const int revision = 24;
+	const int revision = 25;
 
 
 	long GetVersion()
diff --git a/WickedEngine/wiWidget.cpp b/WickedEngine/wiWidget.cpp
index 2e9c7e3f6..1950acb8c 100644
--- a/WickedEngine/wiWidget.cpp
+++ b/WickedEngine/wiWidget.cpp
@@ -104,6 +104,14 @@ void wiWidget::RenderTooltip(wiGUI* gui)
 		{
 			tooltipFont.SetText(tooltip + "\n" + scriptTip);
 		}
+
+		int textWidth = tooltipFont.textWidth();
+		if (tooltipPos.x > wiRenderer::GetDevice()->GetScreenWidth() - textWidth)
+		{
+			tooltipPos.x -= textWidth + 10;
+			tooltipFont.props.posX = (int)tooltipPos.x;
+		}
+
 		static const float _border = 2;
 		float fontWidth = (float)tooltipFont.textWidth() + _border * 2;
 		float fontHeight = (float)tooltipFont.textHeight() + _border * 2;
@@ -1272,9 +1280,13 @@ wiWindow::wiWindow(wiGUI* gui, const std::string& name) :wiWidget()
 	moveDragger->SetText("");
 	moveDragger->SetSize(XMFLOAT2(scale.x - windowcontrolSize * 3, windowcontrolSize));
 	moveDragger->SetPos(XMFLOAT2(windowcontrolSize, 0));
-	moveDragger->OnDrag([this](wiEventArgs args) {
+	moveDragger->OnDrag([this, gui](wiEventArgs args) {
 		this->Translate(XMFLOAT3(args.deltaPos.x, args.deltaPos.y, 0));
-		this->UpdateTransform();
+		this->wiWidget::Update(gui, 0);
+		for (auto& x : this->childrenWidgets)
+		{
+			x->wiWidget::Update(gui, 0);
+		}
 	});
 	AddWidget(moveDragger);
 
@@ -1305,13 +1317,17 @@ wiWindow::wiWindow(wiGUI* gui, const std::string& name) :wiWidget()
 	resizeDragger_UpperLeft->SetText("");
 	resizeDragger_UpperLeft->SetSize(XMFLOAT2(windowcontrolSize, windowcontrolSize));
 	resizeDragger_UpperLeft->SetPos(XMFLOAT2(0, 0));
-	resizeDragger_UpperLeft->OnDrag([this](wiEventArgs args) {
+	resizeDragger_UpperLeft->OnDrag([this, gui](wiEventArgs args) {
 		XMFLOAT2 scaleDiff;
 		scaleDiff.x = (scale.x - args.deltaPos.x) / scale.x;
 		scaleDiff.y = (scale.y - args.deltaPos.y) / scale.y;
 		this->Translate(XMFLOAT3(args.deltaPos.x, args.deltaPos.y, 0));
 		this->Scale(XMFLOAT3(scaleDiff.x, scaleDiff.y, 1));
-		this->UpdateTransform();
+		this->wiWidget::Update(gui, 0);
+		for (auto& x : this->childrenWidgets)
+		{
+			x->wiWidget::Update(gui, 0);
+		}
 	});
 	AddWidget(resizeDragger_UpperLeft);
 
@@ -1320,12 +1336,16 @@ wiWindow::wiWindow(wiGUI* gui, const std::string& name) :wiWidget()
 	resizeDragger_BottomRight->SetText("");
 	resizeDragger_BottomRight->SetSize(XMFLOAT2(windowcontrolSize, windowcontrolSize));
 	resizeDragger_BottomRight->SetPos(XMFLOAT2(translation.x + scale.x - windowcontrolSize, translation.y + scale.y - windowcontrolSize));
-	resizeDragger_BottomRight->OnDrag([this](wiEventArgs args) {
+	resizeDragger_BottomRight->OnDrag([this, gui](wiEventArgs args) {
 		XMFLOAT2 scaleDiff;
 		scaleDiff.x = (scale.x + args.deltaPos.x) / scale.x;
 		scaleDiff.y = (scale.y + args.deltaPos.y) / scale.y;
 		this->Scale(XMFLOAT3(scaleDiff.x, scaleDiff.y, 1));
-		this->UpdateTransform();
+		this->wiWidget::Update(gui, 0);
+		for (auto& x : this->childrenWidgets)
+		{
+			x->wiWidget::Update(gui, 0);
+		}
 	});
 	AddWidget(resizeDragger_BottomRight);
 
@@ -1404,18 +1424,17 @@ void wiWindow::Update(wiGUI* gui, float dt)
 	//	minimizeButton->scale.y = windowcontrolSize;
 	//}
 
-
-	if (!IsEnabled())
-	{
-		return;
-	}
-
 	for (auto& x : childrenWidgets)
 	{
 		x->Update(gui, dt);
 		x->SetScissorRect(scissorRect);
 	}
 
+	if (!IsEnabled())
+	{
+		return;
+	}
+
 	if (gui->IsWidgetDisabled(this))
 	{
 		return;