Skip to content

Commit a673a7f

Browse files
WeylonSantanaWeylonSantana
committed
IconImage => Icon
1 parent 5cdbf96 commit a673a7f

File tree

7 files changed

+112
-112
lines changed

7 files changed

+112
-112
lines changed

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

Lines changed: 18 additions & 18 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+
Icon.HoverEnter += Icon_HoverEnter;
36+
Icon.HoverLeave += Icon_HoverLeave;
37+
Icon.Clicked += Icon_Clicked;
38+
Icon.DoubleClicked += Icon_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 Icon_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 Icon_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 Icon_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+
Icon_DoubleClicked(sender, arguments);
142142
}
143143
}
144144
}
145145

146-
private void IconImage_DoubleClicked(Base sender, MouseButtonState arguments)
146+
private void Icon_DoubleClicked(Base sender, MouseButtonState arguments)
147147
{
148148
if (Globals.InBag)
149149
{
@@ -204,37 +204,37 @@ 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+
Icon.Texture = default;
208208
return;
209209
}
210210

211211
var bagSlot = bagSlots[SlotIndex];
212212
var descriptor = bagSlot.Descriptor;
213213

214-
_quantityLabel.IsVisibleInParent = !IconImage.IsDragging && descriptor.IsStackable && bagSlot.Quantity > 1;
214+
_quantityLabel.IsVisibleInParent = !Icon.IsDragging && descriptor.IsStackable && bagSlot.Quantity > 1;
215215
if (_quantityLabel.IsVisibleInParent)
216216
{
217217
_quantityLabel.Text = Strings.FormatQuantityAbbreviated(bagSlot.Quantity);
218218
}
219219

220-
if (IconImage.TextureFilename == descriptor.Icon)
220+
if (Icon.TextureFilename == descriptor.Icon)
221221
{
222222
return;
223223
}
224224

225225
var itemTexture = Globals.ContentManager?.GetTexture(Framework.Content.TextureType.Item, descriptor.Icon);
226226
if (itemTexture != default)
227227
{
228-
IconImage.Texture = itemTexture;
229-
IconImage.RenderColor = descriptor.Color;
230-
IconImage.IsVisibleInParent = true;
228+
Icon.Texture = itemTexture;
229+
Icon.RenderColor = descriptor.Color;
230+
Icon.IsVisibleInParent = true;
231231
}
232232
else
233233
{
234-
if (IconImage.Texture != default)
234+
if (Icon.Texture != default)
235235
{
236-
IconImage.Texture = default;
237-
IconImage.IsVisibleInParent = false;
236+
Icon.Texture = default;
237+
Icon.IsVisibleInParent = false;
238238
}
239239
}
240240

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

Lines changed: 18 additions & 18 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+
Icon.HoverEnter += Icon_HoverEnter;
39+
Icon.HoverLeave += Icon_HoverLeave;
40+
Icon.Clicked += Icon_Clicked;
41+
Icon.DoubleClicked += Icon_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 Icon_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 Icon_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 Icon_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+
Icon_DoubleClicked(sender, arguments);
144144
}
145145
}
146146
}
147147

148-
private void IconImage_DoubleClicked(Base sender, MouseButtonState arguments)
148+
private void Icon_DoubleClicked(Base sender, MouseButtonState arguments)
149149
{
150150
if (!Globals.InBank)
151151
{
@@ -269,37 +269,37 @@ 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+
Icon.Texture = default;
273273
return;
274274
}
275275

276276
var bankSlot = bankSlots[SlotIndex];
277277
var descriptor = bankSlot.Descriptor;
278278

279-
_quantityLabel.IsVisibleInParent = !IconImage.IsDragging && descriptor.IsStackable && bankSlot.Quantity > 1;
279+
_quantityLabel.IsVisibleInParent = !Icon.IsDragging && descriptor.IsStackable && bankSlot.Quantity > 1;
280280
if (_quantityLabel.IsVisibleInParent)
281281
{
282282
_quantityLabel.Text = Strings.FormatQuantityAbbreviated(bankSlot.Quantity);
283283
}
284284

285-
if (IconImage.TextureFilename == descriptor.Icon)
285+
if (Icon.TextureFilename == descriptor.Icon)
286286
{
287287
return;
288288
}
289289

290290
var itemTexture = Globals.ContentManager?.GetTexture(Framework.Content.TextureType.Item, descriptor.Icon);
291291
if (itemTexture != default)
292292
{
293-
IconImage.Texture = itemTexture;
294-
IconImage.RenderColor = descriptor.Color;
295-
IconImage.IsVisibleInParent = true;
293+
Icon.Texture = itemTexture;
294+
Icon.RenderColor = descriptor.Color;
295+
Icon.IsVisibleInParent = true;
296296
}
297297
else
298298
{
299-
if (IconImage.Texture != default)
299+
if (Icon.Texture != default)
300300
{
301-
IconImage.Texture = default;
302-
IconImage.IsVisibleInParent = false;
301+
Icon.Texture = default;
302+
Icon.IsVisibleInParent = false;
303303
}
304304
}
305305

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ public HotbarItem(int hotbarSlotIndex, Base hotbarWindow)
5656
RestrictToParent = true;
5757
TextureFilename = "hotbaritem.png";
5858

59-
IconImage.Name = $"{nameof(HotbarItem)}{SlotIndex}";
60-
IconImage.SetPosition(1, 1);
61-
IconImage.HoverEnter += IconImage_HoverEnter;
62-
IconImage.HoverLeave += IconImage_HoverLeave;
63-
IconImage.Clicked += IconImage_Clicked;
64-
IconImage.DoubleClicked += IconImage_DoubleClicked;
59+
Icon.Name = $"{nameof(HotbarItem)}{SlotIndex}";
60+
Icon.SetPosition(1, 1);
61+
Icon.HoverEnter += Icon_HoverEnter;
62+
Icon.HoverLeave += Icon_HoverLeave;
63+
Icon.Clicked += Icon_Clicked;
64+
Icon.DoubleClicked += Icon_DoubleClicked;
6565

6666
var font = GameContentManager.Current.GetFont("sourcesansproblack");
6767

@@ -155,23 +155,23 @@ public void Activate()
155155
}
156156
}
157157

