Skip to content
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.

Sign up for GitHub

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

Jump to bottom

ItemList: Draw separators before selected style boxes #81155

Merged
merged 1 commit into from
Aug 30, 2023
Merged

ItemList: Draw separators before selected style boxes #81155

merged 1 commit into from
Aug 30, 2023

Conversation

garychia
Copy link
Contributor

Fixes #81142

@garychia garychia requested a review from a team as a code owner August 30, 2023 08:48
@dalexeev dalexeev added this to the 4.2 milestone Aug 30, 2023
dalexeev
dalexeev approved these changes Aug 30, 2023
View reviewed changes
Copy link
Member

@dalexeev dalexeev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good and simple to me. Thank you!

I've tested locally, it fixes the bug, cherry-pickable for 4.1 (but I didn't build) and causes a merge conflict for 4.0.

@dalexeev dalexeev added the cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release label Aug 30, 2023
@akien-mga akien-mga merged commit bc88dca into godotengine:master Aug 30, 2023
@akien-mga
Copy link
Member

Thanks!

@bluenote10
Copy link
Contributor

Thanks for the fix!

What I find a bit puzzling is why the issue only appeared when the guide color was set explicitly. From skimming the code, I would have concluded that it should not make a difference, because the logic looks independent of whether the guide color has been modified or not. Does that indicate that there may be another issue here, causing that weird behavior switch?

@timothyqiu
Copy link
Member

It's still there when using the default color. The guideline is not obvious because the default color's alpha is 0.25.

zoom

@bluenote10
Copy link
Contributor

Ah nice, well observed!

@garychia garychia deleted the separator_priority branch August 30, 2023 12:37
@YuriSizov YuriSizov removed the cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release label Sep 21, 2023
@YuriSizov
Copy link
Contributor

Cherry-picked for 4.1.2.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@timothyqiu timothyqiu timothyqiu approved these changes

@dalexeev dalexeev dalexeev approved these changes

Assignees
No one assigned
Labels
bug topic:gui
Projects
None yet
Milestone
4.2
Development

Successfully merging this pull request may close these issues.

ItemList guides should always be drawn behind selected style box
6 participants
@garychia @akien-mga @bluenote10 @timothyqiu @YuriSizov @dalexeev