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.

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

[PopupMenu] Fix incorrect vertical scroll bar visible at fractional content scale #91114

Merged

Conversation

Koyper
Copy link
Contributor

@Koyper Koyper commented Apr 24, 2024

Fixes #89482

@passivestar
Copy link
Contributor

Works, thanks 🤍

scene/gui/popup_menu.cpp Outdated Show resolved Hide resolved
@Koyper Koyper force-pushed the fix_popup_menu_incorrect_v_scrollbar branch 2 times, most recently from 050a228 to ea2335d Compare April 24, 2024 17:25
@Koyper
Copy link
Contributor Author

Koyper commented Apr 24, 2024

Can someone advise on why the Editor unit test checks failed? I don't see how this PR is related to them.

@akien-mga
Copy link
Member

It's a temporary issue due to conflicting merges. You can rebase to fix it.

@Koyper Koyper requested review from a team as code owners April 25, 2024 13:36
@Koyper
Copy link
Contributor Author

Koyper commented Apr 25, 2024

I've managed to farkle this branch with a rebase mistake. Is there a way to revert to the prior state?

@fire
Copy link
Member

fire commented Apr 25, 2024

git checkout -f ea2335d2a09aaabbedd9b267532173f6d7d0eb80

@Koyper
Copy link
Contributor Author

Koyper commented Apr 25, 2024

git checkout -f ea2335d2a09aaabbedd9b267532173f6d7d0eb80

Now the force push says "Everything up-to-date" - how do I override that? Is it because of the detatched head?

Will this work?:

git reset --hard ea2335d2a09aaabbedd9b267532173f6d7d0eb80

@KoBeWi
Copy link
Member

KoBeWi commented Apr 25, 2024

You can push with --set-upstream to your branch.

@Koyper
Copy link
Contributor Author

Koyper commented Apr 25, 2024

You can push with --set-upstream to your branch.

Will this work while in my current detached head state?

Like this?:

git push --set-upstream --force origin fix_popup_menu_incorrect_v_scrollbar

@akien-mga
Copy link
Member

git reset --hard ea2335d2a09aaabbedd9b267532173f6d7d0eb80

This is the way IMO, after checking out your local branch.

@Koyper Koyper force-pushed the fix_popup_menu_incorrect_v_scrollbar branch from bdc1e34 to 4c5a904 Compare April 25, 2024 14:34
@Koyper
Copy link
Contributor Author

Koyper commented Apr 25, 2024

git reset --hard ea2335d2a09aaabbedd9b267532173f6d7d0eb80

This is the way IMO, after checking out your local branch.

Okay, this worked! Good grief 😡.

@YeldhamDev YeldhamDev requested review from a team and removed request for a team April 25, 2024 14:49
@akien-mga akien-mga merged commit 43d7346 into godotengine:master Apr 25, 2024
16 checks passed
@akien-mga
Copy link
Member

Thanks!

@Koyper Koyper deleted the fix_popup_menu_incorrect_v_scrollbar branch April 25, 2024 17:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Vertical scrollbar is visible in all popup menus when using a custom display scale
6 participants