158-
private void IconImage_Clicked(Base sender, MouseButtonState arguments)
158+
private void Icon_Clicked(Base sender, MouseButtonState arguments)
159159
{
160160
if (arguments.MouseButton is MouseButton.Right)
161161
{
162162
Globals.Me?.AddToHotbar(SlotIndex, -1, -1);
163163
}
164164
}
165165

166-
private void IconImage_DoubleClicked(Base sender, MouseButtonState arguments)
166+
private void Icon_DoubleClicked(Base sender, MouseButtonState arguments)
167167
{
168168
if (arguments.MouseButton is MouseButton.Left)
169169
{
170170
Activate();
171171
}
172172
}
173173

174-
private void IconImage_HoverLeave(Base sender, EventArgs arguments)
174+
private void Icon_HoverLeave(Base sender, EventArgs arguments)
175175
{
176176
_itemDescWindow?.Dispose();
177177
_itemDescWindow = null;
@@ -180,7 +180,7 @@ private void IconImage_HoverLeave(Base sender, EventArgs arguments)
180180
_spellDescWindow = null;
181181
}
182182

183-
private void IconImage_HoverEnter(Base sender, EventArgs arguments)
183+
private void Icon_HoverEnter(Base sender, EventArgs arguments)
184184
{
185185
if (InputHandler.MouseFocus != null || Globals.Me == null)
186186
{
@@ -398,7 +398,7 @@ public void Update()
398398
}
399399
}
400400

401-
var isDragging = IconImage.IsDragging;
401+
var isDragging = Icon.IsDragging;
402402
if (isDragging)
403403
{
404404
_equipLabel.IsHidden = true;
@@ -416,8 +416,8 @@ public void Update()
416416
{
417417
if (_currentItem != null)
418418
{
419-
IconImage.IsVisibleInTree = !isDragging;
420-
IconImage.Texture = Globals.ContentManager.GetTexture(
419+
Icon.IsVisibleInTree = !isDragging;
420+
Icon.Texture = Globals.ContentManager.GetTexture(
421421
Framework.Content.TextureType.Item, _currentItem.Icon
422422
);
423423

@@ -451,8 +451,8 @@ public void Update()
451451
}
452452
else if (_currentSpell != null)
453453
{
454-
IconImage.IsVisibleInTree = !isDragging;
455-
IconImage.Texture = Globals.ContentManager.GetTexture(
454+
Icon.IsVisibleInTree = !isDragging;
455+
Icon.Texture = Globals.ContentManager.GetTexture(
456456
Framework.Content.TextureType.Spell, _currentSpell.Icon
457457
);
458458

@@ -480,7 +480,7 @@ public void Update()
480480
}
481481
else
482482
{
483-
IconImage.Hide();
483+
Icon.Hide();
484484
_textureLoaded = true;
485485
_isEquipped = false;
486486
_equipLabel.IsHidden = true;
@@ -492,24 +492,24 @@ public void Update()
492492
{
493493
if (_currentSpell != null)
494494
{
495-
IconImage.RenderColor = new Color(60, 255, 255, 255);
495+
Icon.RenderColor = new Color(60, 255, 255, 255);
496496
}
497497

498498
if (_currentItem != null)
499499
{
500-
IconImage.RenderColor = new Color(60, _currentItem.Color.R, _currentItem.Color.G, _currentItem.Color.B);
500+
Icon.RenderColor = new Color(60, _currentItem.Color.R, _currentItem.Color.G, _currentItem.Color.B);
501501
}
502502
}
503503
else
504504
{
505505
if (_currentSpell != null)
506506
{
507-
IconImage.RenderColor = Color.White;
507+
Icon.RenderColor = Color.White;
508508
}
509509

510510
if (_currentItem != null)
511511
{
512-
IconImage.RenderColor = _currentItem.Color;
512+
Icon.RenderColor = _currentItem.Color;
513513
}
514514
}
515515
}

0 commit comments

Comments
 (0)