Skip to content

Commit c761987

Browse files
WeylonSantanaWeylonSantana
committed
_descWindow => _descriptionWindow
1 parent a673a7f commit c761987

File tree

5 files changed

+51
-51
lines changed

5 files changed

+51
-51
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public partial class BagItem : SlotItem
2121
// Controls
2222
private readonly Label _quantityLabel;
2323
private readonly BagWindow _bagWindow;
24-
private ItemDescriptionWindow? _descWindow;
24+
private ItemDescriptionWindow? _descriptionWindow;
2525

2626
// Context Menu Handling
2727
private readonly MenuItem _withdrawContextItem;
@@ -99,8 +99,8 @@ private void Icon_HoverEnter(Base? sender, EventArgs? arguments)
9999
return;
100100
}
101101

102-
_descWindow?.Dispose();
103-
_descWindow = default;
102+
_descriptionWindow?.Dispose();
103+
_descriptionWindow = default;
104104

105105
if (Globals.BagSlots is not { Length: > 0 } bagSlots)
106106
{
@@ -113,7 +113,7 @@ private void Icon_HoverEnter(Base? sender, EventArgs? arguments)
113113
}
114114

115115
var item = bagSlots[SlotIndex];
116-
_descWindow = new ItemDescriptionWindow(
116+
_descriptionWindow = new ItemDescriptionWindow(
117117
item.Descriptor,
118118
item.Quantity,
119119
_bagWindow.X,
@@ -124,8 +124,8 @@ private void Icon_HoverEnter(Base? sender, EventArgs? arguments)
124124

125125
private void Icon_HoverLeave(Base sender, EventArgs arguments)
126126
{
127-
_descWindow?.Dispose();
128-
_descWindow = default;
127+
_descriptionWindow?.Dispose();
128+
_descriptionWindow = default;
129129
}
130130

131131
private void Icon_Clicked(Base sender, MouseButtonState arguments)
@@ -238,7 +238,7 @@ public override void Update()
238238
}
239239
}
240240

241-
_descWindow?.Dispose();
242-
_descWindow = default;
241+
_descriptionWindow?.Dispose();
242+
_descriptionWindow = default;
243243
}
244244
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public partial class BankItem : SlotItem
2424
// Controls
2525
private readonly Label _quantityLabel;
2626
private BankWindow _bankWindow;
27-
private ItemDescriptionWindow? _descWindow;
27+
private ItemDescriptionWindow? _descriptionWindow;
2828

2929
// Context Menu Handling
3030
private MenuItem _withdrawContextItem;
@@ -101,8 +101,8 @@ private void Icon_HoverEnter(Base? sender, EventArgs? arguments)
101101
}
102102

103103

104-
_descWindow?.Dispose();
105-
_descWindow = null;
104+
_descriptionWindow?.Dispose();
105+
_descriptionWindow = null;
106106

107107
if (Globals.BankSlots is not { Length: > 0 } bankSlots)
108108
{
@@ -115,7 +115,7 @@ private void Icon_HoverEnter(Base? sender, EventArgs? arguments)
115115
}
116116

117117
var item = bankSlots[SlotIndex];
118-
_descWindow = new ItemDescriptionWindow(
118+
_descriptionWindow = new ItemDescriptionWindow(
119119
item.Descriptor,
120120
item.Quantity,
121121
_bankWindow.X,
@@ -126,8 +126,8 @@ private void Icon_HoverEnter(Base? sender, EventArgs? arguments)
126126

127127
private void Icon_HoverLeave(Base sender, EventArgs arguments)
128128
{
129-
_descWindow?.Dispose();
130-
_descWindow = default;
129+
_descriptionWindow?.Dispose();
130+
_descriptionWindow = default;
131131
}
132132

133133
private void Icon_Clicked(Base sender, MouseButtonState arguments)
@@ -303,7 +303,7 @@ public override bool DragAndDrop_HandleDrop(Package package, int x, int y)
303303
}
304304
}
305305

306-
_descWindow?.Dispose();
307-
_descWindow = default;
306+
_descriptionWindow?.Dispose();
307+
_descriptionWindow = default;
308308
}
309309
}

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ public partial class HotbarItem : SlotItem
3434
private ControlBinding? _hotKey;
3535
private Item? _inventoryItem = null;
3636
private int _inventoryItemIndex = -1;
37-
private ItemDescriptionWindow? _itemDescWindow;
37+
private ItemDescriptionWindow? _itemDescriptionWindow;
3838
private Label _quantityLabel;
3939
private Spell? _spellBookItem = null;
40-
private SpellDescriptionWindow? _spellDescWindow;
40+
private SpellDescriptionWindow? _spellDescriptionWindow;
4141
private bool _textureLoaded;
4242

