Skip to content
Snippets Groups Projects
Commit e1705276 authored by tcarver's avatar tcarver
Browse files

fix for setting the user defined key modifiers in the preferences

parent 6edf35dd
No related branches found
No related tags found
No related merge requests found
......@@ -365,9 +365,15 @@ public class SelectionMenu extends JMenu
final JComboBox mod_combo = new JComboBox(mod_list);
final KeyStroke ks = mi.getAccelerator();
if(ks != null)
{
combo.setSelectedItem( getKeyText(ks.getKeyCode()) );
mod_combo.setSelectedItem( getModifierFromInt(ks.getModifiers()) );
}
else
{
combo.setSelectedItem("--");
mod_combo.setSelectedItem("Default");
}
Dimension dim = combo.getPreferredSize();
dim = new Dimension(100, dim.height);
......@@ -383,7 +389,6 @@ public class SelectionMenu extends JMenu
});
// modifier
mod_combo.setSelectedItem("Default");
mod_combo.setPreferredSize(dim);
mod_combo.setMaximumSize(dim);
mod_combo.addItemListener(new ItemListener()
......@@ -438,6 +443,17 @@ public class SelectionMenu extends JMenu
return modifier;
}
private String getModifierFromInt(int mod)
{
if( (InputEvent.ALT_MASK & mod) == InputEvent.ALT_MASK)
return "Alt";
else if( (InputEvent.CTRL_MASK & mod) == InputEvent.CTRL_MASK)
return "Ctrl";
else if( (InputEvent.SHIFT_MASK & mod) == InputEvent.SHIFT_MASK)
return "Shift";
return "Default";
}
public static String getKeyText(int keyCode)
{
if(keyCode >= KeyEvent.VK_0 && keyCode <= KeyEvent.VK_9 ||
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment