Minor cleanup

Author: Alayan-stk-2

src/guiengine/engine.cpp

@@ -1238,12 +1238,9 @@ namespace GUIEngine
         Private::font_height = g_font->getDimension( L"X" ).Height;
         Private::large_font_height = g_large_font->getDimension( L"X" ).Height;
         Private::small_font_height = g_small_font->getDimension( L"X" ).Height;
-        Private::title_font_height =
-            g_title_font->getDimension( L"X" ).Height;
-        Private::small_title_font_height =
-            g_small_title_font->getDimension( L"X" ).Height;
-        Private::tiny_title_font_height =
-            g_tiny_title_font->getDimension( L"X" ).Height;
+        Private::title_font_height = g_title_font->getDimension( L"X" ).Height;
+        Private::small_title_font_height = g_small_title_font->getDimension( L"X" ).Height;
+        Private::tiny_title_font_height = g_tiny_title_font->getDimension( L"X" ).Height;
         if (ScreenKeyboard::isActive())
             ScreenKeyboard::getCurrent()->onResize();
         if (ModalDialog::isADialogActive())

src/guiengine/widgets/dynamic_ribbon_widget.cpp

@@ -737,14 +737,13 @@ EventPropagation DynamicRibbonWidget::rightPressed(const int playerID)
     if (w != NULL)
     {
         updateLabel();
-
         propagateSelection();
 
         const int listenerAmount = m_hover_listeners.size();
         for (int n=0; n<listenerAmount; n++)
         {
-            m_hover_listeners[n].onSelectionChanged(this, getSelectedRibbon(playerID)->getSelectionIDString(playerID),
-                                                    getSelectedRibbon(playerID)->getSelectionText(playerID), playerID);
+            m_hover_listeners[n].onSelectionChanged(this, w->getSelectionIDString(playerID),
+                                                    w->getSelectionText(playerID), playerID);
         }
     }
     //Log::info("DynamicRibbonWidget", "Rightpressed %s", m_properties[PROP_ID].c_str());
@@ -755,30 +754,16 @@ EventPropagation DynamicRibbonWidget::rightPressed(const int playerID)
     //Log::info("DynamicRibbonWidget", "Rightpressed returning EVENT_LET");
 
     return EVENT_LET;
-}
+} // rightPressed
+
 // -----------------------------------------------------------------------------
 EventPropagation DynamicRibbonWidget::leftPressed(const int playerID)
 {
-    if (m_deactivated) return EVENT_LET;
-
-    RibbonWidget* w = getSelectedRibbon(playerID);
-    if (w != NULL)
-    {
-        updateLabel();
-        propagateSelection();
+    // Left and right key presses use exactly the same propagation rules
+    // in dynamic ribbon widgets, we can avoid duplicating the code.
+    return rightPressed(playerID);
+} // leftPressed
 
-        for_var_in (DynamicRibbonHoverListener*, listener, m_hover_listeners)
-        {
-            listener->onSelectionChanged(this, w->getSelectionIDString(playerID),
-                                         w->getSelectionText(playerID), playerID);
-        }
-    }
-
-    assert(m_rows.size() >= 1);
-    if (m_rows[0].m_ribbon_type == RIBBON_TOOLBAR) return EVENT_BLOCK;
-
-    return EVENT_LET;
-}
 // -----------------------------------------------------------------------------
 EventPropagation DynamicRibbonWidget::transmitEvent(Widget* w,
                                                  const std::string& originator,
@@ -964,10 +949,6 @@ void DynamicRibbonWidget::propagateSelection()
         {
             where = (float)relative_selection / (float)(selected_ribbon->m_children.size() - 1);
         }
-        else
-        {
-            where = 0.0f;
-        }
 
         if (where < 0.0f)      where = 0.0f;
         else if (where > 1.0f) where = 1.0f;