From d2431e9f1cd0828c682a9df6a1bf99f9e0e7d6f6 Mon Sep 17 00:00:00 2001
From: Emil Kabirov <emil.kabirov@fishrungames.com>
Date: Thu, 18 Oct 2018 20:22:47 +0500
Subject: [PATCH] fixes

---
 assets/gui_game_pause_menu.json |  7 +++----
 game/gamecode.cpp               | 23 +++++++++++++++++++++--
 game/main_code.cpp              | 31 +++++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/assets/gui_game_pause_menu.json b/assets/gui_game_pause_menu.json
index 4da31b2..a2e6ba7 100755
--- a/assets/gui_game_pause_menu.json
+++ b/assets/gui_game_pause_menu.json
@@ -29,11 +29,10 @@
 			"touchTransparency": 0,
 			"visible": 0,
 			"zLevel": 10,
-			"marginTop" : 20,
-			"marginBottom" : 20,
-			"marginLeft" : 20,
-			"marginRight" : 20,
+			"marginLeft" : 0,
 			"itemSpacing": 20,
+			"horizontalAlignment": "HA_LEFT",
+			"verticalAlignment": "VA_BOTTOM",
 			"children" : [
 			{
 				"type": "Button",
diff --git a/game/gamecode.cpp b/game/gamecode.cpp
index 9b27cc1..2709c15 100755
--- a/game/gamecode.cpp
+++ b/game/gamecode.cpp
@@ -766,7 +766,7 @@ void TGameLevel::InitLevel(int screenWidth, int screenHeight)
 	//float LEVEL_VIEWPORT_WIDTH = Application->GetGameLevelScreenWidth();
 	//float LEVEL_VIEWPORT_HEIGHT = Application->GetGameLevelScreenHeight();
 	ReflectorPos = { 0.5f, 43.5 / Application->GetGameLevelScreenHeight() }; // Vector2f(screenWidth*0.5f, 16 * LEVEL_VIEWPORT_HEIGHT / 320.f + 13 * LEVEL_VIEWPORT_HEIGHT / 320.f);
-    Vector2f ballPos = Vector2f(screenWidth*0.5f, 80* 480/320.f);
+    Vector2f ballPos = Vector2f(768*0.5f, 80* 480/320.f);
     
     BallList.clear();
     BallList.push_back(TBall(ballPos, Vector2f(0, 0), BallColor));
@@ -1182,14 +1182,33 @@ void TGameLevel::DrawBuffer()
     
     RenderUniform1f("Brightness", brightness);
     glBindTexture(GL_TEXTURE_2D,ResourceManager->FrameManager.GetFrameTexture("LevelBuffer"));
+
+	float screenRatio = Renderer->GetMatrixWidth() / (float)Renderer->GetMatrixHeight();
+	float screenRatioToFixedRatio = screenRatio / 1.6f;
+	Vector2f offset;
+	float scale;
+	if (screenRatioToFixedRatio > 1.f)
+	{
+		offset[0] = (Renderer->GetMatrixWidth() - Renderer->GetMatrixWidth() / screenRatioToFixedRatio) / 2.f;
+		offset[1] = 0;
+		scale = Renderer->GetMatrixHeight() / 480.f;
+	}
+	else
+	{
+		offset[0] = 0;
+		offset[1] = 0;// (screenHeight - screenHeight * screenRatioToFixedRatio) / 2.f;
+		scale = Renderer->GetMatrixWidth() / 768.f;
+	}
     
 	//Matrix switched to identity
     //Vector2f RectPos = Vector2f(-1, -1);
     //Vector2f RectSize = Vector2f(2, 2);
 	float x_levelScreenCenter = Renderer->GetScreenWidth()*0.5f;
 	float y_levelScreenCenter = Renderer->GetScreenHeight()*0.5f;
+	float x_levelScreenSize = x_levelScreenCenter - offset[0];
+	float y_levelScreenSize = y_levelScreenCenter - offset[1];
 	Vector2f RectPos = Vector2f(x_levelScreenCenter, y_levelScreenCenter);
-	Vector2f RectSize = Vector2f(x_levelScreenCenter, y_levelScreenCenter);
+	Vector2f RectSize = Vector2f(x_levelScreenSize, y_levelScreenSize);
 
     Renderer->DrawRect(RectPos-RectSize, RectPos+RectSize);
 
diff --git a/game/main_code.cpp b/game/main_code.cpp
index 1db39c3..15100c4 100755
--- a/game/main_code.cpp
+++ b/game/main_code.cpp
@@ -139,6 +139,23 @@ void TMyApplication::InnerChangeWidthHeight(int screenWidth, int screenHeight, f
 {
 	Menu.GalaxMenu.UpdateGalaxyMenu(matrixWidth, matrixHeight, 0);
 	SetGameLevelScreenScale();
+
+	float screenRatio = Renderer->GetMatrixWidth() / (float)Renderer->GetMatrixHeight();
+	float screenRatioToFixedRatio = screenRatio / 1.6f;
+	float marginLeft;
+	if (screenRatioToFixedRatio > 1.f)
+	{
+		marginLeft = (Renderer->GetMatrixWidth() - Renderer->GetMatrixWidth() / screenRatioToFixedRatio) / 2.f;
+	}
+	else
+	{
+		marginLeft = 0;
+	}
+
+	if (GameState == CONST_GAMESTATE_LEVEL)
+	{
+		ResourceManager->newGuiManager.findWidgetByName("buttonList")->setMargin(0, 0, marginLeft, 0);
+	}
 }
 
 void TMyApplication::InnerInit()
@@ -605,6 +622,20 @@ void TMyApplication::InnerUpdate(size_t dt)
 			auto gameFrame = (WidgetAncestor*)ResourceManager->newGuiManager.findWidgetByName("gameFrame").get();
 			auto pauseBackground = (WidgetAncestor*)ResourceManager->newGuiManager.findWidgetByName("buttonList").get();
 
+			float screenRatio = Renderer->GetMatrixWidth() / (float)Renderer->GetMatrixHeight();
+			float screenRatioToFixedRatio = screenRatio / 1.6f;
+			float marginLeft;
+			if (screenRatioToFixedRatio > 1.f)
+			{
+				marginLeft = (Renderer->GetMatrixWidth() - Renderer->GetMatrixWidth() / screenRatioToFixedRatio) / 2.f;
+			}
+			else
+			{
+				marginLeft = 0;
+			}
+
+			pauseBackground->setMargin(0, 0, marginLeft, 0);
+
 			pauseButton->onMouseDownSignal.connect([this, gameFrame, pauseBackground](Vector2f, int) {
 				GameLevel->SetPause();