diff options
| author | Erik Schilling <ablu.erikschilling@googlemail.com> | 2012-05-21 18:49:56 +0200 |
|---|---|---|
| committer | Erik Schilling <ablu.erikschilling@googlemail.com> | 2012-05-21 18:49:56 +0200 |
| commit | eab4971993edade67edc9445624f6ca28c4b30fe (patch) | |
| tree | 95d70fb874e6933b04cbe03fa08c38a54bfc7e21 | |
| parent | 1875fcbe40227bc5d96d3491ddb566a5c4c2716e (diff) | |
| parent | 8ea225abccc148a9b24c6901afb2be3b44362a37 (diff) | |
| download | mana-eab4971993edade67edc9445624f6ca28c4b30fe.tar.gz mana-eab4971993edade67edc9445624f6ca28c4b30fe.tar.bz2 mana-eab4971993edade67edc9445624f6ca28c4b30fe.tar.xz mana-eab4971993edade67edc9445624f6ca28c4b30fe.zip | |
Merge branch '0.6'
| -rw-r--r-- | src/defaults.cpp | 4 | ||||
| -rw-r--r-- | src/gui/windowmenu.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/defaults.cpp b/src/defaults.cpp index 3cab9f97..0dc8e3ed 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -109,8 +109,8 @@ DefaultsData* getConfigDefaults() AddDEF(configData, "whispertab", true); AddDEF(configData, "customcursor", true); AddDEF(configData, "showownname", false); - AddDEF(configData, "showpickupparticle", false); - AddDEF(configData, "showpickupchat", true); + AddDEF(configData, "showpickupparticle", true); + AddDEF(configData, "showpickupchat", false); AddDEF(configData, "fontSize", 12); AddDEF(configData, "ReturnToggles", false); AddDEF(configData, "ScrollLaziness", 16); diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp index 930e9e0e..12624bf1 100644 --- a/src/gui/windowmenu.cpp +++ b/src/gui/windowmenu.cpp @@ -72,7 +72,7 @@ WindowMenu::WindowMenu(): addButton(N_("Setup"), x, h, "button-icon-setup.png", KeyboardConfig::KEY_WINDOW_SETUP); - setDimension(gcn::Rectangle(graphics->getWidth() - x - 3, 3, + setDimension(gcn::Rectangle(graphics->getWidth() - x, 3, x - 3, h)); setVisible(true); } |