mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Convert generic accelerator to platform accelerator.

Browse source 
When creating menus, the accelerators must be converted to platform
accelerators before they can be used.
This commit is contained in:
Cheng Zhao 2013-05-16 15:24:18 +08:00
parent 995b9dacc9
commit b16c19ce32
4 changed files with 42 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
browser/accelerator_util.cc
View file

@ -43,6 +43,7 @@ bool StringToAccelerator(const std::string& description,
std::vector<std::string> tokens;
base::SplitString(shortcut, '+', &tokens);
if (tokens.size() < 2 || tokens.size() > 3) {
LOG(WARNING) << "Invalid accelerator description: " << description;
return false;
}
@ -69,15 +70,18 @@ bool StringToAccelerator(const std::string& description,
} else if (tokens[i][0] >= '0' && tokens[i][0] <= '9') {
key = static_cast<ui::KeyboardCode>(ui::VKEY_0 + (tokens[i][0] - '0'));
} else {
LOG(WARNING) << "Invalid accelerator character: " << tokens[i];
key = ui::VKEY_UNKNOWN;
break;
}
} else {
LOG(WARNING) << "Invalid accelerator token: " << tokens[i];
return false;
}
}
*accelerator = ui::Accelerator(key, modifiers);
SetPlatformAccelerator(accelerator);
return true;
}