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

Add 2px margin to screen keyboard buttons to fix navigation with gamepad

Browse Source
This commit is contained in:
Deve 2019-01-31 22:16:06 +01:00
parent 575f44a043
commit ae92d63492
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/guiengine/screen_keyboard.cpp
View File

@ -167,7 +167,8 @@ void ScreenKeyboard::createButtons()
int rows_num = layout_proportions.size(); int rows_num = layout_proportions.size();
int pos_y = 3; int pos_y = 3;
int height = (m_area.getHeight() - 2 * pos_y) / rows_num; const int margin = 2;
int height = (m_area.getHeight() - 2 * pos_y) / rows_num - margin;
char height_str[100]; char height_str[100];
sprintf(height_str, "%i", height); sprintf(height_str, "%i", height);
@ -177,7 +178,7 @@ void ScreenKeyboard::createButtons()
int total_width = m_area.getWidth() - 2 * (int)pos_x; int total_width = m_area.getWidth() - 2 * (int)pos_x;
char tmp[100]; char tmp[100];
sprintf(tmp, "%i", pos_y + height * i); sprintf(tmp, "%i", pos_y + (height + margin) * i);
std::string pos_y_str = tmp; std::string pos_y_str = tmp;
int total_proportions = 0; int total_proportions = 0;
@ -192,7 +193,7 @@ void ScreenKeyboard::createButtons()
for (int j = 0; j < cols_num; j++) for (int j = 0; j < cols_num; j++)
{ {
float width = (float)total_width * layout_proportions[i][j] float width = (float)total_width * layout_proportions[i][j]
/ total_proportions; / total_proportions - margin;
char width_str[100]; char width_str[100];
sprintf(width_str, "%i", (int)roundf(width)); sprintf(width_str, "%i", (int)roundf(width));
@ -210,7 +211,7 @@ void ScreenKeyboard::createButtons()
m_widgets.push_back(button); m_widgets.push_back(button);
m_buttons.push_back(button); m_buttons.push_back(button);
pos_x += width; pos_x += width + margin;
} }
} }