diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp index 5a5da8ea1..4931c6787 100644 --- a/apps/openmw/mwgui/dialogue.cpp +++ b/apps/openmw/mwgui/dialogue.cpp @@ -25,6 +25,16 @@ #include "journalbooks.hpp" // to_utf8_span +namespace +{ + + MyGUI::Colour getTextColour (const std::string& type) + { + return MyGUI::Colour::parse(MyGUI::LanguageManager::getInstance().replaceTags("#{fontcolour=" + type + "}")); + } + +} + namespace MWGui { @@ -102,7 +112,7 @@ namespace MWGui void Response::write(BookTypesetter::Ptr typesetter, KeywordSearchT* keywordSearch, std::map& topicLinks) const { - BookTypesetter::Style* title = typesetter->createStyle("", MyGUI::Colour(223/255.f, 201/255.f, 159/255.f)); + BookTypesetter::Style* title = typesetter->createStyle("", getTextColour("header")); typesetter->sectionBreak(9); if (mTitle != "") typesetter->write(title, to_utf8_span(mTitle.c_str())); @@ -146,14 +156,14 @@ namespace MWGui if (hyperLinks.size() && MWBase::Environment::get().getWindowManager()->getTranslationDataStorage().hasTranslation()) { - BookTypesetter::Style* style = typesetter->createStyle("", MyGUI::Colour(202/255.f, 165/255.f, 96/255.f)); + BookTypesetter::Style* style = typesetter->createStyle("", getTextColour("normal")); size_t formatted = 0; // points to the first character that is not laid out yet for (std::map::iterator it = hyperLinks.begin(); it != hyperLinks.end(); ++it) { intptr_t topicId = it->second; - const MyGUI::Colour linkHot (143/255.f, 155/255.f, 218/255.f); - const MyGUI::Colour linkNormal (112/255.f, 126/255.f, 207/255.f); - const MyGUI::Colour linkActive (175/255.f, 184/255.f, 228/255.f); + const MyGUI::Colour linkHot (getTextColour("link_over")); + const MyGUI::Colour linkNormal (getTextColour("link")); + const MyGUI::Colour linkActive (getTextColour("link_pressed")); BookTypesetter::Style* hotStyle = typesetter->createHotStyle (style, linkNormal, linkHot, linkActive, topicId); if (formatted < it->first.first) typesetter->write(style, formatted, it->first.first); @@ -185,11 +195,11 @@ namespace MWGui void Response::addTopicLink(BookTypesetter::Ptr typesetter, intptr_t topicId, size_t begin, size_t end) const { - BookTypesetter::Style* style = typesetter->createStyle("", MyGUI::Colour(202/255.f, 165/255.f, 96/255.f)); + BookTypesetter::Style* style = typesetter->createStyle("", getTextColour("normal")); - const MyGUI::Colour linkHot (143/255.f, 155/255.f, 218/255.f); - const MyGUI::Colour linkNormal (112/255.f, 126/255.f, 207/255.f); - const MyGUI::Colour linkActive (175/255.f, 184/255.f, 228/255.f); + const MyGUI::Colour linkHot (getTextColour("link_over")); + const MyGUI::Colour linkNormal (getTextColour("link")); + const MyGUI::Colour linkActive (getTextColour("link_pressed")); if (topicId) style = typesetter->createHotStyle (style, linkNormal, linkHot, linkActive, topicId); @@ -203,7 +213,7 @@ namespace MWGui void Message::write(BookTypesetter::Ptr typesetter, KeywordSearchT* keywordSearch, std::map& topicLinks) const { - BookTypesetter::Style* title = typesetter->createStyle("", MyGUI::Colour(223/255.f, 201/255.f, 159/255.f)); + BookTypesetter::Style* title = typesetter->createStyle("", getTextColour("notify")); typesetter->sectionBreak(9); typesetter->write(title, to_utf8_span(mText.c_str())); } @@ -506,9 +516,9 @@ namespace MWGui typesetter->sectionBreak(9); // choices - const MyGUI::Colour linkHot (223/255.f, 201/255.f, 159/255.f); - const MyGUI::Colour linkNormal (150/255.f, 50/255.f, 30/255.f); - const MyGUI::Colour linkActive (243/255.f, 237/255.f, 221/255.f); + const MyGUI::Colour linkHot (getTextColour("answer_over")); + const MyGUI::Colour linkNormal (getTextColour("answer")); + const MyGUI::Colour linkActive (getTextColour("answer_pressed")); for (std::vector >::iterator it = mChoices.begin(); it != mChoices.end(); ++it) { Choice* link = new Choice(it->second); @@ -621,8 +631,7 @@ namespace MWGui dispositionVisible = true; mDispositionBar->setProgressRange(100); mDispositionBar->setProgressPosition(MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mPtr)); - mDispositionText->eraseText(0, mDispositionText->getTextLength()); - mDispositionText->addText("#B29154"+boost::lexical_cast(MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mPtr))+std::string("/100")+"#B29154"); + mDispositionText->setCaption(boost::lexical_cast(MWBase::Environment::get().getMechanicsManager()->getDerivedDisposition(mPtr))+std::string("/100")); } bool dispositionWasVisible = mDispositionBar->getVisible(); @@ -666,8 +675,7 @@ namespace MWGui + MWBase::Environment::get().getDialogueManager()->getTemporaryDispositionChange())); mDispositionBar->setProgressRange(100); mDispositionBar->setProgressPosition(disp); - mDispositionText->eraseText(0, mDispositionText->getTextLength()); - mDispositionText->addText("#B29154"+boost::lexical_cast(disp)+std::string("/100")+"#B29154"); + mDispositionText->setCaption(boost::lexical_cast(disp)+std::string("/100")); } } } diff --git a/apps/openmw/mwgui/journalbooks.cpp b/apps/openmw/mwgui/journalbooks.cpp index 7ffe9e6a4..34a852562 100644 --- a/apps/openmw/mwgui/journalbooks.cpp +++ b/apps/openmw/mwgui/journalbooks.cpp @@ -1,10 +1,13 @@ #include "journalbooks.hpp" +#include + namespace { - const MyGUI::Colour linkHot (0.40f, 0.40f, 0.80f); - const MyGUI::Colour linkNormal (0.20f, 0.20f, 0.60f); - const MyGUI::Colour linkActive (0.50f, 0.50f, 1.00f); + MyGUI::Colour getTextColour (const std::string& type) + { + return MyGUI::Colour::parse(MyGUI::LanguageManager::getInstance().replaceTags("#{fontcolour=" + type + "}")); + } struct AddContent { @@ -28,6 +31,10 @@ namespace { MWGui::BookTypesetter::Style* style = mBodyStyle; + static const MyGUI::Colour linkHot (getTextColour("journal_link_over")); + static const MyGUI::Colour linkNormal (getTextColour("journal_link")); + static const MyGUI::Colour linkActive (getTextColour("journal_link_pressed")); + if (topicId) style = mTypesetter->createHotStyle (mBodyStyle, linkNormal, linkHot, linkActive, topicId); @@ -132,22 +139,6 @@ namespace mTypesetter->sectionBreak (10); } }; - - struct AddTopicLink : AddContent - { - AddTopicLink (MWGui::BookTypesetter::Ptr typesetter, MWGui::BookTypesetter::Style* style) : - AddContent (typesetter, style) - { - } - - void operator () (MWGui::JournalViewModel::TopicId topicId, MWGui::JournalViewModel::Utf8Span name) - { - MWGui::BookTypesetter::Style* link = mTypesetter->createHotStyle (mBodyStyle, MyGUI::Colour::Black, linkHot, linkActive, topicId); - - mTypesetter->write (link, name); - mTypesetter->lineBreak (); - } - }; } namespace MWGui @@ -242,7 +233,11 @@ book JournalBooks::createTopicIndexBook () sprintf (buffer, "( %c )", ch); - BookTypesetter::Style* style = typesetter->createHotStyle (body, MyGUI::Colour::Black, linkHot, linkActive, ch); + MyGUI::Colour linkHot (getTextColour("journal_topic_over")); + MyGUI::Colour linkActive (getTextColour("journal_topic_pressed")); + MyGUI::Colour linkNormal (getTextColour("journal_topic")); + + BookTypesetter::Style* style = typesetter->createHotStyle (body, linkNormal, linkHot, linkActive, ch); if (i == 13) typesetter->sectionBreak (); diff --git a/apps/openmw/mwgui/quickkeysmenu.cpp b/apps/openmw/mwgui/quickkeysmenu.cpp index 1ff94616c..440165e74 100644 --- a/apps/openmw/mwgui/quickkeysmenu.cpp +++ b/apps/openmw/mwgui/quickkeysmenu.cpp @@ -600,7 +600,7 @@ namespace MWGui for (std::vector::const_iterator it = powers.begin(); it != powers.end(); ++it) { const ESM::Spell* spell = esmStore.get().find(*it); - MyGUI::Button* t = mMagicList->createWidget("SpellText", + MyGUI::Button* t = mMagicList->createWidget("SandTextButton", MyGUI::IntCoord(4, mHeight, mWidth-8, spellHeight), MyGUI::Align::Left | MyGUI::Align::Top); t->setCaption(spell->mName); t->setTextAlign(MyGUI::Align::Left); @@ -617,7 +617,7 @@ namespace MWGui for (std::vector::const_iterator it = spellList.begin(); it != spellList.end(); ++it) { const ESM::Spell* spell = esmStore.get().find(*it); - MyGUI::Button* t = mMagicList->createWidget("SpellText", + MyGUI::Button* t = mMagicList->createWidget("SandTextButton", MyGUI::IntCoord(4, mHeight, mWidth-8, spellHeight), MyGUI::Align::Left | MyGUI::Align::Top); t->setCaption(spell->mName); t->setTextAlign(MyGUI::Align::Left); @@ -648,7 +648,7 @@ namespace MWGui } } - MyGUI::Button* t = mMagicList->createWidget(equipped ? "SpellText" : "SpellTextUnequipped", + MyGUI::Button* t = mMagicList->createWidget(equipped ? "SandTextButton" : "SpellTextUnequipped", MyGUI::IntCoord(4, mHeight, mWidth-8, spellHeight), MyGUI::Align::Left | MyGUI::Align::Top); t->setCaption(item.getClass().getName(item)); t->setTextAlign(MyGUI::Align::Left); diff --git a/apps/openmw/mwgui/spellwindow.cpp b/apps/openmw/mwgui/spellwindow.cpp index bca24a3b6..97ebbcde2 100644 --- a/apps/openmw/mwgui/spellwindow.cpp +++ b/apps/openmw/mwgui/spellwindow.cpp @@ -157,7 +157,7 @@ namespace MWGui for (std::vector::const_iterator it = powers.begin(); it != powers.end(); ++it) { const ESM::Spell* spell = esmStore.get().find(*it); - MyGUI::Button* t = mSpellView->createWidget("SpellText", + MyGUI::Button* t = mSpellView->createWidget("SandTextButton", MyGUI::IntCoord(4, mHeight, mWidth-8, spellHeight), MyGUI::Align::Left | MyGUI::Align::Top); t->setCaption(spell->mName); t->setTextAlign(MyGUI::Align::Left); @@ -177,7 +177,7 @@ namespace MWGui for (std::vector::const_iterator it = spellList.begin(); it != spellList.end(); ++it) { const ESM::Spell* spell = esmStore.get().find(*it); - MyGUI::Button* t = mSpellView->createWidget("SpellText", + MyGUI::Button* t = mSpellView->createWidget("SandTextButton", MyGUI::IntCoord(4, mHeight, mWidth-8, spellHeight), MyGUI::Align::Left | MyGUI::Align::Top); t->setCaption(spell->mName); t->setTextAlign(MyGUI::Align::Left); @@ -188,7 +188,7 @@ namespace MWGui t->setStateSelected(*it == MWBase::Environment::get().getWindowManager()->getSelectedSpell()); // cost / success chance - MyGUI::Button* costChance = mSpellView->createWidget("SpellText", + MyGUI::Button* costChance = mSpellView->createWidget("SandTextButton", MyGUI::IntCoord(4, mHeight, mWidth-8, spellHeight), MyGUI::Align::Left | MyGUI::Align::Top); std::string cost = boost::lexical_cast(spell->mData.mCost); std::string chance = boost::lexical_cast(int(MWMechanics::getSpellSuccessChance(*it, player))); @@ -224,7 +224,7 @@ namespace MWGui } } - MyGUI::Button* t = mSpellView->createWidget(equipped ? "SpellText" : "SpellTextUnequipped", + MyGUI::Button* t = mSpellView->createWidget(equipped ? "SandTextButton" : "SpellTextUnequipped", MyGUI::IntCoord(4, mHeight, mWidth-8, spellHeight), MyGUI::Align::Left | MyGUI::Align::Top); t->setCaption(item.getClass().getName(item)); t->setTextAlign(MyGUI::Align::Left); @@ -238,7 +238,7 @@ namespace MWGui // cost / charge - MyGUI::Button* costCharge = mSpellView->createWidget(equipped ? "SpellText" : "SpellTextUnequipped", + MyGUI::Button* costCharge = mSpellView->createWidget(equipped ? "SandTextButton" : "SpellTextUnequipped", MyGUI::IntCoord(4, mHeight, mWidth-8, spellHeight), MyGUI::Align::Left | MyGUI::Align::Top); float enchantCost = enchant->mData.mCost; diff --git a/apps/openmw/mwgui/statswindow.cpp b/apps/openmw/mwgui/statswindow.cpp index f55c96705..baa779c1c 100644 --- a/apps/openmw/mwgui/statswindow.cpp +++ b/apps/openmw/mwgui/statswindow.cpp @@ -505,30 +505,30 @@ namespace MWGui std::string text; - text += std::string("#DDC79E") + faction->mName; + text += std::string("#{fontcolourhtml=header}") + faction->mName; if (expelled.find(it->first) != expelled.end()) - text += "\n#BF9959#{sExpelled}"; + text += "\n#{fontcolourhtml=normal}#{sExpelled}"; else { int rank = it->second; rank = std::max(0, std::min(9, rank)); - text += std::string("\n#BF9959") + faction->mRanks[rank]; + text += std::string("\n#{fontcolourhtml=normal}") + faction->mRanks[rank]; if (rank < 9) { // player doesn't have max rank yet - text += std::string("\n\n#DDC79E#{sNextRank} ") + faction->mRanks[rank+1]; + text += std::string("\n\n#{fontcolourhtml=header}#{sNextRank} ") + faction->mRanks[rank+1]; ESM::RankData rankData = faction->mData.mRankData[rank+1]; const ESM::Attribute* attr1 = store.get().find(faction->mData.mAttribute[0]); const ESM::Attribute* attr2 = store.get().find(faction->mData.mAttribute[1]); - text += "\n#BF9959#{" + attr1->mName + "}: " + boost::lexical_cast(rankData.mAttribute1) + text += "\n#{fontcolourhtml=normal}#{" + attr1->mName + "}: " + boost::lexical_cast(rankData.mAttribute1) + ", #{" + attr2->mName + "}: " + boost::lexical_cast(rankData.mAttribute2); - text += "\n\n#DDC79E#{sFavoriteSkills}"; - text += "\n#BF9959"; + text += "\n\n#{fontcolourhtml=header}#{sFavoriteSkills}"; + text += "\n#{fontcolourhtml=normal}"; bool firstSkill = true; for (int i=0; i<7; ++i) { diff --git a/apps/openmw/mwgui/tooltips.cpp b/apps/openmw/mwgui/tooltips.cpp index 49953b8c6..4608010ac 100644 --- a/apps/openmw/mwgui/tooltips.cpp +++ b/apps/openmw/mwgui/tooltips.cpp @@ -654,7 +654,7 @@ namespace MWGui std::string text; text += sign->mName; - text += "\n#BF9959" + sign->mDescription; + text += "\n#{fontcolourhtml=normal}" + sign->mDescription; std::vector abilities, powers, spells; @@ -694,13 +694,13 @@ namespace MWGui { if (it == categories[category].spells.begin()) { - text += std::string("\n#DDC79E") + std::string("#{") + categories[category].label + "}"; + text += std::string("\n#{fontcolourhtml=header}") + std::string("#{") + categories[category].label + "}"; } const std::string &spellId = *it; const ESM::Spell *spell = store.get().find(spellId); - text += "\n#BF9959" + spell->mName; + text += "\n#{fontcolourhtml=normal}" + spell->mName; } } diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp index 083939c8e..3bf4e588a 100644 --- a/apps/openmw/mwgui/windowmanagerimp.cpp +++ b/apps/openmw/mwgui/windowmanagerimp.cpp @@ -994,11 +994,14 @@ namespace MWGui std::string fontcolour = "fontcolour="; size_t fontcolourLength = fontcolour.length(); - if (tag.substr(0, tokenLength) == tokenToFind) + std::string fontcolourhtml = "fontcolourhtml="; + size_t fontcolourhtmlLength = fontcolourhtml.length(); + + if (tag.compare(0, tokenLength, tokenToFind) == 0) { _result = mTranslationDataStorage.translateCellName(tag.substr(tokenLength)); } - else if (tag.substr(0, fontcolourLength) == fontcolour) + else if (tag.compare(0, fontcolourLength, fontcolour) == 0) { std::string fallbackName = "FontColor_color_" + tag.substr(fontcolourLength); std::map::const_iterator it = mFallbackMap.find(fallbackName); @@ -1015,6 +1018,24 @@ namespace MWGui MyGUI::Colour col (MyGUI::utility::parseInt(ret[0])/255.f,MyGUI::utility::parseInt(ret[1])/255.f,MyGUI::utility::parseInt(ret[2])/255.f); _result = col.print(); } + else if (tag.compare(0, fontcolourhtmlLength, fontcolourhtml) == 0) + { + std::string fallbackName = "FontColor_color_" + tag.substr(fontcolourhtmlLength); + std::map::const_iterator it = mFallbackMap.find(fallbackName); + if (it == mFallbackMap.end()) + throw std::runtime_error("Unknown fallback name: " + fallbackName); + std::string str = it->second; + + std::string ret[3]; + unsigned int j=0; + for(unsigned int i=0;i" from openmw.cfg, - * in the format "r g b a", float values in range 0-1. + * in the format "r g b a", float values in range 0-1. Useful for "Colour" and "TextColour" properties in skins. + * #{fontcolourhtml=FontColourName}: retrieves the value of the fallback setting "FontColor_color_" from openmw.cfg, + * in the format "#xxxxxx" where x are hexadecimal numbers. Useful in an EditBox's caption to change the color of following text. */ void onRetrieveTag(const MyGUI::UString& _tag, MyGUI::UString& _result); diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp index 15bac7454..abbc2b879 100644 --- a/apps/openmw/mwrender/renderingmanager.cpp +++ b/apps/openmw/mwrender/renderingmanager.cpp @@ -870,10 +870,9 @@ void RenderingManager::processChangedSettings(const Settings::CategorySettingVec void RenderingManager::setMenuTransparency(float val) { - Ogre::TexturePtr tex = Ogre::TextureManager::getSingleton().getByName("transparent.png"); - std::vector buffer; + Ogre::TexturePtr tex = Ogre::TextureManager::getSingleton().getByName("transparent.png"); std::vector buffer; buffer.resize(1); - buffer[0] = (int(255*val) << 24); + buffer[0] = (int(255*val) << 24) | (255 << 16) | (255 << 8) | 255; memcpy(tex->getBuffer()->lock(Ogre::HardwareBuffer::HBL_DISCARD), &buffer[0], 1*4); tex->getBuffer()->unlock(); } diff --git a/files/mygui/CMakeLists.txt b/files/mygui/CMakeLists.txt index a59535090..bfd622bd3 100644 --- a/files/mygui/CMakeLists.txt +++ b/files/mygui/CMakeLists.txt @@ -5,6 +5,7 @@ set(DDIR ${OpenMW_BINARY_DIR}/resources/mygui) set(MYGUI_FILES black.png + white.png core.skin core.xml openmw_alchemy_window.layout diff --git a/files/mygui/core.skin b/files/mygui/core.skin index ea3e2debc..fbcc73d8a 100644 --- a/files/mygui/core.skin +++ b/files/mygui/core.skin @@ -1,6 +1,6 @@ - + diff --git a/files/mygui/openmw_box.skin.xml b/files/mygui/openmw_box.skin.xml index af3a05d31..e1d0e5dec 100644 --- a/files/mygui/openmw_box.skin.xml +++ b/files/mygui/openmw_box.skin.xml @@ -3,7 +3,7 @@ - + diff --git a/files/mygui/openmw_chargen_create_class.layout b/files/mygui/openmw_chargen_create_class.layout index 890e2aac1..dee2f4fcf 100644 --- a/files/mygui/openmw_chargen_create_class.layout +++ b/files/mygui/openmw_chargen_create_class.layout @@ -3,10 +3,9 @@ - + - diff --git a/files/mygui/openmw_confirmation_dialog.layout b/files/mygui/openmw_confirmation_dialog.layout index edeed539c..1bedc8372 100644 --- a/files/mygui/openmw_confirmation_dialog.layout +++ b/files/mygui/openmw_confirmation_dialog.layout @@ -7,7 +7,6 @@ - @@ -28,4 +27,4 @@ - \ No newline at end of file + diff --git a/files/mygui/openmw_console.skin.xml b/files/mygui/openmw_console.skin.xml index c6d60231a..f36d9af46 100644 --- a/files/mygui/openmw_console.skin.xml +++ b/files/mygui/openmw_console.skin.xml @@ -1,6 +1,6 @@ - + diff --git a/files/mygui/openmw_dialogue_window_skin.xml b/files/mygui/openmw_dialogue_window_skin.xml index 057fd14a5..5d8c98dad 100644 --- a/files/mygui/openmw_dialogue_window_skin.xml +++ b/files/mygui/openmw_dialogue_window_skin.xml @@ -1,10 +1,6 @@ - - - - - + @@ -12,7 +8,7 @@ - + diff --git a/files/mygui/openmw_edit.skin.xml b/files/mygui/openmw_edit.skin.xml index 9a872c576..31ba579bb 100644 --- a/files/mygui/openmw_edit.skin.xml +++ b/files/mygui/openmw_edit.skin.xml @@ -1,10 +1,11 @@ - + + @@ -20,7 +21,7 @@ - + @@ -32,7 +33,7 @@ - + @@ -49,7 +50,7 @@ - + diff --git a/files/mygui/openmw_hud.layout b/files/mygui/openmw_hud.layout index be3d17506..640e5867f 100644 --- a/files/mygui/openmw_hud.layout +++ b/files/mygui/openmw_hud.layout @@ -63,7 +63,7 @@ - + @@ -74,7 +74,7 @@ - + diff --git a/files/mygui/openmw_hud_box.skin.xml b/files/mygui/openmw_hud_box.skin.xml index dd8172661..770d28425 100644 --- a/files/mygui/openmw_hud_box.skin.xml +++ b/files/mygui/openmw_hud_box.skin.xml @@ -1,6 +1,6 @@ - + diff --git a/files/mygui/openmw_hud_energybar.skin.xml b/files/mygui/openmw_hud_energybar.skin.xml index d5078e994..c6f4c763c 100644 --- a/files/mygui/openmw_hud_energybar.skin.xml +++ b/files/mygui/openmw_hud_energybar.skin.xml @@ -1,6 +1,6 @@ - + @@ -20,19 +20,19 @@ - + - + - + @@ -44,7 +44,35 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/files/mygui/openmw_interactive_messagebox.layout b/files/mygui/openmw_interactive_messagebox.layout index d3ac1f8b5..a1dbc5aa8 100644 --- a/files/mygui/openmw_interactive_messagebox.layout +++ b/files/mygui/openmw_interactive_messagebox.layout @@ -5,14 +5,12 @@ - - diff --git a/files/mygui/openmw_journal_skin.xml b/files/mygui/openmw_journal_skin.xml index 29829059c..d35ce68cf 100644 --- a/files/mygui/openmw_journal_skin.xml +++ b/files/mygui/openmw_journal_skin.xml @@ -1,38 +1,36 @@ - - - - - - - + + + + + + + - - - + + + - + - + - + - + - - - - - - - - + + + + + + diff --git a/files/mygui/openmw_list.skin.xml b/files/mygui/openmw_list.skin.xml index 160930d71..01270ef23 100644 --- a/files/mygui/openmw_list.skin.xml +++ b/files/mygui/openmw_list.skin.xml @@ -1,6 +1,6 @@ - + @@ -99,26 +99,26 @@ - + - + - - - - - - - - + + + + + + + + diff --git a/files/mygui/openmw_mainmenu_skin.xml b/files/mygui/openmw_mainmenu_skin.xml index c7f2fbce3..af41d3a1e 100644 --- a/files/mygui/openmw_mainmenu_skin.xml +++ b/files/mygui/openmw_mainmenu_skin.xml @@ -1,4 +1,4 @@ - + diff --git a/files/mygui/openmw_map_window_skin.xml b/files/mygui/openmw_map_window_skin.xml index 887e33293..03578f95b 100644 --- a/files/mygui/openmw_map_window_skin.xml +++ b/files/mygui/openmw_map_window_skin.xml @@ -1,6 +1,6 @@ - + diff --git a/files/mygui/openmw_messagebox.layout b/files/mygui/openmw_messagebox.layout index b2d29271b..8264d64b9 100644 --- a/files/mygui/openmw_messagebox.layout +++ b/files/mygui/openmw_messagebox.layout @@ -8,7 +8,6 @@ - diff --git a/files/mygui/openmw_progress.skin.xml b/files/mygui/openmw_progress.skin.xml index 5ef3d7304..7b1e413e5 100644 --- a/files/mygui/openmw_progress.skin.xml +++ b/files/mygui/openmw_progress.skin.xml @@ -1,21 +1,21 @@ - + - + - + - + @@ -44,7 +44,7 @@ - + diff --git a/files/mygui/openmw_resources.xml b/files/mygui/openmw_resources.xml index 1c8251a39..5e987efff 100644 --- a/files/mygui/openmw_resources.xml +++ b/files/mygui/openmw_resources.xml @@ -322,7 +322,7 @@ - + @@ -342,7 +342,7 @@ - + diff --git a/files/mygui/openmw_scroll_skin.xml b/files/mygui/openmw_scroll_skin.xml index b5dfd333d..e40b5fd52 100644 --- a/files/mygui/openmw_scroll_skin.xml +++ b/files/mygui/openmw_scroll_skin.xml @@ -1,6 +1,6 @@ - + diff --git a/files/mygui/openmw_text.skin.xml b/files/mygui/openmw_text.skin.xml index 843a7817c..b9b30e751 100644 --- a/files/mygui/openmw_text.skin.xml +++ b/files/mygui/openmw_text.skin.xml @@ -2,12 +2,20 @@ - + + - - + + + @@ -25,35 +33,37 @@ - - - - - - - - - + + + - - - + + + - - + + + + + + + + + + @@ -64,14 +74,14 @@ - - - - - - - - + + + + + + + + @@ -79,29 +89,14 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + @@ -109,14 +104,14 @@ - - - - - - - - + + + + + + + + diff --git a/files/mygui/openmw_windows.skin.xml b/files/mygui/openmw_windows.skin.xml index 49dcb89f9..6a3b31edd 100644 --- a/files/mygui/openmw_windows.skin.xml +++ b/files/mygui/openmw_windows.skin.xml @@ -1,8 +1,9 @@ - + + @@ -121,7 +122,8 @@ - + + @@ -389,15 +391,13 @@ - + - - - - - + + + @@ -417,7 +417,6 @@ - @@ -544,7 +543,7 @@ - +