From 035a761b30f16bfe78c397a68aab9a93f688f301 Mon Sep 17 00:00:00 2001
From: Benau <Benau@users.noreply.github.com>
Date: Mon, 22 Feb 2021 10:14:06 +0800
Subject: [PATCH] Fix text overlapped with long translation

---
 data/gui/screens/options_device.stkgui               | 3 ---
 src/states_screens/options/options_screen_device.cpp | 8 +++-----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/data/gui/screens/options_device.stkgui b/data/gui/screens/options_device.stkgui
index 5454e745a..6f42b60c4 100644
--- a/data/gui/screens/options_device.stkgui
+++ b/data/gui/screens/options_device.stkgui
@@ -57,9 +57,6 @@
                      <spacer width="2%" height="10" />
                      
                      <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>
             </box>
         </div>
diff --git a/src/states_screens/options/options_screen_device.cpp b/src/states_screens/options/options_screen_device.cpp
index 4ccd5834d..874c23f15 100644
--- a/src/states_screens/options/options_screen_device.cpp
+++ b/src/states_screens/options/options_screen_device.cpp
@@ -19,6 +19,7 @@
 
 #include "config/user_config.hpp"
 #include "guiengine/CGUISpriteBank.hpp"
+#include "guiengine/message_queue.hpp"
 #include "guiengine/scalable_font.hpp"
 #include "guiengine/screen.hpp"
 #include "guiengine/widget.hpp"
@@ -388,10 +389,6 @@ void OptionsScreenDevice::updateInputButtons()
 
         }   // if existing key
     }   // for action <= PA_LAST_MENU_ACTION;
-    
-
-    GUIEngine::Widget* conflict_label =
-        getWidget<GUIEngine::LabelWidget>("conflict");
 
     core::stringw warning;
     if (conflicts_between)
@@ -402,7 +399,8 @@ void OptionsScreenDevice::updateInputButtons()
     }
     if (conflicts_inside)
         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