-
Notifications
You must be signed in to change notification settings - Fork 521
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
Add Modifier buttons to input viewer and support individual button outline modes #3966
Conversation
There was a problem hiding this 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)
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. |
There was a problem hiding this 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
@Tawling if you have a chance could you sort the conflicts here? Mostly changing LUS -> Ship and cvar macro stuff |
The input viewer did not have layers for representing the two modifier buttons. This PR adds
Mod1.png
,Mod1Outline.png
,Mod2.png
, andMod2Outline.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](https://private-user-images.githubusercontent.com/7520947/307080238-118810ef-b8f0-46ba-9ca5-1b250612ce41.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzg5OTM4NjEsIm5iZiI6MTczODk5MzU2MSwicGF0aCI6Ii83NTIwOTQ3LzMwNzA4MDIzOC0xMTg4MTBlZi1iOGYwLTQ2YmEtOWNhNS0xYjI1MDYxMmNlNDEucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI1MDIwOCUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNTAyMDhUMDU0NjAxWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9YTc4MDRkOTY4MTFlNTUzNGNhMmZlNjgzNTAzMGQ2M2NmY2M0Y2JlZGMyNTY2NjI1ZjgwM2I5YmU3YmIwMjhmZCZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QifQ.6ZjZanjy8vVobzGSkXx1oc3ZG-0UlVEvaUJ2WszbjzU)
Single setting for all buttons:
![image](https://private-user-images.githubusercontent.com/7520947/307080407-e3ae7c97-8b5c-4261-b172-e216945ce50c.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzg5OTM4NjEsIm5iZiI6MTczODk5MzU2MSwicGF0aCI6Ii83NTIwOTQ3LzMwNzA4MDQwNy1lM2FlN2M5Ny04YjVjLTQyNjEtYjE3Mi1lMjE2OTQ1Y2U1MGMucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI1MDIwOCUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNTAyMDhUMDU0NjAxWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9ZWM0ZTgxNjdjODZmNGU5NmI4ZWE1M2I3ZmUzZmJjZjQ4ZTM2YjE5Yzg1YmVmNWFhOWRlMGI2Zjg5ZmY1MzBjNSZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QifQ.mY9bbK47RbcCQhCFjn3K34NuRvnJuW6jRATFtDtCwPM)
Separate setting per button:
![image](https://private-user-images.githubusercontent.com/7520947/307080510-149f9152-bd18-4aa2-b7ab-2858bee8e3dd.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3Mzg5OTM4NjEsIm5iZiI6MTczODk5MzU2MSwicGF0aCI6Ii83NTIwOTQ3LzMwNzA4MDUxMC0xNDlmOTE1Mi1iZDE4LTRhYTItYjdhYi0yODU4YmVlOGUzZGQucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI1MDIwOCUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNTAyMDhUMDU0NjAxWiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9Yzk0Yjc1N2UwYmUwOGQyMjRiMWJmMTQ0ZTRjMjM1MDdhMWE1MTMyZjhiYTA0NDMxMWMwYzdiZWVlM2UyYTUwZCZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QifQ.s8IzTLAgHBTq_HM3JIIMlQx5Tn1icoVoCWZjUHXTz2o)
Build Artifacts