4343
public HotbarItem(int hotbarSlotIndex, Base hotbarWindow)
@@ -173,11 +173,11 @@ private void Icon_DoubleClicked(Base sender, MouseButtonState arguments)
173173

174174
private void Icon_HoverLeave(Base sender, EventArgs arguments)
175175
{
176-
_itemDescWindow?.Dispose();
177-
_itemDescWindow = null;
176+
_itemDescriptionWindow?.Dispose();
177+
_itemDescriptionWindow = null;
178178

179-
_spellDescWindow?.Dispose();
180-
_spellDescWindow = null;
179+
_spellDescriptionWindow?.Dispose();
180+
_spellDescriptionWindow = null;
181181
}
182182

183183
private void Icon_HoverEnter(Base sender, EventArgs arguments)
@@ -194,8 +194,8 @@ private void Icon_HoverEnter(Base sender, EventArgs arguments)
194194

195195
if (_currentItem != null && _inventoryItem != null)
196196
{
197-
_itemDescWindow?.Dispose();
198-
_itemDescWindow = null;
197+
_itemDescriptionWindow?.Dispose();
198+
_itemDescriptionWindow = null;
199199

200200
var quantityOfItem = 1;
201201

@@ -204,17 +204,17 @@ private void Icon_HoverEnter(Base sender, EventArgs arguments)
204204
quantityOfItem = Globals.Me.GetQuantityOfItemInInventory(_currentItem.Id);
205205
}
206206

207-
_itemDescWindow = new ItemDescriptionWindow(
207+
_itemDescriptionWindow = new ItemDescriptionWindow(
208208
_currentItem, quantityOfItem, _hotbarWindow.X + (_hotbarWindow.Width / 2), _hotbarWindow.Y + _hotbarWindow.Height + 2,
209209
_inventoryItem.ItemProperties, _currentItem.Name, ""
210210
);
211211
}
212212
else if (_currentSpell != null)
213213
{
214-
_spellDescWindow?.Dispose();
215-
_spellDescWindow = null;
214+
_spellDescriptionWindow?.Dispose();
215+
_spellDescriptionWindow = null;
216216

217-
_spellDescWindow = new SpellDescriptionWindow(
217+
_spellDescriptionWindow = new SpellDescriptionWindow(
218218
_currentSpell.Id, _hotbarWindow.X + (_hotbarWindow.Width / 2), _hotbarWindow.Y + _hotbarWindow.Height + 2
219219
);
220220
}

‎Intersect.Client.Core/Interface/Game/Inventory/InventoryItem.cs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public partial class InventoryItem : SlotItem
3030
private readonly Label _cooldownLabel;
3131
private readonly ImagePanel _equipImageBackground;
3232
private readonly InventoryWindow _inventoryWindow;
33-
private ItemDescriptionWindow? _descWindow;
33+
private ItemDescriptionWindow? _descriptionWindow;
3434

3535
// Context Menu Handling
3636
private readonly MenuItem _useItemMenuItem;
@@ -294,8 +294,8 @@ private void Icon_Clicked(Base sender, MouseButtonState arguments)
294294

295295
private void Icon_HoverLeave(Base sender, EventArgs arguments)
296296
{
297-
_descWindow?.Dispose();
298-
_descWindow = null;
297+
_descriptionWindow?.Dispose();
298+
_descriptionWindow = null;
299299
}
300300

301301
void Icon_HoverEnter(Base? sender, EventArgs? arguments)
@@ -310,10 +310,10 @@ void Icon_HoverEnter(Base? sender, EventArgs? arguments)
310310
return;
311311
}
312312

313-
if (_descWindow != null)
313+
if (_descriptionWindow != null)
314314
{
315-
_descWindow.Dispose();
316-
_descWindow = null;
315+
_descriptionWindow.Dispose();
316+
_descriptionWindow = null;
317317
}
318318

319319
if (Globals.Me?.Inventory[SlotIndex] is not { } inventorySlot)
@@ -329,7 +329,7 @@ void Icon_HoverEnter(Base? sender, EventArgs? arguments)
329329

