fix crash when open target context menu #2618
Merged
+28
−46
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
WeylonSantana
force-pushed
the
fix-2610
branch
from
f5db86e to
cabb5f3
Compare
lodicolo
requested changes
Feb 22, 2025
Comment on lines
158
to
168
| if (_entity is Player player && player != _me && string.IsNullOrWhiteSpace(player.Guild)) | ||
| { | ||
| if (_me?.GuildRank?.Permissions?.Invite ?? false) | ||
| { | ||
| Insert(0, _targetNameMenuItem); | ||
| AddChild(_guildMenuItem); | ||
| } | ||
| } | ||
| else | ||
|
|
||
| if (_entity is Player plyr && plyr != _me) | ||
| { | ||
| Remove(_targetNameMenuItem); | ||
| AddChild(_privateMessageMenuItem); |
There was a problem hiding this comment.
_entity shouldn't be checked if it's a player twice
| @@ -134,27 +139,33 @@ public void ToggleHidden(object? target) | |||
| } | |||
| } | |||
|
|
|||
| private void TryShowTargetButton(bool shouldShow) | |||
| private void _buildContextMenu(bool shouldShowTargetName = false) | |||
| _nameDivider = new MenuDivider(this) | ||
| { | ||
| Dock = Pos.Top, | ||
| Margin = new Margin(IconMarginDisabled ? 0 : 24, 0, 4, 0), |
There was a problem hiding this comment.
Why does a divider have a margin?
| { | ||
| Dock = Pos.Top, | ||
| Margin = new Margin(IconMarginDisabled ? 0 : 24, 0, 4, 0), | ||
| Height = 1, |
There was a problem hiding this comment.
This isn't necessary when MinimumSize will already control this
lodicolo
approved these changes
Feb 23, 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.
resolves #2610