godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-22 15:06:45 +00:00
Code Releases Wiki Activity

Fix item highlighting in PopupMenu for items with offset

Browse Source
This commit is contained in:
Michael Alexsander Silva Dias
2018-12-15 18:48:10 -02:00
parent 814d6cad13
commit 04ea79c738
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scene/gui/popup_menu.cpp
View File

@@ -453,7 +453,6 @@ void PopupMenu::_notification(int p_what) {
Color icon_color(1, 1, 1, items[i].disabled ? 0.5 : 1); Color icon_color(1, 1, 1, items[i].disabled ? 0.5 : 1);
item_ofs.x += items[i].h_ofs;
if (!items[i].icon.is_null()) { if (!items[i].icon.is_null()) {
icon_size = items[i].icon->get_size(); icon_size = items[i].icon->get_size();
@@ -470,6 +469,7 @@ void PopupMenu::_notification(int p_what) {
String text = items[i].shortcut.is_valid() ? String(tr(items[i].shortcut->get_name())) : items[i].xl_text; String text = items[i].shortcut.is_valid() ? String(tr(items[i].shortcut->get_name())) : items[i].xl_text;
item_ofs.x += items[i].h_ofs;
if (items[i].separator) { if (items[i].separator) {
int sep_h = separator->get_center_size().height + separator->get_minimum_size().height; int sep_h = separator->get_center_size().height + separator->get_minimum_size().height;