diff --git a/README.md b/README.md index 1a49cbc50c..029054703b 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,8 @@ OpenMW also comes with OpenMW-CS, a replacement for Bethesda's Construction Set. Font Licenses: * DejaVuLGCSansMono.ttf: custom (see [files/data/fonts/DejaVuFontLicense.txt](https://gitlab.com/OpenMW/openmw/-/raw/master/files/data/fonts/DejaVuFontLicense.txt) for more information) -* OMWAyembedt.ttf: SIL Open Font License (see [files/data/fonts/OMWAyembedtFontLicense.txt](https://gitlab.com/OpenMW/openmw/-/raw/master/files/data/fonts/OMWAyembedtFontLicense.txt) for more information) -* Pelagiad.ttf: SIL Open Font License (see [files/data/fonts/PelagiadFontLicense.txt](https://gitlab.com/OpenMW/openmw/-/raw/master/files/data/fonts/PelagiadFontLicense.txt) for more information) +* DemonicLetters.ttf: SIL Open Font License (see [files/data/fonts/DemonicLettersFontLicense.txt](https://gitlab.com/OpenMW/openmw/-/raw/master/files/data/fonts/DemonicLettersFontLicense.txt) for more information) +* MysticCards.ttf: SIL Open Font License (see [files/data/fonts/MysticCardsFontLicense.txt](https://gitlab.com/OpenMW/openmw/-/raw/master/files/data/fonts/MysticCardsFontLicense.txt) for more information) Current Status -------------- diff --git a/apps/openmw/mwgui/debugwindow.cpp b/apps/openmw/mwgui/debugwindow.cpp index f4a4814654..93f5fdb076 100644 --- a/apps/openmw/mwgui/debugwindow.cpp +++ b/apps/openmw/mwgui/debugwindow.cpp @@ -92,14 +92,14 @@ namespace MWGui // - Shader editor MyGUI::TabItem* itemLV = mTabControl->addItem("Log Viewer"); - itemLV->setCaptionWithReplacing("#{DebugMenu:LogViewer}"); + itemLV->setCaptionWithReplacing(" #{DebugMenu:LogViewer} "); mLogView = itemLV->createWidgetReal ("LogEdit", MyGUI::FloatCoord(0,0,1,1), MyGUI::Align::Stretch); mLogView->setEditReadOnly(true); #ifndef BT_NO_PROFILE MyGUI::TabItem* item = mTabControl->addItem("Physics Profiler"); - item->setCaptionWithReplacing("#{DebugMenu:PhysicsProfiler}"); + item->setCaptionWithReplacing(" #{DebugMenu:PhysicsProfiler} "); mBulletProfilerEdit = item->createWidgetReal ("LogEdit", MyGUI::FloatCoord(0,0,1,1), MyGUI::Align::Stretch); #else diff --git a/apps/openmw/mwgui/dialogue.cpp b/apps/openmw/mwgui/dialogue.cpp index 14c865f018..9acb043820 100644 --- a/apps/openmw/mwgui/dialogue.cpp +++ b/apps/openmw/mwgui/dialogue.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -25,6 +26,7 @@ #include "bookpage.hpp" #include "textcolours.hpp" +#include "tooltips.hpp" #include "journalbooks.hpp" // to_utf8_span @@ -59,6 +61,8 @@ namespace MWGui PersuasionDialog::PersuasionDialog(std::unique_ptr callback) : WindowModal("openmw_persuasion_dialog.layout") , mCallback(std::move(callback)) + , mInitialGoldLabelWidth(0) + , mInitialMainWidgetWidth(0) { getWidget(mCancelButton, "CancelButton"); getWidget(mAdmireButton, "AdmireButton"); @@ -68,6 +72,26 @@ namespace MWGui getWidget(mBribe100Button, "Bribe100Button"); getWidget(mBribe1000Button, "Bribe1000Button"); getWidget(mGoldLabel, "GoldLabel"); + getWidget(mActionsBox, "ActionsBox"); + + int totalHeight = 3; + adjustAction(mAdmireButton, totalHeight); + adjustAction(mIntimidateButton, totalHeight); + adjustAction(mTauntButton, totalHeight); + adjustAction(mBribe10Button, totalHeight); + adjustAction(mBribe100Button, totalHeight); + adjustAction(mBribe1000Button, totalHeight); + totalHeight += 3; + + int diff = totalHeight - mActionsBox->getSize().height; + if (diff > 0) + { + auto mainWidgetSize = mMainWidget->getSize(); + mMainWidget->setSize(mainWidgetSize.width, mainWidgetSize.height + diff); + } + + mInitialGoldLabelWidth = mActionsBox->getSize().width - mCancelButton->getSize().width - 8; + mInitialMainWidgetWidth = mMainWidget->getSize().width; mCancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &PersuasionDialog::onCancel); mAdmireButton->eventMouseButtonClick += MyGUI::newDelegate(this, &PersuasionDialog::onPersuade); @@ -78,6 +102,14 @@ namespace MWGui mBribe1000Button->eventMouseButtonClick += MyGUI::newDelegate(this, &PersuasionDialog::onPersuade); } + void PersuasionDialog::adjustAction(MyGUI::Widget* action, int& totalHeight) + { + const int lineHeight = MWBase::Environment::get().getWindowManager()->getFontHeight() + 2; + auto currentCoords = action->getCoord(); + action->setCoord(currentCoords.left, totalHeight, currentCoords.width, lineHeight); + totalHeight += lineHeight; + } + void PersuasionDialog::onCancel(MyGUI::Widget *sender) { setVisible(false); @@ -114,6 +146,13 @@ namespace MWGui mBribe1000Button->setEnabled (playerGold >= 1000); mGoldLabel->setCaptionWithReplacing("#{sGold}: " + MyGUI::utility::toString(playerGold)); + + int diff = mGoldLabel->getRequestedSize().width - mInitialGoldLabelWidth; + if (diff > 0) + mMainWidget->setSize(mInitialMainWidgetWidth + diff, mMainWidget->getSize().height); + else + mMainWidget->setSize(mInitialMainWidgetWidth, mMainWidget->getSize().height); + WindowModal::onOpen(); } diff --git a/apps/openmw/mwgui/dialogue.hpp b/apps/openmw/mwgui/dialogue.hpp index 7ea70307cf..7965a7cb24 100644 --- a/apps/openmw/mwgui/dialogue.hpp +++ b/apps/openmw/mwgui/dialogue.hpp @@ -14,6 +14,7 @@ namespace Gui { + class AutoSizedTextBox; class MWList; } @@ -33,6 +34,9 @@ namespace MWGui private: std::unique_ptr mCallback; + int mInitialGoldLabelWidth; + int mInitialMainWidgetWidth; + MyGUI::Button* mCancelButton; MyGUI::Button* mAdmireButton; MyGUI::Button* mIntimidateButton; @@ -40,7 +44,10 @@ namespace MWGui MyGUI::Button* mBribe10Button; MyGUI::Button* mBribe100Button; MyGUI::Button* mBribe1000Button; - MyGUI::TextBox* mGoldLabel; + MyGUI::Widget* mActionsBox; + Gui::AutoSizedTextBox* mGoldLabel; + + void adjustAction(MyGUI::Widget* action, int& totalHeight); void onCancel (MyGUI::Widget* sender); void onPersuade (MyGUI::Widget* sender); diff --git a/apps/openmw/mwgui/itemwidget.cpp b/apps/openmw/mwgui/itemwidget.cpp index ffe854a72b..a7e6cb8bef 100644 --- a/apps/openmw/mwgui/itemwidget.cpp +++ b/apps/openmw/mwgui/itemwidget.cpp @@ -25,14 +25,29 @@ namespace if (count == 1) return ""; + // With small text size we can use up to 4 characters, while with large ones - only up to 3. + if (fontHeight > 16) + { + if (count > 999999999) + return MyGUI::utility::toString(count/1000000000) + "b"; + else if (count > 9999999) + return ">9m"; + else if (count > 999999) + return MyGUI::utility::toString(count/1000000) + "m"; + else if (count > 9999) + return ">9k"; + else if (count > 999) + return MyGUI::utility::toString(count/1000) + "k"; + else + return MyGUI::utility::toString(count); + } + if (count > 999999999) return MyGUI::utility::toString(count/1000000000) + "b"; else if (count > 999999) return MyGUI::utility::toString(count/1000000) + "m"; else if (count > 9999) return MyGUI::utility::toString(count/1000) + "k"; - else if (fontHeight >= 18 && count > 999) - return MyGUI::utility::toString(count/1000) + "k"; else return MyGUI::utility::toString(count); } diff --git a/apps/openmw/mwgui/trainingwindow.cpp b/apps/openmw/mwgui/trainingwindow.cpp index 96267cc7b2..24a4eb3607 100644 --- a/apps/openmw/mwgui/trainingwindow.cpp +++ b/apps/openmw/mwgui/trainingwindow.cpp @@ -98,6 +98,8 @@ namespace MWGui const MWWorld::Store &gmst = MWBase::Environment::get().getWorld()->getStore().get(); + const int lineHeight = MWBase::Environment::get().getWindowManager()->getFontHeight() + 2; + for (int i=0; i<3; ++i) { int price = static_cast(pcStats.getSkill (skills[i].first).getBase() * gmst.find("iTrainingMod")->mValue.getInteger()); @@ -105,7 +107,7 @@ namespace MWGui price = MWBase::Environment::get().getMechanicsManager()->getBarterOffer(mPtr, price, true); MyGUI::Button* button = mTrainingOptions->createWidget(price <= playerGold ? "SandTextButton" : "SandTextButtonDisabled", // can't use setEnabled since that removes tooltip - MyGUI::IntCoord(5, 5+i*18, mTrainingOptions->getWidth()-10, 18), MyGUI::Align::Default); + MyGUI::IntCoord(5, 5+i*lineHeight, mTrainingOptions->getWidth()-10, lineHeight), MyGUI::Align::Default); button->setUserData(skills[i].first); button->eventMouseButtonClick += MyGUI::newDelegate(this, &TrainingWindow::onTrainingSelected); diff --git a/components/fontloader/fontloader.cpp b/components/fontloader/fontloader.cpp index e575b8cbc0..dbf42e810b 100644 --- a/components/fontloader/fontloader.cpp +++ b/components/fontloader/fontloader.cpp @@ -155,7 +155,7 @@ namespace Gui FontLoader::FontLoader(ToUTF8::FromType encoding, const VFS::Manager* vfs, float scalingFactor) : mVFS(vfs) - , mFontHeight(std::clamp(Settings::Manager::getInt("font size", "GUI"), 12, 20)) + , mFontHeight(std::clamp(Settings::Manager::getInt("font size", "GUI"), 12, 18)) , mScalingFactor(scalingFactor) { if (encoding == ToUTF8::WINDOWS_1252) @@ -176,10 +176,10 @@ namespace Gui loadFont("DejaVuLGCSansMono", "MonoFont"); // We need to use a TrueType monospace font to display debug texts properly. // Use our TrueType fonts as a fallback. - if (!MyGUI::ResourceManager::getInstance().isExist("DefaultFont") && !Misc::StringUtils::ciEqual(defaultFont, "Pelagiad")) - loadFont("Pelagiad", "DefaultFont"); - if (!MyGUI::ResourceManager::getInstance().isExist("ScrollFont") && !Misc::StringUtils::ciEqual(scrollFont, "OMWAyembedt")) - loadFont("OMWAyembedt", "ScrollFont"); + if (!MyGUI::ResourceManager::getInstance().isExist("DefaultFont") && !Misc::StringUtils::ciEqual(defaultFont, "MysticCards")) + loadFont("MysticCards", "DefaultFont"); + if (!MyGUI::ResourceManager::getInstance().isExist("ScrollFont") && !Misc::StringUtils::ciEqual(scrollFont, "DemonicLetters")) + loadFont("DemonicLetters", "ScrollFont"); } void FontLoader::loadFont(const std::string& fileName, const std::string& fontId) @@ -553,12 +553,9 @@ namespace Gui std::string FontLoader::getFontForFace(const std::string& face) { const std::string lowerFace = Misc::StringUtils::lowerCase(face); - - if (lowerFace == "magic cards") - return "DefaultFont"; if (lowerFace == "daedric") return "ScrollFont"; - return face; + return "DefaultFont"; } } diff --git a/components/widgets/fontwrapper.hpp b/components/widgets/fontwrapper.hpp index 122cf20257..3396792f34 100644 --- a/components/widgets/fontwrapper.hpp +++ b/components/widgets/fontwrapper.hpp @@ -35,7 +35,7 @@ namespace Gui std::string getFontSize() { // Note: we can not use the FontLoader here, so there is a code duplication a bit. - static const std::string fontSize = std::to_string(std::clamp(Settings::Manager::getInt("font size", "GUI"), 12, 20)); + static const std::string fontSize = std::to_string(std::clamp(Settings::Manager::getInt("font size", "GUI"), 12, 18)); return fontSize; } }; diff --git a/docs/source/reference/modding/font.rst b/docs/source/reference/modding/font.rst index 8b3be358e6..0b8c3273f5 100644 --- a/docs/source/reference/modding/font.rst +++ b/docs/source/reference/modding/font.rst @@ -3,8 +3,8 @@ Fonts Default UI font and font used in magic scrolls are defined in ``openmw.cfg``: - fallback=Fonts_Font_0,Pelagiad - fallback=Fonts_Font_2,OMWAyembedt + fallback=Fonts_Font_0,MysticCards + fallback=Fonts_Font_2,DemonicLetters When there are no ``Fonts_Font_*`` lines in user's ``openmw.cfg``, built-in TrueType fonts are used. Font used by console and another debug windows is not configurable (so ``Fonts_Font_1`` is unused). @@ -30,11 +30,11 @@ TrueType fonts -------------- Unlike vanilla Morrowind, OpenMW directly supports TrueType (``.ttf``) fonts. This is the recommended fonts format. -OpenMW has build-in TrueType fonts: Pelagiad, OMWAyembedt and DejaVuLGCSansMono, which are used by default. +OpenMW has build-in TrueType fonts: MysticCards, DemonicLetters and DejaVuLGCSansMono, which are used by default. TrueType fonts are configured via ``openmw.cfg`` too: - fallback=Fonts_Font_0,Pelagiad - fallback=Fonts_Font_2,OMWAyembedt + fallback=Fonts_Font_0,MysticCards + fallback=Fonts_Font_2,DemonicLetters In this example, OpenMW will scan ``Fonts`` folder in data directories for ``.omwfont`` files. These files are XML files with schema provided by MyGUI. OpenMW uses ``.omwfont`` files which name (without extension) matches ``openmw.cfg`` entries. @@ -45,7 +45,7 @@ It is also possible to adjust the font size and resolution via ``settings.cfg`` font size = 16 ttf resolution = 75 -The ``font size`` setting accepts clamped values in range from 12 to 20 while ``ttf resolution`` setting accepts values from 50 to 125. +The ``font size`` setting accepts clamped values in range from 12 to 18 while ``ttf resolution`` setting accepts values from 50 to 125. Any Resolution or Size properties in the ``.omwfont`` file have no effect because the engine settings override them. diff --git a/docs/source/reference/modding/settings/GUI.rst b/docs/source/reference/modding/settings/GUI.rst index 08f3fbd830..5f2b6b1ca0 100644 --- a/docs/source/reference/modding/settings/GUI.rst +++ b/docs/source/reference/modding/settings/GUI.rst @@ -17,7 +17,7 @@ font size --------- :Type: integer -:Range: 12 to 20 +:Range: 12 to 18 :Default: 16 Allows to specify glyph size for in-game fonts. diff --git a/files/data/CMakeLists.txt b/files/data/CMakeLists.txt index 6186759102..2630fbed84 100644 --- a/files/data/CMakeLists.txt +++ b/files/data/CMakeLists.txt @@ -13,12 +13,12 @@ set(BUILTIN_DATA_FILES fonts/DejaVuFontLicense.txt fonts/DejaVuLGCSansMono.ttf fonts/DejaVuLGCSansMono.omwfont - fonts/OMWAyembedt.ttf - fonts/OMWAyembedt.omwfont - fonts/OMWAyembedtFontLicense.txt - fonts/Pelagiad.ttf - fonts/Pelagiad.omwfont - fonts/PelagiadFontLicense.txt + fonts/DemonicLetters.ttf + fonts/DemonicLetters.omwfont + fonts/DemonicLettersFontLicense.txt + fonts/MysticCards.ttf + fonts/MysticCards.omwfont + fonts/MysticCardsFontLicense.txt l10n/BuiltInShaders/de.yaml l10n/BuiltInShaders/en.yaml diff --git a/files/data/fonts/OMWAyembedt.omwfont b/files/data/fonts/DemonicLetters.omwfont similarity index 57% rename from files/data/fonts/OMWAyembedt.omwfont rename to files/data/fonts/DemonicLetters.omwfont index 5abf514e24..bbe15dac5d 100644 --- a/files/data/fonts/OMWAyembedt.omwfont +++ b/files/data/fonts/DemonicLetters.omwfont @@ -1,11 +1,14 @@ - + + - + + + diff --git a/files/data/fonts/DemonicLetters.ttf b/files/data/fonts/DemonicLetters.ttf new file mode 100644 index 0000000000..33b5fc7c2d Binary files /dev/null and b/files/data/fonts/DemonicLetters.ttf differ diff --git a/files/data/fonts/OMWAyembedtFontLicense.txt b/files/data/fonts/DemonicLettersFontLicense.txt similarity index 97% rename from files/data/fonts/OMWAyembedtFontLicense.txt rename to files/data/fonts/DemonicLettersFontLicense.txt index 47986d5463..11f50143cf 100644 --- a/files/data/fonts/OMWAyembedtFontLicense.txt +++ b/files/data/fonts/DemonicLettersFontLicense.txt @@ -1,3 +1,6 @@ +Copyright (c) 2022, OpenMW Team (https://gitlab.com/OpenMW), +with Reserved Font Name "DemonicLetters.ttf". + Copyright (c) 2014, Georg Duffner (https://github.com/georgd/OpenMW-Fonts), with Reserved Font Name "OMWAyembedt.ttf". diff --git a/files/data/fonts/Pelagiad.omwfont b/files/data/fonts/MysticCards.omwfont similarity index 71% rename from files/data/fonts/Pelagiad.omwfont rename to files/data/fonts/MysticCards.omwfont index 2fe2bcf942..2749d6d1c3 100644 --- a/files/data/fonts/Pelagiad.omwfont +++ b/files/data/fonts/MysticCards.omwfont @@ -1,7 +1,8 @@ - + + @@ -9,34 +10,33 @@ - + + - + + - + + - + + - - - - + - - diff --git a/files/data/fonts/MysticCards.ttf b/files/data/fonts/MysticCards.ttf new file mode 100644 index 0000000000..c6e7401e1f Binary files /dev/null and b/files/data/fonts/MysticCards.ttf differ diff --git a/files/data/fonts/PelagiadFontLicense.txt b/files/data/fonts/MysticCardsFontLicense.txt similarity index 97% rename from files/data/fonts/PelagiadFontLicense.txt rename to files/data/fonts/MysticCardsFontLicense.txt index 2d4aff5cdd..7d73af5dec 100644 --- a/files/data/fonts/PelagiadFontLicense.txt +++ b/files/data/fonts/MysticCardsFontLicense.txt @@ -1,3 +1,6 @@ +Copyright (c) 2022, OpenMW Team (https://gitlab.com/OpenMW), +with Reserved Font Name "MysticCards.ttf". + Copyright (c) 2015, Isak Larborn (isaskar.github.io/Pelagiad|Isaskar@users.noreply.github.com), with Reserved Font Name "Pelagiad.ttf". diff --git a/files/data/fonts/OMWAyembedt.ttf b/files/data/fonts/OMWAyembedt.ttf deleted file mode 100644 index fb889b17fc..0000000000 Binary files a/files/data/fonts/OMWAyembedt.ttf and /dev/null differ diff --git a/files/data/fonts/Pelagiad.ttf b/files/data/fonts/Pelagiad.ttf deleted file mode 100644 index 07653b0530..0000000000 Binary files a/files/data/fonts/Pelagiad.ttf and /dev/null differ diff --git a/files/data/l10n/SettingsMenu/ru.yaml b/files/data/l10n/SettingsMenu/ru.yaml index 528aff49a1..422b00750f 100644 --- a/files/data/l10n/SettingsMenu/ru.yaml +++ b/files/data/l10n/SettingsMenu/ru.yaml @@ -13,7 +13,7 @@ LanguageNote: "Примечание: эти настройки не затраг LightingMethod: "Способ освещения" LightingMethodLegacy: "Устаревший" LightingMethodShaders: "Шейдеры" -LightingMethodShadersCompatibility: "Шейдеры (режим совместимости)" +LightingMethodShadersCompatibility: "Шейдеры (режим совм-ти)" LightingResetToDefaults: "Обнулить настройки освещения? Смена метода освещения вступит в силу только после перезапуска приложения." Lights: "Освещение" LightsBoundingSphereMultiplier: "Множитель размера ограничивающей сферы" diff --git a/files/data/mygui/openmw_dialogue_window.layout b/files/data/mygui/openmw_dialogue_window.layout index d1f96121e9..6d53d63351 100644 --- a/files/data/mygui/openmw_dialogue_window.layout +++ b/files/data/mygui/openmw_dialogue_window.layout @@ -18,7 +18,7 @@ - + diff --git a/files/data/mygui/openmw_persuasion_dialog.layout b/files/data/mygui/openmw_persuasion_dialog.layout index 3b10588ec8..977da40f8f 100644 --- a/files/data/mygui/openmw_persuasion_dialog.layout +++ b/files/data/mygui/openmw_persuasion_dialog.layout @@ -3,12 +3,12 @@ - + - + @@ -35,11 +35,11 @@ - + - + diff --git a/files/data/mygui/openmw_resources.xml b/files/data/mygui/openmw_resources.xml index 03ca91f5eb..70fccbfbe7 100644 --- a/files/data/mygui/openmw_resources.xml +++ b/files/data/mygui/openmw_resources.xml @@ -41,13 +41,13 @@ - + - + - - + + @@ -63,8 +63,8 @@ - - + + @@ -75,8 +75,8 @@ - - + + diff --git a/files/data/mygui/openmw_settings_window.layout b/files/data/mygui/openmw_settings_window.layout index d698844d2e..9042a13546 100644 --- a/files/data/mygui/openmw_settings_window.layout +++ b/files/data/mygui/openmw_settings_window.layout @@ -5,7 +5,7 @@ - + @@ -98,7 +98,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -140,7 +140,7 @@ - + @@ -198,9 +198,9 @@ - + - + @@ -211,15 +211,15 @@ - + - + - + @@ -237,10 +237,10 @@ - + - + @@ -250,15 +250,15 @@ - + - + - + @@ -270,11 +270,11 @@ - + - + @@ -286,7 +286,7 @@ - + @@ -296,7 +296,7 @@ - + @@ -306,7 +306,7 @@ - + @@ -369,7 +369,7 @@ - + @@ -432,7 +432,7 @@ - + @@ -529,7 +529,7 @@ - + @@ -637,7 +637,7 @@ - + @@ -678,7 +678,7 @@ - + diff --git a/files/data/mygui/openmw_stats_window.layout b/files/data/mygui/openmw_stats_window.layout index 77de3ac753..2fcede969f 100644 --- a/files/data/mygui/openmw_stats_window.layout +++ b/files/data/mygui/openmw_stats_window.layout @@ -21,7 +21,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -61,7 +61,7 @@ - + diff --git a/files/data/mygui/openmw_text.skin.xml b/files/data/mygui/openmw_text.skin.xml index 5f96d0a57c..00a69c486b 100644 --- a/files/data/mygui/openmw_text.skin.xml +++ b/files/data/mygui/openmw_text.skin.xml @@ -149,18 +149,18 @@ color_misc=0,205,205 # ???? - + - + - + diff --git a/files/data/mygui/openmw_wait_dialog_progressbar.layout b/files/data/mygui/openmw_wait_dialog_progressbar.layout index 8147abbdfb..720bfa4327 100644 --- a/files/data/mygui/openmw_wait_dialog_progressbar.layout +++ b/files/data/mygui/openmw_wait_dialog_progressbar.layout @@ -4,7 +4,7 @@ - + diff --git a/files/openmw.cfg b/files/openmw.cfg index fb4cf70f5f..4c25d6ed98 100644 --- a/files/openmw.cfg +++ b/files/openmw.cfg @@ -71,9 +71,9 @@ fallback=Water_UnderwaterColor,012,030,037 fallback=Water_UnderwaterColorWeight,0.85 # fonts -fallback=Fonts_Font_0,Pelagiad +fallback=Fonts_Font_0,MysticCards fallback=Fonts_Font_1,DejaVuLGCSansMono -fallback=Fonts_Font_2,OMWAyembedt +fallback=Fonts_Font_2,DemonicLetters fallback=FontColor_color_normal,202,165,96 fallback=FontColor_color_normal_over,223,201,159 fallback=FontColor_color_normal_pressed,243,237,221 diff --git a/files/openmw.cfg.local b/files/openmw.cfg.local index cb05d5f22a..ee8bda8196 100644 --- a/files/openmw.cfg.local +++ b/files/openmw.cfg.local @@ -71,9 +71,9 @@ fallback=Water_UnderwaterColor,012,030,037 fallback=Water_UnderwaterColorWeight,0.85 # fonts -fallback=Fonts_Font_0,Pelagiad +fallback=Fonts_Font_0,MysticCards fallback=Fonts_Font_1,DejaVuLGCSansMono -fallback=Fonts_Font_2,OMWAyembedt +fallback=Fonts_Font_2,DemonicLetters fallback=FontColor_color_normal,202,165,96 fallback=FontColor_color_normal_over,223,201,159 fallback=FontColor_color_normal_pressed,243,237,221 diff --git a/files/ui/advancedpage.ui b/files/ui/advancedpage.ui index 42b46080fd..0f895ad65b 100644 --- a/files/ui/advancedpage.ui +++ b/files/ui/advancedpage.ui @@ -946,7 +946,7 @@ 12 - 20 + 18 1