Fix 6593: counterbattery icon hidden in double blind #6607
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #6607 +/- ##
============================================
- Coverage 29.11% 29.09% -0.02%
+ Complexity 15295 15277 -18
============================================
Files 2837 2837
Lines 279718 279737 +19
Branches 49286 49291 +5
============================================
- Hits 81429 81403 -26
- Misses 192820 192878 +58
+ Partials 5469 5456 -13 ☔ View full report in Codecov by Sentry. |
rjhancock
reviewed
Feb 24, 2025
| if (GUIP.getUnitDisplayEnabled() && GUIP.getUnitDisplayLocaton() == 0) { | ||
| // Move arrow inward if either side overlaps with the Unit Display | ||
| Rectangle udRectangle = clientgui.getUnitDisplayDialog().getBounds(); | ||
| if ((myRectangle.x + myRectangle.width + 5 > udRectangle.x && myRectangle.x <= udRectangle.x + udRectangle.width) || |
There was a problem hiding this comment.
Add some parenthesis to prevent ambiguity.
There was a problem hiding this comment.
Sorry, I popped out to a show.
I was on the fence about adding more parentheses: on the one hand, unambiguous; on the other, longer and more difficult to read.
Luckily the operator precedence is with us this time:
https://pages.cs.wisc.edu/~willb/cs302/java-operator-precedence.pdf
But in the future I'll add the parentheses.
HammerGS
approved these changes
Feb 24, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes two issues:
Testing:
Close #6593