330330
if (Globals.GameShop == null)
331331
{
332-
_descWindow = new ItemDescriptionWindow(
332+
_descriptionWindow = new ItemDescriptionWindow(
333333
inventorySlotDescriptor,
334334
inventorySlot.Quantity,
335335
_inventoryWindow.X,
@@ -357,7 +357,7 @@ void Icon_HoverEnter(Base? sender, EventArgs? arguments)
357357
return;
358358
}
359359

360-
_descWindow = new ItemDescriptionWindow(
360+
_descriptionWindow = new ItemDescriptionWindow(
361361
inventorySlotDescriptor,
362362
inventorySlot.Quantity,
363363
_inventoryWindow.X,
@@ -372,7 +372,7 @@ void Icon_HoverEnter(Base? sender, EventArgs? arguments)
372372
var costItem = Globals.GameShop.DefaultCurrency;
373373
if (inventorySlotDescriptor != null && costItem != null)
374374
{
375-
_descWindow = new ItemDescriptionWindow(
375+
_descriptionWindow = new ItemDescriptionWindow(
376376
inventorySlotDescriptor,
377377
inventorySlot.Quantity,
378378
_inventoryWindow.X,
@@ -385,7 +385,7 @@ void Icon_HoverEnter(Base? sender, EventArgs? arguments)
385385
}
386386
else
387387
{
388-
_descWindow = new ItemDescriptionWindow(
388+
_descriptionWindow = new ItemDescriptionWindow(
389389
inventorySlotDescriptor,
390390
inventorySlot.Quantity,
391391
_inventoryWindow.X,
@@ -559,10 +559,10 @@ public override void Update()
559559
}
560560
}
561561

562-
if (_descWindow != null)
562+
if (_descriptionWindow != null)
563563
{
564-
_descWindow.Dispose();
565-
_descWindow = null;
564+
_descriptionWindow.Dispose();
565+
_descriptionWindow = null;
566566
Icon_HoverEnter(null, null);
567567
}
568568
}
@@ -575,7 +575,7 @@ private void _reset()
575575
_quantityLabel.IsVisibleInParent = false;
576576
_equipLabel.IsVisibleInParent = false;
577577
_cooldownLabel.IsVisibleInParent = false;
578-
_descWindow?.Dispose();
579-
_descWindow = default;
578+
_descriptionWindow?.Dispose();
579+
_descriptionWindow = default;
580580
}
581581
}

‎Intersect.Client.Core/Interface/Game/Shop/ShopItem.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public partial class ShopItem : SlotItem
1717
private readonly int _mySlot;
1818
private readonly ShopWindow _shopWindow;
1919
private readonly MenuItem _buyMenuItem;
20-
private ItemDescriptionWindow? _itemDescWindow;
20+
private ItemDescriptionWindow? _descriptionWindow;
2121

2222
public ShopItem(ShopWindow shopWindow, Base parent, int index, ContextMenu contextMenu)
2323
: base(parent, nameof(ShopItem), index, contextMenu)
@@ -54,10 +54,10 @@ private void Icon_HoverEnter(Base sender, EventArgs arguments)
5454
return;
5555
}
5656

57-
if (_itemDescWindow != default)
57+
if (_descriptionWindow != default)
5858
{
59-
_itemDescWindow.Dispose();
60-
_itemDescWindow = default;
59+
_descriptionWindow.Dispose();
60+
_descriptionWindow = default;
6161
}
6262

6363
if (Globals.GameShop is not { SellingItems.Count: > 0 } gameShop)
@@ -77,7 +77,7 @@ private void Icon_HoverEnter(Base sender, EventArgs arguments)
7777
StatModifiers = item.StatsGiven,
7878
};
7979

80-
_itemDescWindow = new ItemDescriptionWindow(
80+
_descriptionWindow = new ItemDescriptionWindow(
8181
item: gameShop.SellingItems[_mySlot].Item,
8282
amount: 1,
8383
x: _shopWindow.X,
@@ -90,10 +90,10 @@ private void Icon_HoverEnter(Base sender, EventArgs arguments)
9090

9191
private void Icon_HoverLeave(Base sender, EventArgs arguments)
9292
{
93-
if (_itemDescWindow != null)
93+
if (_descriptionWindow != null)
9494
{
95-
_itemDescWindow.Dispose();
96-
_itemDescWindow = null;
95+
_descriptionWindow.Dispose();
96+
_descriptionWindow = null;
9797
}
9898
}
9999

0 commit comments

Comments
 (0)