mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-06 06:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix regression: Show left/right mouse button triggers in keyboard shortcuts

Browse Source
This commit is contained in:
David Capello 2015-12-26 14:52:29 -03:00
parent 7b5827a151
commit c8abf0cfc7
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/gui.xml
View File

@ -453,6 +453,10 @@
<!-- Modifiers for freehand tool controller -->
<key action="StraightLineFromLastPoint" shortcut="Shift" />
<!-- Without default shortcuts -->
<key action="LeftMouseButton" />
<key action="RightMouseButton" />
</actions>
</keyboard>

22
src/app/ui/keyboard_shortcuts.cpp
View File

@ -375,13 +375,12 @@ void KeyboardShortcuts::importFile(TiXmlElement* rootElement, KeySource source)
const char* tool_key = get_shortcut(xmlKey);
bool removed = bool_attr_is_true(xmlKey, "removed");
if (tool_id && tool_key) {
if (tool_id) {
tools::Tool* tool = App::instance()->getToolBox()->getToolById(tool_id);
if (tool) {
LOG(" - Shortcut for tool `%s': <%s>\n", tool_id, tool_key);
Key* key = this->tool(tool);
if (key) {
if (key && tool_key) {
LOG(" - Shortcut for tool `%s': <%s>\n", tool_id, tool_key);
Accelerator accel(tool_key);
if (!removed)
@ -404,13 +403,12 @@ void KeyboardShortcuts::importFile(TiXmlElement* rootElement, KeySource source)
const char* tool_key = get_shortcut(xmlKey);
bool removed = bool_attr_is_true(xmlKey, "removed");
if (tool_id && tool_key) {
if (tool_id) {
tools::Tool* tool = App::instance()->getToolBox()->getToolById(tool_id);
if (tool) {
LOG(" - Shortcut for quicktool `%s': <%s>\n", tool_id, tool_key);
Key* key = this->quicktool(tool);
if (key) {
if (key && tool_key) {
LOG(" - Shortcut for quicktool `%s': <%s>\n", tool_id, tool_key);
Accelerator accel(tool_key);
if (!removed)
@ -433,14 +431,12 @@ void KeyboardShortcuts::importFile(TiXmlElement* rootElement, KeySource source)
const char* tool_key = get_shortcut(xmlKey);
bool removed = bool_attr_is_true(xmlKey, "removed");
if (tool_action && tool_key) {
LOG(" - Shortcut for sprite editor `%s': <%s>\n", tool_action, tool_key);
if (tool_action) {
KeyAction action = base::convert_to<KeyAction, std::string>(tool_action);
if (action != KeyAction::None) {
Key* key = this->action(action);
if (key) {
if (key && tool_key) {
LOG(" - Shortcut for action '%s': <%s>\n", tool_action, tool_key);
Accelerator accel(tool_key);
if (!removed)