piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-29 17:19:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

use grids instead of nested boxes for input config dialog. (still lags, needs optimization)

Browse Source 
adjust things to make those dialogs sexier.
This commit is contained in:
StapleButter
2017-10-05 01:03:22 +02:00
parent 9d3f13b689
commit 5d5311c53c
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/libui_sdl/DlgInputConfig.cpp
View File

@ -303,27 +303,24 @@ void Open()
{
uiBox* in_ctrl = uiNewHorizontalBox();
uiBoxAppend(top, uiControl(in_ctrl), 0);
uiBoxSetPadded(in_ctrl, 1);
uiGroup* g_key = uiNewGroup("Keyboard");
uiBoxAppend(in_ctrl, uiControl(g_key), 1);
uiBox* b_key = uiNewVerticalBox();
uiGrid* b_key = uiNewGrid();
uiGroupSetChild(g_key, uiControl(b_key));
for (int i = 0; i < 12; i++)
{
int j = keyorder[i];
uiBox* box = uiNewHorizontalBox();
uiBoxAppend(b_key, uiControl(box), 0);
uiLabel* label = uiNewLabel(keylabels[j]);
uiBoxAppend(box, uiControl(label), 1);
uiGridAppend(b_key, uiControl(label), 0, i, 1, 1, 1, uiAlignStart, 1, uiAlignCenter);
char* keyname = uiKeyName(Config::KeyMapping[j]);
uiButton* btn = uiNewButton(keyname);
uiBoxAppend(box, uiControl(btn), 1);
uiGridAppend(b_key, uiControl(btn), 1, i, 1, 1, 1, uiAlignFill, 1, uiAlignCenter);
uiButtonOnClicked(btn, OnKeyStartConfig, &keyorder[i]);
uiFreeText(keyname);
@ -331,24 +328,21 @@ void Open()
uiGroup* g_joy = uiNewGroup("Joystick");
uiBoxAppend(in_ctrl, uiControl(g_joy), 1);
uiBox* b_joy = uiNewVerticalBox();
uiGrid* b_joy = uiNewGrid();
uiGroupSetChild(g_joy, uiControl(b_joy));
for (int i = 0; i < 12; i++)
{
int j = keyorder[i];
uiBox* box = uiNewHorizontalBox();
uiBoxAppend(b_joy, uiControl(box), 0);
uiLabel* label = uiNewLabel(keylabels[j]);
uiBoxAppend(box, uiControl(label), 1);
uiGridAppend(b_joy, uiControl(label), 0, i, 1, 1, 1, uiAlignStart, 1, uiAlignCenter);
char keyname[16];
JoyMappingName(Config::JoyMapping[j], keyname);
uiButton* btn = uiNewButton(keyname);
uiBoxAppend(box, uiControl(btn), 1);
uiGridAppend(b_joy, uiControl(btn), 1, i, 1, 1, 1, uiAlignFill, 1, uiAlignCenter);
uiButtonOnClicked(btn, OnJoyStartConfig, &keyorder[i]);
}
}