ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix text overlapped with long translation

Browse Source
This commit is contained in:
Benau 2021-02-22 10:14:06 +08:00
parent d6967050ab
commit 035a761b30
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/gui/screens/options_device.stkgui
View File

@ -57,9 +57,6 @@
<spacer width="2%" height="10" /> <spacer width="2%" height="10" />
<button id="rename_config" I18N="In the input configuration screen" text="Rename Configuration"/> <button id="rename_config" I18N="In the input configuration screen" text="Rename Configuration"/>
<spacer width="2%" height="10" />
<label id="conflict" proportion="1" text="" word_wrap="true" align="center"/>
</div> </div>
</box> </box>
</div> </div>

8
src/states_screens/options/options_screen_device.cpp
View File

@ -19,6 +19,7 @@
#include "config/user_config.hpp" #include "config/user_config.hpp"
#include "guiengine/CGUISpriteBank.hpp" #include "guiengine/CGUISpriteBank.hpp"
#include "guiengine/message_queue.hpp"
#include "guiengine/scalable_font.hpp" #include "guiengine/scalable_font.hpp"
#include "guiengine/screen.hpp" #include "guiengine/screen.hpp"
#include "guiengine/widget.hpp" #include "guiengine/widget.hpp"
@ -388,10 +389,6 @@ void OptionsScreenDevice::updateInputButtons()
} // if existing key } // if existing key
} // for action <= PA_LAST_MENU_ACTION; } // for action <= PA_LAST_MENU_ACTION;
GUIEngine::Widget* conflict_label =
getWidget<GUIEngine::LabelWidget>("conflict");
core::stringw warning; core::stringw warning;
if (conflicts_between) if (conflicts_between)
@ -402,7 +399,8 @@ void OptionsScreenDevice::updateInputButtons()
} }
if (conflicts_inside) if (conflicts_inside)
warning += _("* A red item means a conflict in the current configuration"); warning += _("* A red item means a conflict in the current configuration");
conflict_label->setText(warning); if (!warning.empty())
MessageQueue::add(MessageQueue::MT_ERROR, warning);
} // updateInputButtons } // updateInputButtons