summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gui/setup_input.cpp11
-rw-r--r--src/input/inputmanager.cpp2
2 files changed, 10 insertions, 3 deletions
diff --git a/src/gui/setup_input.cpp b/src/gui/setup_input.cpp
index ad2e3f7d9..6be11a6ba 100644
--- a/src/gui/setup_input.cpp
+++ b/src/gui/setup_input.cpp
@@ -125,6 +125,8 @@ Setup_Input::Setup_Input(const Widget2 *const widget) :
mKeyListModel->setSize(mActionDataSize[0]);
refreshKeys();
+ if (gui)
+ mKeyList->setFont(reinterpret_cast<gcn::Font*>(gui->getHelpFont()));
mKeyList->addActionListener(this);
mScrollArea->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
@@ -315,8 +317,13 @@ void Setup_Input::refreshAssignedKey(const int index)
}
else
{
- mKeyListModel->setElementAt(index, strprintf("%s: %s",
- gettext(key.name.c_str()),
+ std::string str = gettext(key.name.c_str());
+ int sz = 20;
+ if (mainGraphics->mWidth > 800)
+ sz = 30;
+ while (str.size() < sz)
+ str.append(" ");
+ mKeyListModel->setElementAt(index, strprintf("%s: %s", str.c_str(),
inputManager.getKeyStringLong(key.actionId).c_str()));
}
}
diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp
index 66bd67efb..a731dc1f5 100644
--- a/src/input/inputmanager.cpp
+++ b/src/input/inputmanager.cpp
@@ -372,7 +372,7 @@ std::string InputManager::getKeyStringLong(const int index) const
if (keyStr.empty())
keyStr = str;
else
- keyStr.append(" ").append(str);
+ keyStr.append(", ").append(str);
}
}