From: Perttu Ahola <celeron55@gmail.com>
Date: Thu, 15 Mar 2012 11:18:21 +0000 (+0200)
Subject: Use a more standard order of yes/no/cancel/whatever buttons in dialogs
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=8551ddc839dc3b35a3f33a3bb4ff33f8d9c5f87d;p=zefram%2Fminetest%2Fminetest_engine.git

Use a more standard order of yes/no/cancel/whatever buttons in dialogs
---

diff --git a/src/guiConfirmMenu.cpp b/src/guiConfirmMenu.cpp
index 2ca4e179..00e26ac4 100644
--- a/src/guiConfirmMenu.cpp
+++ b/src/guiConfirmMenu.cpp
@@ -106,15 +106,15 @@ void GUIConfirmMenu::regenerateGui(v2u32 screensize)
 	int bw = 100;
 	{
 		core::rect<s32> rect(0, 0, bw, 30);
-		rect = rect + v2s32(size.X/2-bw/2-bw/2-5, size.Y/2-30/2+25);
-		Environment->addButton(rect, this, GUI_ID_NO,
-			wgettext("No"));
+		rect = rect + v2s32(size.X/2-bw/2-(bw/2+5), size.Y/2-30/2+25);
+		Environment->addButton(rect, this, GUI_ID_YES,
+			wgettext("Yes"));
 	}
 	{
 		core::rect<s32> rect(0, 0, bw, 30);
-		rect = rect + v2s32(size.X/2-bw/2+bw/2+5, size.Y/2-30/2+25);
-		Environment->addButton(rect, this, GUI_ID_YES,
-			wgettext("Yes"));
+		rect = rect + v2s32(size.X/2-bw/2+(bw/2+5), size.Y/2-30/2+25);
+		Environment->addButton(rect, this, GUI_ID_NO,
+			wgettext("No"));
 	}
 	changeCtype("C");
 }
diff --git a/src/guiCreateWorld.cpp b/src/guiCreateWorld.cpp
index 159e736c..5c70b7c5 100644
--- a/src/guiCreateWorld.cpp
+++ b/src/guiCreateWorld.cpp
@@ -155,14 +155,14 @@ void GUICreateWorld::regenerateGui(v2u32 screensize)
 	{
 		core::rect<s32> rect(0, 0, 120, 30);
 		rect = rect + v2s32(170, 140) + topleft;
-		Environment->addButton(rect, this, GUI_ID_CANCEL,
-			wgettext("Cancel"));
+		Environment->addButton(rect, this, GUI_ID_CREATE,
+			wgettext("Create"));
 	}
 	{
 		core::rect<s32> rect(0, 0, 120, 30);
 		rect = rect + v2s32(300, 140) + topleft;
-		Environment->addButton(rect, this, GUI_ID_CREATE,
-			wgettext("Create"));
+		Environment->addButton(rect, this, GUI_ID_CANCEL,
+			wgettext("Cancel"));
 	}
 	changeCtype("C");
 }