From 5b1a016b1314058d75147656815cbf55f6d42faa Mon Sep 17 00:00:00 2001 From: Deve Date: Tue, 23 Oct 2018 00:27:34 +0200 Subject: [PATCH] Avoid ugly empty space in addons screen. It's not used for anything and simple to restore if needed. --- data/gui/screens/addons_screen.stkgui | 3 --- src/states_screens/addons_screen.cpp | 39 --------------------------- src/states_screens/addons_screen.hpp | 2 -- 3 files changed, 44 deletions(-) diff --git a/data/gui/screens/addons_screen.stkgui b/data/gui/screens/addons_screen.stkgui index c92d81a56..6f8fc2f02 100644 --- a/data/gui/screens/addons_screen.stkgui +++ b/data/gui/screens/addons_screen.stkgui @@ -36,8 +36,5 @@ - - - diff --git a/src/states_screens/addons_screen.cpp b/src/states_screens/addons_screen.cpp index 3f6a1b79a..c521c498b 100644 --- a/src/states_screens/addons_screen.cpp +++ b/src/states_screens/addons_screen.cpp @@ -62,8 +62,6 @@ AddonsScreen::AddonsScreen() : Screen("addons_screen.stkgui") m_date_filters.push_back(filter_9m); m_date_filters.push_back(filter_1y); m_date_filters.push_back(filter_2y); - - m_show_tips = true; } // AddonsScreen // ---------------------------------------------------------------------------- @@ -94,11 +92,6 @@ void AddonsScreen::loadedFromFile() GUIEngine::ListWidget* w_list = getWidget("list_addons"); w_list->setColumnListener(this); - - GUIEngine::LabelWidget* w_tips = - getWidget("tips_label"); - w_tips->setScrollSpeed(15); - } // loadedFromFile @@ -158,21 +151,6 @@ void AddonsScreen::init() m_type = "kart"; bool ip = UserConfigParams::m_internet_status == RequestManager::IPERM_ALLOWED; - //TODO : determine if the tips scrolling could be used - // to display other useful messages or if it should be removed - if(true) - { - // Nothing to show in the tips label, disable it. - - GUIEngine::LabelWidget *w_tips = - getWidget("tips_label"); - - w_tips->setVisible(false); - w_tips->m_properties[GUIEngine::PROP_HEIGHT] = "0"; - calculateLayout(); - m_show_tips = false; - } // ip - getWidget("reload")->setActive(ip); // Reset filter. @@ -530,22 +508,5 @@ void AddonsScreen::onUpdate(float dt) // Addons manager is still initialising/downloading. } } - - - if(m_show_tips) - { - GUIEngine::LabelWidget *w_tips = - getWidget("tips_label"); - - w_tips->update(dt); - if(w_tips->scrolledOff()) - { - // Tips have been shown once. Disable tips_label. - w_tips->setVisible(false); - w_tips->m_properties[GUIEngine::PROP_HEIGHT] = "0"; - calculateLayout(); - m_show_tips = false; - } - } #endif } // onUpdate diff --git a/src/states_screens/addons_screen.hpp b/src/states_screens/addons_screen.hpp index fb44d7e34..b9d423fd2 100644 --- a/src/states_screens/addons_screen.hpp +++ b/src/states_screens/addons_screen.hpp @@ -76,8 +76,6 @@ private: /** List of date filters **/ std::vector m_date_filters; - bool m_show_tips; - public: /** Load the addons into the main list.*/