godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-04 17:04:49 +00:00
Code Releases Wiki Activity

Merge pull request #56471 from jmb462/3.x

Browse Source
This commit is contained in:
Rémi Verschelde
2022-01-12 16:46:44 +01:00
committed by GitHub
parent 123fcfaf83 4de860c6d5
commit aa6dde2cde
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scene/gui/popup_menu.cpp
View File

@@ -78,9 +78,7 @@ Size2 PopupMenu::get_minimum_size() const {
String text = items[i].xl_text; String text = items[i].xl_text;
size.width += font->get_string_size(text).width; size.width += font->get_string_size(text).width;
if (i > 0) {
size.height += vseparation; size.height += vseparation;
}
if (items[i].accel || (items[i].shortcut.is_valid() && items[i].shortcut->is_valid())) { if (items[i].accel || (items[i].shortcut.is_valid() && items[i].shortcut->is_valid())) {
int accel_w = hseparation * 2; int accel_w = hseparation * 2;
@@ -522,7 +520,9 @@ void PopupMenu::_notification(int p_what) {
} }
for (int i = 0; i < items.size(); i++) { for (int i = 0; i < items.size(); i++) {
if (i > 0) { if (i == 0) {
ofs.y += vseparation / 2;
} else {
ofs.y += vseparation; ofs.y += vseparation;
} }
Point2 item_ofs = ofs; Point2 item_ofs = ofs;