Skip to content

Commit 01a76a2

Browse files
WeylonSantanaWeylonSantana
committed
expose icon image
1 parent b5a4cd3 commit 01a76a2

File tree

7 files changed

+114
-106
lines changed

7 files changed

+114
-106
lines changed

‎Intersect.Client.Core/Interface/Game/Bag/BagItem.cs‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ public BagItem(BagWindow bagWindow, Base parent, int index, ContextMenu contextM
3232
_bagWindow = bagWindow;
3333
TextureFilename = "bagitem.png";
3434

35-
_iconImage.HoverEnter += _iconImage_HoverEnter;
36-
_iconImage.HoverLeave += _iconImage_HoverLeave;
37-
_iconImage.Clicked += _iconImage_Clicked;
38-
_iconImage.DoubleClicked += _iconImage_DoubleClicked;
35+
IconImage.HoverEnter += IconImage_HoverEnter;
36+
IconImage.HoverLeave += IconImage_HoverLeave;
37+
IconImage.Clicked += IconImage_Clicked;
38+
IconImage.DoubleClicked += IconImage_DoubleClicked;
3939

4040
_quantityLabel = new Label(this, "Quantity")
4141
{
@@ -87,7 +87,7 @@ private void _withdrawMenuItem_Clicked(Base sender, MouseButtonState arguments)
8787

8888
#region Mouse Events
8989

90-
private void _iconImage_HoverEnter(Base? sender, EventArgs? arguments)
90+
private void IconImage_HoverEnter(Base? sender, EventArgs? arguments)
9191
{
9292
if (InputHandler.MouseFocus != default)
9393
{
@@ -122,13 +122,13 @@ private void _iconImage_HoverEnter(Base? sender, EventArgs? arguments)
122122
);
123123
}
124124

125-
private void _iconImage_HoverLeave(Base sender, EventArgs arguments)
125+
private void IconImage_HoverLeave(Base sender, EventArgs arguments)
126126
{
127127
_descWindow?.Dispose();
128128
_descWindow = default;
129129
}
130130

131-
private void _iconImage_Clicked(Base sender, MouseButtonState arguments)
131+
private void IconImage_Clicked(Base sender, MouseButtonState arguments)
132132
{
133133
if (arguments.MouseButton is MouseButton.Right)
134134
{
@@ -138,12 +138,12 @@ private void _iconImage_Clicked(Base sender, MouseButtonState arguments)
138138
}
139139
else
140140
{
141-
_iconImage_DoubleClicked(sender, arguments);
141+
IconImage_DoubleClicked(sender, arguments);
142142
}
143143
}
144144
}
145145

146-
private void _iconImage_DoubleClicked(Base sender, MouseButtonState arguments)
146+
private void IconImage_DoubleClicked(Base sender, MouseButtonState arguments)
147147
{
148148
if (Globals.InBag)
149149
{
@@ -204,7 +204,7 @@ public override void Update()
204204
if (bagSlots[SlotIndex] is not { Descriptor: not null } or { Quantity: <= 0 })
205205
{
206206
_quantityLabel.IsVisibleInParent = false;
207-
_iconImage.Texture = default;
207+
IconImage.Texture = default;
208208
return;
209209
}
210210

@@ -218,24 +218,24 @@ public override void Update()
218218
_quantityLabel.Text = Strings.FormatQuantityAbbreviated(bagSlot.Quantity);
219219
}
220220

221-
if (_iconImage.TextureFilename == descriptor.Icon)
221+
if (IconImage.TextureFilename == descriptor.Icon)
222222
{
223223
return;
224224
}
225225

226226
var itemTexture = Globals.ContentManager?.GetTexture(Framework.Content.TextureType.Item, descriptor.Icon);
227227
if (itemTexture != default)
228228
{
229-
_iconImage.Texture = itemTexture;
230-
_iconImage.RenderColor = descriptor.Color;
231-
_iconImage.IsVisibleInParent = true;
229+
IconImage.Texture = itemTexture;
230+
IconImage.RenderColor = descriptor.Color;
231+
IconImage.IsVisibleInParent = true;
232232
}
233233
else
234234
{
235-
if (_iconImage.Texture != default)
235+
if (IconImage.Texture != default)
236236
{
237-
_iconImage.Texture = default;
238-
_iconImage.IsVisibleInParent = false;
237+
IconImage.Texture = default;
238+
IconImage.IsVisibleInParent = false;
239239
}
240240
}
241241

‎Intersect.Client.Core/Interface/Game/Bank/BankItem.cs‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ public BankItem(BankWindow bankWindow, Base parent, int index, ContextMenu conte
3535
_bankWindow = bankWindow;
3636
TextureFilename = "bankitem.png";
3737

38-
_iconImage.HoverEnter += _iconImage_HoverEnter;
39-
_iconImage.HoverLeave += _iconImage_HoverLeave;
40-
_iconImage.Clicked += _iconImage_Clicked;
41-
_iconImage.DoubleClicked += _iconImage_DoubleClicked;
38+
IconImage.HoverEnter += IconImage_HoverEnter;
39+
IconImage.HoverLeave += IconImage_HoverLeave;
40+
IconImage.Clicked += IconImage_Clicked;
41+
IconImage.DoubleClicked += IconImage_DoubleClicked;
4242

4343
_quantityLabel = new Label(this, "Quantity")
4444
{
@@ -88,7 +88,7 @@ private void _withdrawMenuItem_Clicked(Base sender, MouseButtonState arguments)
8888

8989
#region Mouse Events
9090

91-
private void _iconImage_HoverEnter(Base? sender, EventArgs? arguments)
91+
private void IconImage_HoverEnter(Base? sender, EventArgs? arguments)
9292
{
9393
if (InputHandler.MouseFocus != null)
9494
{
@@ -124,13 +124,13 @@ private void _iconImage_HoverEnter(Base? sender, EventArgs? arguments)
124124
);
125125
}
126126

127-
private void _iconImage_HoverLeave(Base sender, EventArgs arguments)
127+
private void IconImage_HoverLeave(Base sender, EventArgs arguments)
128128
{
129129
_descWindow?.Dispose();
130130
_descWindow = default;
131131
}
132132

133-
private void _iconImage_Clicked(Base sender, MouseButtonState arguments)
133+
private void IconImage_Clicked(Base sender, MouseButtonState arguments)
134134
{
135135
if (arguments.MouseButton is MouseButton.Right)
136136
{
@@ -140,12 +140,12 @@ private void _iconImage_Clicked(Base sender, MouseButtonState arguments)
140140
}
141141
else
142142
{
143-
_iconImage_DoubleClicked(sender, arguments);
143+
IconImage_DoubleClicked(sender, arguments);
144144
}
145145
}
146146
}
147147

148-
private void _iconImage_DoubleClicked(Base sender, MouseButtonState arguments)
148+
private void IconImage_DoubleClicked(Base sender, MouseButtonState arguments)
149149
{
150150
if (!Globals.InBank)
151151
{
@@ -269,7 +269,7 @@ public override bool DragAndDrop_HandleDrop(Package package, int x, int y)
269269
if (bankSlots[SlotIndex] is not { Descriptor: not null } or { Quantity: <= 0 })
270270
{
271271
_quantityLabel.IsVisibleInParent = false;
272-
_iconImage.Texture = default;
272+
IconImage.Texture = default;
273273
return;
274274
}
275275

@@ -283,24 +283,24 @@ public override bool DragAndDrop_HandleDrop(Package package, int x, int y)
283283
_quantityLabel.Text = Strings.FormatQuantityAbbreviated(bankSlot.Quantity);
284284
}
285285

286-
if (_iconImage.TextureFilename == descriptor.Icon)
286+
if (IconImage.TextureFilename == descriptor.Icon)
287287
{
288288
return;
289289
}
290290

291291
var itemTexture = Globals.ContentManager?.GetTexture(Framework.Content.TextureType.Item, descriptor.Icon);
292292
if (itemTexture != default)
293293
{
294-
_iconImage.Texture = itemTexture;
295-
_iconImage.RenderColor = descriptor.Color;
296-
_iconImage.IsVisibleInParent = true;
294+
IconImage.Texture = itemTexture;
295+
IconImage.RenderColor = descriptor.Color;
296+
IconImage.IsVisibleInParent = true;
297297
}
298298
else
299299
{
300-
if (_iconImage.Texture != default)
300+
if (IconImage.Texture != default)
301301
{
302-
_iconImage.Texture = default;
303-
_iconImage.IsVisibleInParent = false;
302+
IconImage.Texture = default;
303+
IconImage.IsVisibleInParent = false;
304304
}
305305
}
306306

‎Intersect.Client.Core/Interface/Game/Hotbar/HotbarItem.cs‎

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@ public HotbarItem(int hotbarSlotIndex, Base hotbarWindow)
5858
RestrictToParent = true;
5959
TextureFilename = "hotbaritem.png";
6060

61-
// _iconImage is layered on top of the container (shows the Item or Spell Icon).
62-
_iconImage.Name = $"{nameof(HotbarItem)}{SlotIndex}";
63-
_iconImage.SetPosition(1, 1);
64-
_iconImage.HoverEnter += _iconImage_HoverEnter;
65-
_iconImage.HoverLeave += _iconImage_HoverLeave;
66-
_iconImage.Clicked += _iconImage_Clicked;
61+
IconImage.Name = $"{nameof(HotbarItem)}{SlotIndex}";
62+
IconImage.SetPosition(1, 1);
63+
IconImage.HoverEnter += IconImage_HoverEnter;
64+
IconImage.HoverLeave += IconImage_HoverLeave;
65+
IconImage.Clicked += IconImage_Clicked;
66+
IconImage.DoubleClicked += IconImage_DoubleClicked;
6767

6868
var font = GameContentManager.Current.GetFont("sourcesansproblack");
6969

@@ -152,15 +152,23 @@ public void Activate()
152152
}
153153
}
154154

155-
private void _iconImage_Clicked(Base sender, MouseButtonState arguments)
155+
private void IconImage_Clicked(Base sender, MouseButtonState arguments)
156156
{
157157
if (arguments.MouseButton is MouseButton.Right)
158158
{
159159
Globals.Me?.AddToHotbar(SlotIndex, -1, -1);
160160
}
161161
}
162162

163-
private void _iconImage_HoverLeave(Base sender, EventArgs arguments)
163+
private void IconImage_DoubleClicked(Base sender, MouseButtonState arguments)
164+
{
165+
if (arguments.MouseButton is MouseButton.Left)
166+
{
167+
Activate();
168+
}
169+
}
170+
171+
private void IconImage_HoverLeave(Base sender, EventArgs arguments)
164172
{
165173
_itemDescWindow?.Dispose();
166174
_itemDescWindow = null;
@@ -169,7 +177,7 @@ private void _iconImage_HoverLeave(Base sender, EventArgs arguments)
169177
_spellDescWindow = null;
170178
}
171179

172-
private void _iconImage_HoverEnter(Base sender, EventArgs arguments)
180+
private void IconImage_HoverEnter(Base sender, EventArgs arguments)
173181
{
174182
if (InputHandler.MouseFocus != null || Globals.Me == null)
175183
{
@@ -391,8 +399,8 @@ public void Update()
391399
{
392400
if (_currentItem != null)
393401
{
394-
_iconImage.Show();
395-
_iconImage.Texture = Globals.ContentManager.GetTexture(
402+
IconImage.Show();
403+
IconImage.Texture = Globals.ContentManager.GetTexture(
396404
Framework.Content.TextureType.Item, _currentItem.Icon
397405
);
398406

@@ -430,8 +438,8 @@ public void Update()
430438
}
431439
else if (_currentSpell != null)
432440
{
433-
_iconImage.Show();
434-
_iconImage.Texture = Globals.ContentManager.GetTexture(
441+
IconImage.Show();
442+
IconImage.Texture = Globals.ContentManager.GetTexture(
435443
Framework.Content.TextureType.Spell, _currentSpell.Icon
436444
);
437445

@@ -459,7 +467,7 @@ public void Update()
459467
}
460468
else
461469
{
462-
_iconImage.Hide();
470+
IconImage.Hide();
463471
_textureLoaded = true;
464472
_isEquipped = false;
465473
_equipLabel.IsHidden = true;
@@ -471,24 +479,24 @@ public void Update()
471479
{
472480
if (_currentSpell != null)
473481
{
474-
_iconImage.RenderColor = new Color(60, 255, 255, 255);
482+
IconImage.RenderColor = new Color(60, 255, 255, 255);
475483
}
476484

477485
if (_currentItem != null)
478486
{
479-
_iconImage.RenderColor = new Color(60, _currentItem.Color.R, _currentItem.Color.G, _currentItem.Color.B);
487+
IconImage.RenderColor = new Color(60, _currentItem.Color.R, _currentItem.Color.G, _currentItem.Color.B);
480488
}
481489
}
482490
else
483491
{
484492
if (_currentSpell != null)
485493
{
486-
_iconImage.RenderColor = Color.White;
494+
IconImage.RenderColor = Color.White;
487495
}
488496

489497
if (_currentItem != null)
490498
{
491-
_iconImage.RenderColor = _currentItem.Color;
499+
IconImage.RenderColor = _currentItem.Color;
492500
}
493501
}
494502
}

0 commit comments

Comments
 (0)