-
-
Notifications
You must be signed in to change notification settings - Fork 54
Fix CraftQueue amount input losing focus during periodic updates #1014
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
KevinCondon
wants to merge
6
commits into
derfloh205:main
Choose a base branch
from
KevinCondon:fix/craftqueue-input-focus-loss
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+28
−3
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
3836711
Fix CraftQueue amount input losing focus during periodic updates
KevinCondon 5afe56e
Merge branch 'main' into fix/craftqueue-input-focus-loss
derfloh205 73e8c84
Merge branch 'main' into fix/craftqueue-input-focus-loss
derfloh205 c14f325
Merge branch 'main' into fix/craftqueue-input-focus-loss
KevinCondon 5498010
Scope focus-loss fix to CraftQueue module only
964f5b3
Merge branch 'main' into fix/craftqueue-input-focus-loss
derfloh205 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -523,7 +523,10 @@ function CraftSim.INIT:HideAllModules(keepControlPanel) | |
| end | ||
| -- hide all modules | ||
| CraftSim.RECIPE_SCAN.frame:Hide() | ||
| CraftSim.CRAFTQ.frame:Hide() | ||
| -- Skip hiding CraftQueue frame if user is editing a craft amount input | ||
| if not (CraftSim.CRAFTQ.UI and CraftSim.CRAFTQ.UI.HasFocusedInput and CraftSim.CRAFTQ.UI:HasFocusedInput()) then | ||
| CraftSim.CRAFTQ.frame:Hide() | ||
| end | ||
| CraftSim.CRAFT_BUFFS.frame:Hide() | ||
| CraftSim.CRAFT_BUFFS.frameWO:Hide() | ||
| CraftSim.COOLDOWNS.frame:Hide() | ||
|
|
@@ -725,8 +728,11 @@ function CraftSim.INIT:TriggerModulesByRecipeType() | |
| end | ||
|
|
||
| -- update CraftQ Display (e.g. cause of profession gear changes) | ||
| CraftSim.CRAFTQ.UI:UpdateDisplay() | ||
| CraftSim.CRAFTQ.UI:UpdateAddOpenRecipeButton(recipeData) | ||
| -- Skip CraftQueue update if user is editing a craft amount input to prevent focus loss | ||
| if not (CraftSim.CRAFTQ.UI.HasFocusedInput and CraftSim.CRAFTQ.UI:HasFocusedInput()) then | ||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Its not necessary to check if the function exists before calling it here. |
||
| CraftSim.CRAFTQ.UI:UpdateDisplay() | ||
| CraftSim.CRAFTQ.UI:UpdateAddOpenRecipeButton(recipeData) | ||
| end | ||
|
|
||
| -- Simulation Mode (always update first because it changes recipeData based on simMode inputs) | ||
| showSimulationMode = (showSimulationMode and recipeData and not recipeData.isSalvageRecipe) or false | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I dont think thats necessary.
the modules are all set to hidden here as a default.
in the lower lines all modules are then checked if they are enabled and if it makes sense to show them (e.g. runecrafting wont show craftsim modules although its a 'profession')
so in that case if craftqueue was visible before it will also be still visible afterwards