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

Fixed menu popups going outside of the screen #2191

Merged
merged 3 commits into from Oct 31, 2022
Merged

Fixed menu popups going outside of the screen #2191

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2cd9e38
Fixed menu popups going outside of the screen
ItsEthra Oct 28, 2022
bd34b29
Made menu appear above above the button instead
ItsEthra Oct 31, 2022
76ed1d4
Merge branch 'emilk:master' into master
ItsEthra Oct 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 16 additions & 1 deletion crates/egui/src/menu.rs
View file
Open in desktop
Expand Up @@ -288,7 +288,22 @@ impl MenuRoot {
{
// menu not open and button clicked
// or button hovered while other menu is open
let pos = response.rect.left_bottom();
drop(input);

let mut pos = response.rect.left_bottom();
if let Some(root) = root.inner.as_mut() {
let menu_rect = root.menu_state.read().rect;
let screen_rect = response.ctx.input().screen_rect;

if pos.y + menu_rect.height() > screen_rect.max.y {
pos.y = screen_rect.max.y - menu_rect.height() - response.rect.height();
}

if pos.x + menu_rect.width() > screen_rect.max.x {
pos.x = screen_rect.max.x - menu_rect.width();
}
}

return MenuResponse::Create(pos, id);
} else if input.pointer.any_pressed() && input.pointer.primary_down() {
if let Some(pos) = input.pointer.interact_pos() {
Expand Down