dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 21 Wiki Activity

Fix ammo filtering

Browse Source
This commit is contained in:
PhatPhuckDave
2025-12-07 14:32:30 +01:00
parent acd6920de6
commit eb329adb68
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/builtinMarketBrowser/itemView.py
View File

@@ -166,7 +166,7 @@ class ItemView(Display):
self.updateItemStore(items) self.updateItemStore(items)
self.filterItemStore() self.filterItemStore()
return return
# If "Fits" filter is active, re-filter the current view # If "Fits" filter is active, re-filter the current view
if self.marketBrowser.getFitsFilter(): if self.marketBrowser.getFitsFilter():
self.filterItemStore() self.filterItemStore()

9
gui/marketBrowser.py
View File

@@ -54,6 +54,7 @@ class MarketBrowser(wx.Panel):
self.settings = MarketPriceSettings.getInstance() self.settings = MarketPriceSettings.getInstance()
self.__mode = 'normal' self.__mode = 'normal'
self.__normalBtnMap = {} self.__normalBtnMap = {}
self.__normalSlotBtnMap = {}
self.marketView = MarketTree(self.splitter, self) self.marketView = MarketTree(self.splitter, self)
self.itemView = ItemView(self.splitter, self) self.itemView = ItemView(self.splitter, self)
@@ -216,6 +217,9 @@ class MarketBrowser(wx.Panel):
self.__normalBtnMap.clear() self.__normalBtnMap.clear()
for btn in self.metaButtons: for btn in self.metaButtons:
self.__normalBtnMap[btn] = btn.userSelected self.__normalBtnMap[btn] = btn.userSelected
self.__normalSlotBtnMap.clear()
for btn in self.slotButtons:
self.__normalSlotBtnMap[btn] = btn.userSelected
if newMode == 'search': if newMode == 'search':
self.marketView.UnselectAll() self.marketView.UnselectAll()
setting = self.settings.get('marketMGSearchMode') setting = self.settings.get('marketMGSearchMode')
@@ -224,9 +228,14 @@ class MarketBrowser(wx.Panel):
if newMode in ('search', 'recent', 'charges'): if newMode in ('search', 'recent', 'charges'):
for btn in self.metaButtons: for btn in self.metaButtons:
btn.setUserSelection(True) btn.setUserSelection(True)
# Clear slot button selections when searching (search can return any item type)
for btn in self.slotButtons:
btn.setUserSelection(False)
if newMode == 'normal': if newMode == 'normal':
for btn, state in self.__normalBtnMap.items(): for btn, state in self.__normalBtnMap.items():
btn.setUserSelection(state) btn.setUserSelection(state)
for btn, state in self.__normalSlotBtnMap.items():
btn.setUserSelection(state)
# We turn on all meta buttons permanently # We turn on all meta buttons permanently
if setting == 2: if setting == 2:
for btn in self.metaButtons: for btn in self.metaButtons: