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

UI fix bundle XI (#4018)

Browse Source 
* Prettier server conf

* Better icon size for race result

* Delete useless min value
This commit is contained in:
dumaosen 2019-07-24 01:44:53 +08:00 committed by Benau
parent 7e1af5d87c
commit bee235a65c
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/gui/dialogs/online/server_configuration_dialog.stkgui
View File

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<stkgui> <stkgui>
<div x="0" y="0" width="100%" height="100%" layout="vertical-row" > <div x="2%" y="2%" width="96%" height="96%" layout="vertical-row" >
<header id="title" text_align="center" width="80%" align="center" I18N="In the server configuration screen" text="Server Configuration"/> <header id="title" text_align="center" width="80%" align="center" I18N="In the server configuration screen" text="Server Configuration"/>
<spacer height="1%" width="20"/>
<box proportion="1" width="90%" layout="vertical-row" align="center"> <box proportion="1" width="90%" layout="vertical-row" align="center">
<label width="100%" height="8%" text_align="left" I18N="In the server configuration screen" text="Difficulty"/> <label width="100%" height="8%" text_align="left" I18N="In the server configuration screen" text="Difficulty"/>

5
src/states_screens/race_gui_base.cpp
View File

@ -740,11 +740,10 @@ void RaceGUIBase::drawGlobalPlayerIcons(int bottom_margin)
return; return;
// -2 because that's the spacing further on // -2 because that's the spacing further on
int ICON_PLAYER_WIDTH = std::max(y_space / (num_karts) - 2, int ICON_PLAYER_WIDTH = y_space / num_karts - 2;
(unsigned)GUIEngine::getFontHeight());
int icon_width_max = (int)(60*(irr_driver->getActualScreenSize().Width/1024.0f)); int icon_width_max = (int)(60*(irr_driver->getActualScreenSize().Width/1024.0f));
int icon_width_min = (int)(35*((irr_driver->getActualScreenSize().Height - (y_base+10))/720.0f)); int icon_width_min = GUIEngine::getFontHeight();
if (icon_width_min < 35) icon_width_min = 35; if (icon_width_min < 35) icon_width_min = 35;
if (icon_width_min > icon_width_max) if (icon_width_min > icon_width_max)
{ {

3
src/states_screens/race_result_gui.cpp
View File

@ -808,7 +808,8 @@ void RaceResultGUI::displayCTFResults()
if (m_distance_between_rows * num_karts > height) if (m_distance_between_rows * num_karts > height)
m_distance_between_rows = height / num_karts; m_distance_between_rows = height / num_karts;
m_width_icon = table_area->m_h / 18; m_width_icon = std::min((int)(table_area->m_h / num_karts),
GUIEngine::getFontHeight());
m_width_column_space = 10; m_width_column_space = 10;