aligned hotkey display format with doc

This commit is contained in:
Thomas Jentzsch 2022-04-06 11:46:14 +02:00
parent fc1d87f6de
commit 0e159f4f66
2 changed files with 5 additions and 5 deletions

View File

@ -162,17 +162,17 @@ string KeyMap::getDesc(const Mapping& mapping) const
else if(mapping.mod & KBDM_LCTRL) buf << "Left Ctrl";
else if(mapping.mod & KBDM_RCTRL) buf << "Right Ctrl";
if((mapping.mod & (MOD2)) && buf.tellp()) buf << "+";
if((mapping.mod & (MOD2)) && buf.tellp()) buf << "-";
if((mapping.mod & MOD2) == MOD2) buf << mod2;
else if(mapping.mod & LMOD2) buf << "Left " << mod2;
else if(mapping.mod & RMOD2) buf << "Right " << mod2;
if((mapping.mod & (MOD3)) && buf.tellp()) buf << "+";
if((mapping.mod & (MOD3)) && buf.tellp()) buf << "-";
if((mapping.mod & MOD3) == MOD3) buf << mod3;
else if(mapping.mod & LMOD3) buf << "Left " << mod3;
else if(mapping.mod & RMOD3) buf << "Right " << mod3;
if((mapping.mod & (KBDM_SHIFT)) && buf.tellp()) buf << "+";
if((mapping.mod & (KBDM_SHIFT)) && buf.tellp()) buf << "-";
if((mapping.mod & KBDM_SHIFT) == KBDM_SHIFT) buf << "Shift";
else if(mapping.mod & KBDM_LSHIFT) buf << "Left Shift";
else if(mapping.mod & KBDM_RSHIFT) buf << "Right Shift";

View File

@ -314,8 +314,8 @@ string Widget::getToolTip(const Common::Point& pos) const
if(hotkey2 != EmptyString)
{
// Merge hotkeys if they only differ by "+Shift"
const string mod = "+Shift";
// Merge hotkeys if they only differ by "-Shift"
const string mod = "-Shift";
const size_t p = BSPF::findIgnoreCase(hotkey, mod);
if(p != string::npos)