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

Keybinding - Highlight individual duplicate keys #972

Merged
merged 6 commits into from
Sep 1, 2018

Conversation

mharis001
Copy link
Contributor

@mharis001 mharis001 commented Aug 31, 2018

When merged this pull request will:

  • Similarly to vanilla, highlight individual duplicate keys
  • Match tooltip box of _edit and _assigned
  • Before:
    cba_keybind_highlight_1
  • After:
    cba_keybind_highlight_2


_keyNames pushBack _keyName;
_keybind in _duplicateKeybinds && {_action != _duplicateAction}
} > -1) then {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very cool. Apparently Travis doesn't understand if findIf.

_assigned ctrlSetTextColor [1,0,0,1];
};
_assigned ctrlSetTooltipColorBox [1,1,1,1];
_assigned ctrlSetTooltipColorShade [0,0,0,0.7];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These already were the values used I believe. Although setting them explicitly may be more robust if future changes happen (e.g. by BI).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RscStructuredText, unlike RscText, has no entries for tooltip defined, and the defaults look different to these. Should probably just move these to config though.

@PabstMirror PabstMirror added this to the 3.8.1 milestone Sep 1, 2018
@commy2
Copy link
Contributor

commy2 commented Sep 1, 2018

Fixed for the code validation. _isDuplicated isn't a boolean, but it does look easier to read like this. Idk.

@commy2 commy2 merged commit 8fe0744 into CBATeam:master Sep 1, 2018
@mharis001 mharis001 deleted the keybinding-duplicates branch September 1, 2018 11:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants