Skip to content

Commit 5c2f6aa

Browse files
committed
Fix Recipe Overlay appearance before first fetch
1 parent a5becb0 commit 5c2f6aa

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

EnhancePoE/Constants.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
internal static class Constants
44
{
5-
public const string AppVersionText = "v.1.6.0-zemoto";
5+
public const string AppVersionText = "v.1.6.1-zemoto";
66
}

EnhancePoE/Model/StashTab.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -190,34 +190,34 @@ public int FullSets
190190

191191
private int _ringsAmount;
192192
public int RingsAmount => ShowAmountNeeded ? Math.Max( ( Properties.Settings.Default.Sets * 2 ) - _ringsAmount, 0 ) : _ringsAmount;
193-
public bool RingsActive => ( Properties.Settings.Default.Sets * 2 ) - _ringsAmount > 0;
193+
public bool RingsActive => NeedsItemFetch || ( Properties.Settings.Default.Sets * 2 ) - _ringsAmount > 0;
194194

195195
private int _amuletsAmount;
196196
public int AmuletsAmount => ShowAmountNeeded ? Math.Max( Properties.Settings.Default.Sets - _amuletsAmount, 0 ) : _amuletsAmount;
197-
public bool AmuletsActive => Properties.Settings.Default.Sets - _amuletsAmount > 0;
197+
public bool AmuletsActive => NeedsItemFetch || Properties.Settings.Default.Sets - _amuletsAmount > 0;
198198

199199
private int _beltsAmount;
200200
public int BeltsAmount => ShowAmountNeeded ? Math.Max( Properties.Settings.Default.Sets - _beltsAmount, 0 ) : _beltsAmount;
201-
public bool BeltsActive => Properties.Settings.Default.Sets - _beltsAmount > 0;
201+
public bool BeltsActive => NeedsItemFetch || Properties.Settings.Default.Sets - _beltsAmount > 0;
202202

203203
private int _chestsAmount;
204204
public int ChestsAmount => ShowAmountNeeded ? Math.Max( Properties.Settings.Default.Sets - _chestsAmount, 0 ) : _chestsAmount;
205-
public bool ChestsActive => Properties.Settings.Default.Sets - _chestsAmount > 0;
205+
public bool ChestsActive => NeedsItemFetch || Properties.Settings.Default.Sets - _chestsAmount > 0;
206206

207207
private int _weaponsSmallAmount;
208208
private int _weaponsBigAmount;
209209
public int WeaponsAmount => ShowAmountNeeded ? Math.Max( ( Properties.Settings.Default.Sets * 2 ) - ( _weaponsSmallAmount + ( _weaponsBigAmount * 2 ) ), 0 ) : _weaponsSmallAmount + ( _weaponsBigAmount * 2 );
210-
public bool WeaponsActive => ( Properties.Settings.Default.Sets * 2 ) - ( _weaponsSmallAmount + ( _weaponsBigAmount * 2 ) ) > 0;
210+
public bool WeaponsActive => NeedsItemFetch || ( Properties.Settings.Default.Sets * 2 ) - ( _weaponsSmallAmount + ( _weaponsBigAmount * 2 ) ) > 0;
211211

212212
private int _glovesAmount;
213213
public int GlovesAmount => ShowAmountNeeded ? Math.Max( Properties.Settings.Default.Sets - _glovesAmount, 0 ) : _glovesAmount;
214-
public bool GlovesActive => Properties.Settings.Default.Sets - _glovesAmount > 0;
214+
public bool GlovesActive => NeedsItemFetch || Properties.Settings.Default.Sets - _glovesAmount > 0;
215215

216216
private int _helmetsAmount;
217217
public int HelmetsAmount => ShowAmountNeeded ? Math.Max( Properties.Settings.Default.Sets - _helmetsAmount, 0 ) : _helmetsAmount;
218-
public bool HelmetsActive => Properties.Settings.Default.Sets - _helmetsAmount > 0;
218+
public bool HelmetsActive => NeedsItemFetch || Properties.Settings.Default.Sets - _helmetsAmount > 0;
219219

220220
private int _bootsAmount;
221221
public int BootsAmount => ShowAmountNeeded ? Math.Max( Properties.Settings.Default.Sets - _bootsAmount, 0 ) : _bootsAmount;
222-
public bool BootsActive => Properties.Settings.Default.Sets - _bootsAmount > 0;
222+
public bool BootsActive => NeedsItemFetch || Properties.Settings.Default.Sets - _bootsAmount > 0;
223223
}

EnhancePoE/UI/RecipeStatusOverlay.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ private async void FetchDataAsync()
108108

109109
private void CheckForFullSets()
110110
{
111-
if ( _itemSetManager.SelectedStashTab.FullSets >= Properties.Settings.Default.Sets )
111+
if ( !_itemSetManager.SelectedStashTab.NeedsItemFetch && _itemSetManager.SelectedStashTab.FullSets >= Properties.Settings.Default.Sets )
112112
{
113113
_model.WarningMessage = _setsFullText;
114114
}

0 commit comments

Comments
 (0)