From: Perttu Ahola <celeron55@gmail.com>
Date: Wed, 25 Jul 2012 13:30:23 +0000 (+0300)
Subject: Improve formspec positioning
X-Git-Tag: 20-08-2020~5924
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=db62c227c81285e23bd2949551a52a433dbfd8f9;p=dragonfireclient.git

Improve formspec positioning
---

diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index 7ded2b37e..5ae336e4f 100644
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -382,9 +382,9 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
 		}
 		else if(type == "label")
 		{
-			v2s32 pos;
-			pos.X = stof(f.next(",")) * (float)spacing.X;
-			pos.Y = stof(f.next(";")) * (float)spacing.Y;
+			v2s32 pos = padding;
+			pos.X += stof(f.next(",")) * (float)spacing.X;
+			pos.Y += stof(f.next(";")) * (float)spacing.Y;
 
 			rect = core::rect<s32>(pos.X, pos.Y+((imgsize.Y/2)-15), pos.X+300, pos.Y+((imgsize.Y/2)+15));
 			
@@ -403,9 +403,9 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
 		}
 		else if(type == "button" || type == "button_exit")
 		{
-			v2s32 pos;
-			pos.X = stof(f.next(",")) * (float)spacing.X;
-			pos.Y = stof(f.next(";")) * (float)spacing.Y;
+			v2s32 pos = padding;
+			pos.X += stof(f.next(",")) * (float)spacing.X;
+			pos.Y += stof(f.next(";")) * (float)spacing.Y;
 			v2s32 geom;
 			geom.X = (stof(f.next(",")) * (float)spacing.X)-(spacing.X-imgsize.X);
 			pos.Y += (stof(f.next(";")) * (float)imgsize.Y)/2;
@@ -431,9 +431,9 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
 		}
 		else if(type == "image_button" || type == "image_button_exit")
 		{
-			v2s32 pos;
-			pos.X = stof(f.next(",")) * (float)spacing.X;
-			pos.Y = stof(f.next(";")) * (float)spacing.Y;
+			v2s32 pos = padding;
+			pos.X += stof(f.next(",")) * (float)spacing.X;
+			pos.Y += stof(f.next(";")) * (float)spacing.Y;
 			v2s32 geom;
 			geom.X = (stof(f.next(",")) * (float)spacing.X)-(spacing.X-imgsize.X);
 			geom.Y = (stof(f.next(";")) * (float)spacing.Y)-(spacing.Y-imgsize.Y);
@@ -890,14 +890,14 @@ bool GUIFormSpecMenu::OnEvent(const SEvent& event)
 
 			InventoryList *list = inv_s->getList(s.listname);
 			if(list == NULL){
-				errorstream<<"InventoryMenu: The selected inventory list \""
+				verbosestream<<"InventoryMenu: The selected inventory list \""
 						<<s.listname<<"\" does not exist"<<std::endl;
 				s.i = -1;  // make it invalid again
 				break;
 			}
 
 			if((u32)s.i >= list->getSize()){
-				errorstream<<"InventoryMenu: The selected inventory list \""
+				infostream<<"InventoryMenu: The selected inventory list \""
 						<<s.listname<<"\" is too small (i="<<s.i<<", size="
 						<<list->getSize()<<")"<<std::endl;
 				s.i = -1;  // make it invalid again