refactor spells window/item #2659
Merged
+261
−301
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
lodicolo
requested changes
Mar 12, 2025
| private readonly Label _cooldownLabel; | ||
| private readonly SpellsWindow _spellWindow; | ||
| private Draggable? _dragIcon; | ||
| private SpellDescriptionWindow? _descWindow; |
| // Controls | ||
| private readonly Label _cooldownLabel; | ||
| private readonly SpellsWindow _spellWindow; | ||
| private Draggable? _dragIcon; |
There was a problem hiding this comment.
Move to be with other drag related properties
|
|
||
| public ImagePanel Container; | ||
|
|
||
| // Drag Handling | ||
| public bool IsDragging; |
There was a problem hiding this comment.
This should be below the constructor and should be { get; private set; } not a field
Comment on lines
+33
to
+34
| private int _mouseX = -1; | ||
| private int _mouseY = -1; |
There was a problem hiding this comment.
This should be one Point _mousePosition
Comment on lines
+268
to
+269
| _mouseX = InputHandler.MousePosition.X - _iconImage.ToCanvas(new Point(0, 0)).X; | ||
| _mouseY = InputHandler.MousePosition.Y - _iconImage.ToCanvas(new Point(0, 0)).Y; |
There was a problem hiding this comment.
Calling ToCanvas() twice instead of caching the value is atrocious and should be fixed
| mContextMenu?.Close(); | ||
| mSpellWindow.IsHidden = true; | ||
| _contextMenu?.Close(); | ||
| base.Hide(); | ||
| } | ||
|
|
||
| public FloatRect RenderBounds() | ||
| { | ||
| var rect = new FloatRect() |
| } | ||
|
|
||
| private void Pnl_DoubleClicked(Base sender, MouseButtonState arguments) | ||
| void _iconImage_HoverLeave(Base sender, EventArgs arguments) |
| } | ||
|
|
||
| void pnl_Clicked(Base sender, MouseButtonState arguments) | ||
| void _iconImage_Clicked(Base sender, MouseButtonState arguments) |
| { | ||
| mCooldownLabel.IsHidden = true; | ||
| if (spell != null) | ||
| var spellTex = Globals.ContentManager?.GetTexture(TextureType.Spell, spell.Icon); |
| mTexLoaded = string.Empty; | ||
| if (_descWindow != null) | ||
| { | ||
| _descWindow.Dispose(); |
There was a problem hiding this comment.
_descriptionWindow?.Dispose();
lodicolo
approved these changes
Mar 12, 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.
assets AscensionGameDev/Intersect-Assets#67
1741800212_Intersect_Client.mp4