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.

Sign up for GitHub

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

Jump to bottom

more tooltips colors #4957

Merged
merged 5 commits into from
Dec 21, 2023
Merged

more tooltips colors #4957

merged 5 commits into from
Dec 21, 2023

Conversation

kuronekochomusuke
Copy link
Collaborator

@kuronekochomusuke kuronekochomusuke commented Dec 14, 2023 •
edited
Loading

  • set FG color and BG color for more tooltips
  • add highlight, weapon, quirk client settings
  • consolidate some colors into existing client setting colors

image
image

fixes #4522

@kuronekochomusuke kuronekochomusuke marked this pull request as draft December 14, 2023 00:42
@kuronekochomusuke kuronekochomusuke added the Unit Display Deals with the in-game unit display window label Dec 14, 2023
@kuronekochomusuke kuronekochomusuke marked this pull request as ready for review December 15, 2023 00:26
NickAragua
NickAragua reviewed Dec 15, 2023
View reviewed changes
megamek/src/megamek/client/ui/swing/tooltip/UnitToolTip.java
@@ -1882,7 +1889,7 @@ private static StringBuilder c3Info(Entity entity, boolean details) {
sC3Info += "<BR>";
}

result = guiScaledFontHTML(uiC3Color(), -0.2f) + sC3Info + "</FONT>";
result = guiScaledFontHTML(GUIP.getUnitToolTipHighlightColor(), -0.2f) + sC3Info + "</FONT>";
Copy link
Member

Choose a reason for hiding this comment

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

What about the C3 color? Or is that the same as the unit tooltip highlight color now?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

c3 and the highlight color were similar colors. I did not want to add a lot of extra color settings that are only used in one spot, but if you think it should have one, I can add it.

Copy link
Member

Choose a reason for hiding this comment

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

Nah, it's fine for now.

@HammerGS HammerGS merged commit f3fb654 into MegaMek:master Dec 21, 2023
4 checks passed
HammerGS added a commit that referenced this pull request Dec 21, 2023
@HammerGS
+ Issue #4949: return impossible instead of raising an error
41ffb2c 
+ PR #4957: More tooltips colors (set FG color and BG color for more
tooltips, add highlight, weapon, quirk client settings, consolidate some
colors into existing client setting colors)

+ PR #4922: Add deployment options (There is a lot in this one see note
from PR link for specifics)
@kuronekochomusuke kuronekochomusuke deleted the unitToolTipMoreColors branch December 31, 2023 21:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NickAragua NickAragua NickAragua left review comments

@SJuliez SJuliez SJuliez approved these changes

Assignees
No one assigned
Labels
Unit Display Deals with the in-game unit display window
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

RFE: Allow color selection for unit tooltip text 0.49.14-SNAPSHOT
4 participants
@kuronekochomusuke @SJuliez @NickAragua @HammerGS