diff --git a/apps/openmw/mwgui/quickkeysmenu.cpp b/apps/openmw/mwgui/quickkeysmenu.cpp
index 63cc14d98..619540cff 100644
--- a/apps/openmw/mwgui/quickkeysmenu.cpp
+++ b/apps/openmw/mwgui/quickkeysmenu.cpp
@@ -370,7 +370,8 @@ namespace MWGui
mCancelButton->eventMouseButtonClick += MyGUI::newDelegate(mParent, &QuickKeysMenu::onCancelButtonClicked);
- int maxWidth = mItemButton->getTextSize ().width + 24;
+ int maxWidth = mLabel->getTextSize ().width + 24;
+ maxWidth = std::max(maxWidth, mItemButton->getTextSize ().width + 24);
maxWidth = std::max(maxWidth, mMagicButton->getTextSize ().width + 24);
maxWidth = std::max(maxWidth, mUnassignButton->getTextSize ().width + 24);
maxWidth = std::max(maxWidth, mCancelButton->getTextSize ().width + 24);
diff --git a/apps/openmw/mwgui/spellview.cpp b/apps/openmw/mwgui/spellview.cpp
index 9932cddfa..ebda8873c 100644
--- a/apps/openmw/mwgui/spellview.cpp
+++ b/apps/openmw/mwgui/spellview.cpp
@@ -96,9 +96,9 @@ namespace MWGui
if (spell.mType == Spell::Type_Power)
addGroup("#{sPowers}", "");
else if (spell.mType == Spell::Type_Spell)
- addGroup("#{sSpells}", "#{sCostChance}");
+ addGroup("#{sSpells}", mShowCostColumn ? "#{sCostChance}" : "");
else
- addGroup("#{sMagicItem}", "#{sCostCharge}");
+ addGroup("#{sMagicItem}", mShowCostColumn ? "#{sCostCharge}" : "");
curType = spell.mType;
}
diff --git a/files/mygui/openmw_list.skin.xml b/files/mygui/openmw_list.skin.xml
index 8a238879c..5b6f14dd5 100644
--- a/files/mygui/openmw_list.skin.xml
+++ b/files/mygui/openmw_list.skin.xml
@@ -150,6 +150,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/files/mygui/openmw_magicselection_dialog.layout b/files/mygui/openmw_magicselection_dialog.layout
index 5301ecfe9..027250d7a 100644
--- a/files/mygui/openmw_magicselection_dialog.layout
+++ b/files/mygui/openmw_magicselection_dialog.layout
@@ -1,6 +1,6 @@
-
+
diff --git a/files/mygui/openmw_quickkeys_menu_assign.layout b/files/mygui/openmw_quickkeys_menu_assign.layout
index 4bbd9f1fa..2c80fefcd 100644
--- a/files/mygui/openmw_quickkeys_menu_assign.layout
+++ b/files/mygui/openmw_quickkeys_menu_assign.layout
@@ -1,6 +1,6 @@
-
+
diff --git a/files/mygui/openmw_resources.xml b/files/mygui/openmw_resources.xml
index ef11d10a0..437c0945b 100644
--- a/files/mygui/openmw_resources.xml
+++ b/files/mygui/openmw_resources.xml
@@ -114,6 +114,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/files/mygui/openmw_savegame_dialog.layout b/files/mygui/openmw_savegame_dialog.layout
index f18218430..28e1e5188 100644
--- a/files/mygui/openmw_savegame_dialog.layout
+++ b/files/mygui/openmw_savegame_dialog.layout
@@ -16,7 +16,7 @@
-
+