pandory500/redquark-amiberry-rb
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed Custom Controls panel would not show assigned value in Dropdowns on opening GUI

Browse source
This commit is contained in:
Dimitris Panokostas 2020-05-29 18:41:15 +02:00
parent 58f1d3d3a6
commit 22c5dadf9a
1 changed files with 40 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

82
src/osdep/gui/PanelCustom.cpp
View file

@ -22,8 +22,8 @@ static gcn::RadioButton* optPort3;
static gcn::Window* grpFunction; static gcn::Window* grpFunction;
static gcn::RadioButton* optMultiNone; static gcn::RadioButton* optMultiNone;
static gcn::RadioButton* optMultiSelect; static gcn::RadioButton* optMultiSelect;
static gcn::RadioButton* optMultiLeft; //static gcn::RadioButton* optMultiLeft;
static gcn::RadioButton* optMultiRight; //static gcn::RadioButton* optMultiRight;
static gcn::Label* lblCustomAction[14]; static gcn::Label* lblCustomAction[14];
static gcn::DropDown* cboCustomAction[14]; static gcn::DropDown* cboCustomAction[14];
@ -162,10 +162,10 @@ public:
SelectedFunction = 0; SelectedFunction = 0;
else if (actionEvent.getSource() == optMultiSelect) else if (actionEvent.getSource() == optMultiSelect)
SelectedFunction = 1; SelectedFunction = 1;
else if (actionEvent.getSource() == optMultiLeft) //else if (actionEvent.getSource() == optMultiLeft)
SelectedFunction = 2; //SelectedFunction = 2;
else if (actionEvent.getSource() == optMultiRight) //else if (actionEvent.getSource() == optMultiRight)
SelectedFunction = 3; //SelectedFunction = 3;
else if (actionEvent.getSource() == chkAnalogRemap) else if (actionEvent.getSource() == chkAnalogRemap)
changed_prefs.input_analog_remap = chkAnalogRemap->isSelected(); changed_prefs.input_analog_remap = chkAnalogRemap->isSelected();
@ -194,12 +194,12 @@ public:
case 1: case 1:
tempmap = changed_prefs.jports[SelectedPort].amiberry_custom_hotkey; tempmap = changed_prefs.jports[SelectedPort].amiberry_custom_hotkey;
break; break;
case 2: //case 2:
tempmap = changed_prefs.jports[SelectedPort].amiberry_custom_left_trigger; //tempmap = changed_prefs.jports[SelectedPort].amiberry_custom_left_trigger;
break; //break;
case 3: //case 3:
tempmap = changed_prefs.jports[SelectedPort].amiberry_custom_right_trigger; //tempmap = changed_prefs.jports[SelectedPort].amiberry_custom_right_trigger;
break; //break;
default: default:
break; break;
} }
@ -283,7 +283,7 @@ public:
} }
// push map back into changed_pre // push map back into changed_prefs
switch (SelectedFunction) switch (SelectedFunction)
{ {
case 0: case 0:
@ -292,12 +292,12 @@ public:
case 1: case 1:
changed_prefs.jports[SelectedPort].amiberry_custom_hotkey = tempmap; changed_prefs.jports[SelectedPort].amiberry_custom_hotkey = tempmap;
break; break;
case 2: //case 2:
changed_prefs.jports[SelectedPort].amiberry_custom_left_trigger = tempmap; //changed_prefs.jports[SelectedPort].amiberry_custom_left_trigger = tempmap;
break; //break;
case 3: //case 3:
changed_prefs.jports[SelectedPort].amiberry_custom_right_trigger = tempmap; //changed_prefs.jports[SelectedPort].amiberry_custom_right_trigger = tempmap;
break; //break;
default: default:
break; break;
} }
@ -486,8 +486,8 @@ void ExitPanelCustom()
delete optMultiNone; delete optMultiNone;
delete optMultiSelect; delete optMultiSelect;
delete optMultiLeft; //delete optMultiLeft;
delete optMultiRight; //delete optMultiRight;
delete grpFunction; delete grpFunction;
delete chkAnalogRemap; delete chkAnalogRemap;
@ -531,12 +531,12 @@ void RefreshPanelCustom(void)
case 1: case 1:
tempmap = changed_prefs.jports[SelectedPort].amiberry_custom_hotkey; tempmap = changed_prefs.jports[SelectedPort].amiberry_custom_hotkey;
break; break;
case 2: //case 2:
tempmap = changed_prefs.jports[SelectedPort].amiberry_custom_left_trigger; //tempmap = changed_prefs.jports[SelectedPort].amiberry_custom_left_trigger;
break; //break;
case 3: //case 3:
tempmap = changed_prefs.jports[SelectedPort].amiberry_custom_right_trigger; //tempmap = changed_prefs.jports[SelectedPort].amiberry_custom_right_trigger;
break; //break;
default: default:
break; break;
} }
@ -545,7 +545,8 @@ void RefreshPanelCustom(void)
// update the joystick port , and disable those which are not available // update the joystick port , and disable those which are not available
char tmp[255]; char tmp[255];
if (changed_prefs.jports[SelectedPort].id >= JSEM_JOYS + num_keys_as_joys && changed_prefs.jports[SelectedPort].id < JSEM_MICE - 1) if (changed_prefs.jports[SelectedPort].id >= JSEM_JOYS + num_keys_as_joys && changed_prefs.jports[SelectedPort].id <
JSEM_MICE - 1)
{ {
const auto hostjoyid = changed_prefs.jports[SelectedPort].id - JSEM_JOYS - num_keys_as_joys; const auto hostjoyid = changed_prefs.jports[SelectedPort].id - JSEM_JOYS - num_keys_as_joys;
strncpy(tmp, SDL_JoystickNameForIndex(hostjoyid), 255); strncpy(tmp, SDL_JoystickNameForIndex(hostjoyid), 255);
@ -634,7 +635,7 @@ void RefreshPanelCustom(void)
lblCustomAction[n]->setEnabled(temp_button + 1 != 0); lblCustomAction[n]->setEnabled(temp_button + 1 != 0);
// set hotkey/quit/reset/menu on NONE field (and disable hotkey) // set hotkey/quit/reset/menu on NONE field (and disable hotkey)
if (temp_button == host_input_buttons[hostjoyid].hotkey_button if (temp_button == host_input_buttons[hostjoyid].hotkey_button
&& temp_button != -1) && temp_button != -1)
{ {
cboCustomAction[n]->setListModel(&CustomEventList_HotKey); cboCustomAction[n]->setListModel(&CustomEventList_HotKey);
@ -643,9 +644,9 @@ void RefreshPanelCustom(void)
lblCustomAction[n]->setEnabled(false); lblCustomAction[n]->setEnabled(false);
} }
else if (temp_button == host_input_buttons[hostjoyid].quit_button else if (temp_button == host_input_buttons[hostjoyid].quit_button
&& temp_button != -1 && temp_button != -1
&& SelectedFunction == 1 && SelectedFunction == 1
&& changed_prefs.use_retroarch_quit) && changed_prefs.use_retroarch_quit)
{ {
cboCustomAction[n]->setListModel(&CustomEventList_Quit); cboCustomAction[n]->setListModel(&CustomEventList_Quit);
@ -654,9 +655,9 @@ void RefreshPanelCustom(void)
lblCustomAction[n]->setEnabled(false); lblCustomAction[n]->setEnabled(false);
} }
else if (temp_button == host_input_buttons[hostjoyid].menu_button else if (temp_button == host_input_buttons[hostjoyid].menu_button
&& temp_button != -1 && temp_button != -1
&& SelectedFunction == 1 && SelectedFunction == 1
&& changed_prefs.use_retroarch_menu) && changed_prefs.use_retroarch_menu)
{ {
cboCustomAction[n]->setListModel(&CustomEventList_Menu); cboCustomAction[n]->setListModel(&CustomEventList_Menu);
@ -665,9 +666,9 @@ void RefreshPanelCustom(void)
lblCustomAction[n]->setEnabled(false); lblCustomAction[n]->setEnabled(false);
} }
else if (temp_button == host_input_buttons[hostjoyid].reset_button else if (temp_button == host_input_buttons[hostjoyid].reset_button
&& temp_button != -1 && temp_button != -1
&& SelectedFunction == 1 && SelectedFunction == 1
&& changed_prefs.use_retroarch_reset) && changed_prefs.use_retroarch_reset)
{ {
cboCustomAction[n]->setListModel(&CustomEventList_Reset); cboCustomAction[n]->setListModel(&CustomEventList_Reset);
@ -801,10 +802,7 @@ void RefreshPanelCustom(void)
break; break;
} }
const auto x = find_in_array(RemapEventList, RemapEventListSize, eventnum); const auto x = find_in_array(RemapEventList, RemapEventListSize, eventnum);
if (cboCustomAction[z]->isEnabled()) cboCustomAction[z]->setSelected(x + 1);
{
cboCustomAction[z]->setSelected(x + 1);
}
} }
} }