From 9179a019dfc60e457134bf8721c207bac70178d4 Mon Sep 17 00:00:00 2001 From: Andrei Kortunov Date: Sun, 16 Jul 2017 13:11:34 +0400 Subject: [PATCH 1/3] Quick keys menu fixes --- apps/openmw/mwgui/quickkeysmenu.cpp | 3 ++- files/mygui/openmw_quickkeys_menu_assign.layout | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) 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/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 @@ - + From 2b22d10ebc212ae2682f5c1b133c5f1c1b9cbfab Mon Sep 17 00:00:00 2001 From: Andrei Kortunov Date: Sun, 16 Jul 2017 13:14:19 +0400 Subject: [PATCH 2/3] Spellview fixes --- apps/openmw/mwgui/spellview.cpp | 4 ++-- files/mygui/openmw_magicselection_dialog.layout | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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_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 @@ - + From 5bb9f1b187d563d48d16bac0abb0baeee35a6e70 Mon Sep 17 00:00:00 2001 From: Andrei Kortunov Date: Sun, 16 Jul 2017 13:18:59 +0400 Subject: [PATCH 3/3] Make popup in character select menu non-transparent --- files/mygui/openmw_list.skin.xml | 13 +++++++++++++ files/mygui/openmw_resources.xml | 18 ++++++++++++++++++ files/mygui/openmw_savegame_dialog.layout | 2 +- 3 files changed, 32 insertions(+), 1 deletion(-) 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_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 @@ - +