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

Avoid ugly empty space in addons screen.

Browse Source 
It's not used for anything and simple to restore if needed.
This commit is contained in:
Deve 2018-10-23 00:27:34 +02:00
parent 6722f57b06
commit 5b1a016b13
3 changed files with 0 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,8 +36,5 @@
<box proportion="1" width="98%" align="center" layout="vertical-row" padding="6"> <box proportion="1" width="98%" align="center" layout="vertical-row" padding="6">
<list id="list_addons" x="0" y="0" width="100%" height="100%" word_wrap="true"/> <list id="list_addons" x="0" y="0" width="100%" height="100%" word_wrap="true"/>
</box> </box>
<bright width="97%" id="tips_label" text="" align="center"/>
</div> </div>
</stkgui> </stkgui>

39
src/states_screens/addons_screen.cpp
View File

@ -62,8 +62,6 @@ AddonsScreen::AddonsScreen() : Screen("addons_screen.stkgui")
m_date_filters.push_back(filter_9m); m_date_filters.push_back(filter_9m);
m_date_filters.push_back(filter_1y); m_date_filters.push_back(filter_1y);
m_date_filters.push_back(filter_2y); m_date_filters.push_back(filter_2y);
m_show_tips = true;
} // AddonsScreen } // AddonsScreen
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
@ -94,11 +92,6 @@ void AddonsScreen::loadedFromFile()
GUIEngine::ListWidget* w_list = GUIEngine::ListWidget* w_list =
getWidget<GUIEngine::ListWidget>("list_addons"); getWidget<GUIEngine::ListWidget>("list_addons");
w_list->setColumnListener(this); w_list->setColumnListener(this);
GUIEngine::LabelWidget* w_tips =
getWidget<GUIEngine::LabelWidget>("tips_label");
w_tips->setScrollSpeed(15);
} // loadedFromFile } // loadedFromFile
@ -158,21 +151,6 @@ void AddonsScreen::init()
m_type = "kart"; m_type = "kart";
bool ip = UserConfigParams::m_internet_status == RequestManager::IPERM_ALLOWED; 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<GUIEngine::LabelWidget>("tips_label");
w_tips->setVisible(false);
w_tips->m_properties[GUIEngine::PROP_HEIGHT] = "0";
calculateLayout();
m_show_tips = false;
} // ip
getWidget<GUIEngine::IconButtonWidget>("reload")->setActive(ip); getWidget<GUIEngine::IconButtonWidget>("reload")->setActive(ip);
// Reset filter. // Reset filter.
@ -530,22 +508,5 @@ void AddonsScreen::onUpdate(float dt)
// Addons manager is still initialising/downloading. // Addons manager is still initialising/downloading.
} }
} }
if(m_show_tips)
{
GUIEngine::LabelWidget *w_tips =
getWidget<GUIEngine::LabelWidget>("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 #endif
} // onUpdate } // onUpdate

2
src/states_screens/addons_screen.hpp
View File

@ -76,8 +76,6 @@ private:
/** List of date filters **/ /** List of date filters **/
std::vector<DateFilter> m_date_filters; std::vector<DateFilter> m_date_filters;
bool m_show_tips;
public: public:
/** Load the addons into the main list.*/ /** Load the addons into the main list.*/