Fix sorting of files/dirs in dialogs #87874
Merged
Conversation
This file contains 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
AThousandShips
force-pushed
the
sort_fix
branch
from
b35c446 to
74813c6
Compare
|
This was originally intentional and done in: Going with restoring the useful sorting here and unifying everything in this direction instead, the original sorting just used plain string comparisons, this now uses the new comparison setup, originally Keeping the case insensitive sorting that was already used |
AThousandShips
force-pushed
the
sort_fix
branch
from
74813c6 to
94aeb1d
Compare
AThousandShips
commented
Feb 2, 2024
| }; | ||
|
|
||
| void sort_files(); | ||
|
|
There was a problem hiding this comment.
Removed this as it's not used anywhere that I could find, will restore if necessary
AThousandShips
commented
Feb 2, 2024
| if (this_str && that_str) { | ||
| while (*this_str == '.' || *that_str == '.') { | ||
| if (*this_str++ != '.') { | ||
| static _FORCE_INLINE_ signed char naturalcasecmp_to_base(const char32_t *p_this_str, const char32_t *p_that_str) { |
There was a problem hiding this comment.
As both file and natural sorting use these I merged them to avoid code duplication
Mickeon
reviewed
Feb 2, 2024
AThousandShips
force-pushed
the
sort_fix
branch
from
94aeb1d to
890676c
Compare
Mickeon
approved these changes
Mar 1, 2024
Geometror
reviewed
Mar 20, 2024
Geometror
approved these changes
Mar 20, 2024
|
Will fixup and squash :) |
AThousandShips
force-pushed
the
sort_fix
branch
from
665434c to
21271ca
Compare
Sorts leading `_` before other characters except `.`.
AThousandShips
force-pushed
the
sort_fix
branch
from
21271ca to
2cbf469
Compare
AThousandShips
changed the title
akien-mga
added a commit
that referenced
this pull request
Mar 24, 2024
Fix sorting of files/dirs in dialogs
akien-mga
closed this pull request by merging all changes
into
godotengine:master
in
06abc86
|
Thanks! |
|
Thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Sorts leading
_before all except..Optionally bound to scripting
Optionally added to
FileDialogbut can omit that if it's compatibility breakingAdded to a few places, think I've gotten all the places in the editor that handles files by ordering
The exact ordering can be further discussed, i.e. sorting
_before just alphanumerics, etc., but keeping it relatively simple hereBased on how sorting is done in Windows file explorer (though in Powershell it sorts
_after uppercase, so it depends, but I think it makes sense based on the reasons in the issue below)