Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix broken ctrl+shift modifiers #13435

Merged
merged 2 commits into from
Feb 3, 2018
Merged

Conversation

garbear
Copy link
Member

@garbear garbear commented Jan 25, 2018

This fixes a regression introduced in #13354. Apparently somewhere in the code, Kodi makes the assumption that new keyboard modifiers won't be introduced. I couldn't find this assumption after much searching, so I'm reverting the problematic commit from #13354 and simply introducing a second variable to hold these new modifiers.

Motivation and Context

Reported here: https://forum.kodi.tv/showthread.php?tid=298462&pid=2694915#pid2694915

How Has This Been Tested?

Tested on Linux.

Before: In Fullscreen Video, pressing CTRL+Shift+O had the same effect as pressing O (PlayerProcess info).

Now: pressing CTRL+Shift+O properly opens debug info.

Types of change

  • Bug fix (non-breaking change which fixes an issue)
  • Improvement (non-breaking change which improves existing functionality)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

@MilhouseVH
Copy link
Contributor

Thanks - will include in future nightly test builds if doesn't merge beforehand.

@MilhouseVH
Copy link
Contributor

MilhouseVH commented Jan 25, 2018

@garbear can you rebase - unfortunately other PRs have merged and gotten in before you. :)

@garbear
Copy link
Member Author

garbear commented Jan 25, 2018

@MilhouseVH rebased

@jenkins4kodi jenkins4kodi added the Rebase needed PR that does not apply/merge cleanly to current base branch label Jan 27, 2018
This fixes some keyboard actions by separating regular and locking
modifiers.
@jenkins4kodi jenkins4kodi removed the Rebase needed PR that does not apply/merge cleanly to current base branch label Jan 28, 2018
@garbear
Copy link
Member Author

garbear commented Feb 2, 2018

jenkins build this please

1 similar comment
@garbear
Copy link
Member Author

garbear commented Feb 2, 2018

jenkins build this please

@garbear
Copy link
Member Author

garbear commented Feb 2, 2018

jenkins build and merge

@jenkins4kodi jenkins4kodi merged commit f5f683e into xbmc:master Feb 3, 2018
@garbear garbear deleted the fix-modifiers branch February 3, 2018 00:13
@Rechi Rechi added Type: Fix non-breaking change which fixes an issue Component: Input v18 Leia labels Feb 3, 2018
@Rechi Rechi added this to the L 18.0-alpha1 milestone Feb 3, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: Input Type: Fix non-breaking change which fixes an issue v18 Leia
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants