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

Add Modifier buttons to input viewer and support individual button outline modes #3966

Merged
merged 5 commits into from
May 10, 2024

Conversation

Tawling
Copy link
Contributor

@Tawling Tawling commented Feb 22, 2024

The input viewer did not have layers for representing the two modifier buttons. This PR adds Mod1.png, Mod1Outline.png, Mod2.png, and Mod2Outline.png as new layers supported by the input viewer. (hidden by default)

Additionally, this PR adds support for setting the Outline Mode for each button individually, or just using the same setting for all of them.

New modifier buttons:
image

Single setting for all buttons:
image

Separate setting per button:
image

Build Artifacts

Copy link
Contributor

@inspectredc inspectredc left a comment

Choose a reason for hiding this comment

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

LGTM, I'll need to double check how the UI looks later but everything seems sensible to me. Just a small thing and then I was also curious about the Indent stuff, is using set values like that alright for different resolutions? (I know it's a small number anyway + I'm not a UI person)

soh/soh/Enhancements/controls/InputViewer.cpp Outdated Show resolved Hide resolved
@Tawling
Copy link
Contributor Author

Tawling commented Feb 23, 2024

is using set values like that alright for different resolutions? (I know it's a small number anyway + I'm not a UI person)

Looking into other uses in the codebase it seems they don't specify a value for Indent calls, so I'll follow that same paradigm here.

Copy link
Contributor

@garrettjoecox garrettjoecox left a comment

Choose a reason for hiding this comment

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

This file would probably benefit from a pass of macros or creating a map to iterate with rather than repeating code, but doesn't need to happen here

:shipit:

@garrettjoecox
Copy link
Contributor

@Tawling if you have a chance could you sort the conflicts here? Mostly changing LUS -> Ship and cvar macro stuff

@briaguya-ai briaguya-ai merged commit 844413b into HarbourMasters:develop May 10, 2024
5 checks passed
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

4 participants