summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2012-03-15 13:18:21 +0200
committerPerttu Ahola <celeron55@gmail.com>2012-03-15 13:18:21 +0200
commit8551ddc839dc3b35a3f33a3bb4ff33f8d9c5f87d (patch)
tree9f3249bf74836ab0134706e0a1cf729f6df2997a
parenteea3277b81625277b634d1f5409b46075ebe28ff (diff)
downloadminetest-8551ddc839dc3b35a3f33a3bb4ff33f8d9c5f87d.tar.gz
minetest-8551ddc839dc3b35a3f33a3bb4ff33f8d9c5f87d.tar.bz2
minetest-8551ddc839dc3b35a3f33a3bb4ff33f8d9c5f87d.zip
Use a more standard order of yes/no/cancel/whatever buttons in dialogs
-rw-r--r--src/guiConfirmMenu.cpp12
-rw-r--r--src/guiCreateWorld.cpp8
2 files changed, 10 insertions, 10 deletions
diff --git a/src/guiConfirmMenu.cpp b/src/guiConfirmMenu.cpp
index 2ca4e1791..00e26ac42 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 159e736c3..5c70b7c50 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");
}