From 1d5e4de91dbe1485172f39584f53c517df89e786 Mon Sep 17 00:00:00 2001
From: "auria.mg" <auria.mg@gmail.com>
Date: Thu, 18 Oct 2018 19:20:35 -0400
Subject: [PATCH] Revert "GP Editor Word Wrap (#3519)"

This reverts commit abd522d937cbd8b59faad9a8f09c1ee9349e9035.
---
 data/gui/screens/grand_prix_editor.stkgui     |  2 +-
 .../widgets/dynamic_ribbon_widget.cpp         | 21 ++++++++-----------
 .../widgets/dynamic_ribbon_widget.hpp         |  2 ++
 src/guiengine/widgets/ribbon_widget.cpp       |  3 +--
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/data/gui/screens/grand_prix_editor.stkgui b/data/gui/screens/grand_prix_editor.stkgui
index a2efe7731..f93b221c1 100644
--- a/data/gui/screens/grand_prix_editor.stkgui
+++ b/data/gui/screens/grand_prix_editor.stkgui
@@ -24,7 +24,7 @@
             <label id="gpname" text_align="center" width="100%" text="" />
             <ribbon_grid id="tracks" proportion="1" width="100%" square_items="true"
                 label_location="each" align="left" max_rows="1"
-                child_width="160" child_height="120" word_wrap="true" />
+                child_width="160" child_height="120" />
         </box>
 
         <spacer height="20" />
diff --git a/src/guiengine/widgets/dynamic_ribbon_widget.cpp b/src/guiengine/widgets/dynamic_ribbon_widget.cpp
index 6de4072e4..25a78ea5c 100644
--- a/src/guiengine/widgets/dynamic_ribbon_widget.cpp
+++ b/src/guiengine/widgets/dynamic_ribbon_widget.cpp
@@ -39,6 +39,7 @@ DynamicRibbonWidget::DynamicRibbonWidget(const bool combo, const bool multi_row)
     m_scroll_offset        = 0;
     m_needed_cols          = 0;
     m_col_amount           = 0;
+    m_previous_item_count  = 0;
     m_max_label_length     = 0;
     m_multi_row            = multi_row;
     m_combo                = combo;
@@ -418,16 +419,7 @@ void DynamicRibbonWidget::buildInternalStructure()
             icon->m_properties[PROP_HEIGHT] = m_properties[PROP_CHILD_HEIGHT];
             icon->m_w = atoi(icon->m_properties[PROP_WIDTH].c_str());
             icon->m_h = atoi(icon->m_properties[PROP_HEIGHT].c_str());
-
-            if (m_properties[PROP_WORD_WRAP] == "true")
-            {
-                icon->m_properties[PROP_WORD_WRAP] = "true";
-            }
-            else
-            {
-
-                icon->setLabelFont(m_font);
-            }
+            icon->setLabelFont(m_font);
 
             // If we want each icon to have its own label, we must make it non-empty, otherwise
             // it will assume there is no label and none will be created (FIXME: that's ugly)
@@ -545,6 +537,7 @@ void DynamicRibbonWidget::clearItems()
 void DynamicRibbonWidget::elementRemoved()
 {
     Widget::elementRemoved();
+    m_previous_item_count = 0;
     m_rows.clearWithoutDeleting();
     m_left_widget = NULL;
     m_right_widget = NULL;
@@ -897,8 +890,12 @@ void DynamicRibbonWidget::updateLabel(RibbonWidget* from_this_ribbon)
 
 void DynamicRibbonWidget::updateItemDisplay()
 {
-
-    buildInternalStructure();
+    // ---- Check if we need to update the number of icons in the ribbon
+    if ((int)m_items.size() != m_previous_item_count)
+    {
+        buildInternalStructure();
+        m_previous_item_count = (int)m_items.size();
+    }
 
     // ---- some variables
     int icon_id = 0;
diff --git a/src/guiengine/widgets/dynamic_ribbon_widget.hpp b/src/guiengine/widgets/dynamic_ribbon_widget.hpp
index b8ab78fe6..0021d8c22 100644
--- a/src/guiengine/widgets/dynamic_ribbon_widget.hpp
+++ b/src/guiengine/widgets/dynamic_ribbon_widget.hpp
@@ -98,6 +98,8 @@ namespace GUIEngine
           */
         bool m_scrolling_enabled;
 
+        /** Used to keep track of item count changes */
+        int m_previous_item_count;
 
         /** List of items in the ribbon */
         std::vector<ItemDescription> m_items;
diff --git a/src/guiengine/widgets/ribbon_widget.cpp b/src/guiengine/widgets/ribbon_widget.cpp
index 4bce3151f..caaa99642 100644
--- a/src/guiengine/widgets/ribbon_widget.cpp
+++ b/src/guiengine/widgets/ribbon_widget.cpp
@@ -396,9 +396,8 @@ void RibbonWidget::add()
                 has_label = false;
             }
 
-            const int font_size = m_active_children[i].m_properties[PROP_WORD_WRAP] == "true" ? GUIEngine::getFontHeight() * 2 : GUIEngine::getFontHeight();
             const int needed_space_under_button = has_label
-                                                ? font_size
+                                                ? GUIEngine::getFontHeight()
                                                 : 10;
 
             float imageRatio =