Skip to content

Commit

Permalink
Merge pull request #86141 from Maran23/popup-hover-height-calc
Browse files Browse the repository at this point in the history
Fix Popup hover and height calculation are off by some pixels
  • Loading branch information
akien-mga committed Jan 15, 2024
2 parents 5f6790a + 18fedd9 commit c1da69d
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions scene/gui/popup_menu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -287,8 +287,7 @@ int PopupMenu::_get_items_total_height() const {
items_total_height += _get_item_height(i) + theme_cache.v_separation;
}

// Subtract a separator which is not needed for the last item.
return items_total_height - theme_cache.v_separation;
return items_total_height;
}

int PopupMenu::_get_mouse_over(const Point2 &p_over) const {
Expand All @@ -297,14 +296,14 @@ int PopupMenu::_get_mouse_over(const Point2 &p_over) const {
}

// Accounts for margin in the margin container
Point2 ofs = theme_cache.panel_style->get_offset() + Point2(0, theme_cache.v_separation / 2);
Point2 ofs = theme_cache.panel_style->get_offset();

if (ofs.y > p_over.y) {
return -1;
}

for (int i = 0; i < items.size(); i++) {
ofs.y += i > 0 ? theme_cache.v_separation : (float)theme_cache.v_separation / 2;
ofs.y += theme_cache.v_separation;

ofs.y += _get_item_height(i);

Expand Down

0 comments on commit c1da69d

Please sign in to comment.