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

Fix PopupMenu.id_focused signal using index as ID

Browse Source
This commit is contained in:
Haoyu Qiu
2024-10-07 00:19:16 +08:00
parent db66bd35af
commit a328952fc1
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scene/gui/option_button.cpp
View File

@@ -178,7 +178,7 @@ bool OptionButton::_set(const StringName &p_name, const Variant &p_value) {
} }
void OptionButton::_focused(int p_which) { void OptionButton::_focused(int p_which) {
emit_signal(SNAME("item_focused"), p_which); emit_signal(SNAME("item_focused"), popup->get_item_index(p_which));
} }
void OptionButton::_selected(int p_which) { void OptionButton::_selected(int p_which) {

18
scene/gui/popup_menu.cpp
View File

@@ -474,7 +474,7 @@ void PopupMenu::_input_from_window_internal(const Ref<InputEvent> &p_event) {
for (int i = search_from; i < items.size(); i++) { for (int i = search_from; i < items.size(); i++) {
if (!items[i].separator && !items[i].disabled) { if (!items[i].separator && !items[i].disabled) {
mouse_over = i; mouse_over = i;
emit_signal(SNAME("id_focused"), i); emit_signal(SNAME("id_focused"), items[i].id);
scroll_to_item(i); scroll_to_item(i);
control->queue_redraw(); control->queue_redraw();
set_input_as_handled(); set_input_as_handled();
@@ -488,7 +488,7 @@ void PopupMenu::_input_from_window_internal(const Ref<InputEvent> &p_event) {
for (int i = 0; i < search_from; i++) { for (int i = 0; i < search_from; i++) {
if (!items[i].separator && !items[i].disabled) { if (!items[i].separator && !items[i].disabled) {
mouse_over = i; mouse_over = i;
emit_signal(SNAME("id_focused"), i); emit_signal(SNAME("id_focused"), items[i].id);
scroll_to_item(i); scroll_to_item(i);
control->queue_redraw(); control->queue_redraw();
set_input_as_handled(); set_input_as_handled();
@@ -512,7 +512,7 @@ void PopupMenu::_input_from_window_internal(const Ref<InputEvent> &p_event) {
for (int i = search_from; i >= 0; i--) { for (int i = search_from; i >= 0; i--) {
if (!items[i].separator && !items[i].disabled) { if (!items[i].separator && !items[i].disabled) {
mouse_over = i; mouse_over = i;
emit_signal(SNAME("id_focused"), i); emit_signal(SNAME("id_focused"), items[i].id);
scroll_to_item(i); scroll_to_item(i);
control->queue_redraw(); control->queue_redraw();
set_input_as_handled(); set_input_as_handled();
@@ -526,7 +526,7 @@ void PopupMenu::_input_from_window_internal(const Ref<InputEvent> &p_event) {
for (int i = items.size() - 1; i >= search_from; i--) { for (int i = items.size() - 1; i >= search_from; i--) {
if (!items[i].separator && !items[i].disabled) { if (!items[i].separator && !items[i].disabled) {
mouse_over = i; mouse_over = i;
emit_signal(SNAME("id_focused"), i); emit_signal(SNAME("id_focused"), items[i].id);
scroll_to_item(i); scroll_to_item(i);
control->queue_redraw(); control->queue_redraw();
set_input_as_handled(); set_input_as_handled();
@@ -692,7 +692,7 @@ void PopupMenu::_input_from_window_internal(const Ref<InputEvent> &p_event) {
if (items[i].text.findn(search_string) == 0) { if (items[i].text.findn(search_string) == 0) {
mouse_over = i; mouse_over = i;
emit_signal(SNAME("id_focused"), i); emit_signal(SNAME("id_focused"), items[i].id);
scroll_to_item(i); scroll_to_item(i);
control->queue_redraw(); control->queue_redraw();
set_input_as_handled(); set_input_as_handled();
@@ -1091,7 +1091,7 @@ void PopupMenu::_notification(int p_what) {
for (int i = search_from; i < items.size(); i++) { for (int i = search_from; i < items.size(); i++) {
if (!items[i].separator && !items[i].disabled) { if (!items[i].separator && !items[i].disabled) {
mouse_over = i; mouse_over = i;
emit_signal(SNAME("id_focused"), i); emit_signal(SNAME("id_focused"), items[i].id);
scroll_to_item(i); scroll_to_item(i);
control->queue_redraw(); control->queue_redraw();
match_found = true; match_found = true;
@@ -1104,7 +1104,7 @@ void PopupMenu::_notification(int p_what) {
for (int i = 0; i < search_from; i++) { for (int i = 0; i < search_from; i++) {
if (!items[i].separator && !items[i].disabled) { if (!items[i].separator && !items[i].disabled) {
mouse_over = i; mouse_over = i;
emit_signal(SNAME("id_focused"), i); emit_signal(SNAME("id_focused"), items[i].id);
scroll_to_item(i); scroll_to_item(i);
control->queue_redraw(); control->queue_redraw();
break; break;
@@ -1124,7 +1124,7 @@ void PopupMenu::_notification(int p_what) {
for (int i = search_from; i >= 0; i--) { for (int i = search_from; i >= 0; i--) {
if (!items[i].separator && !items[i].disabled) { if (!items[i].separator && !items[i].disabled) {
mouse_over = i; mouse_over = i;
emit_signal(SNAME("id_focused"), i); emit_signal(SNAME("id_focused"), items[i].id);
scroll_to_item(i); scroll_to_item(i);
control->queue_redraw(); control->queue_redraw();
match_found = true; match_found = true;
@@ -1137,7 +1137,7 @@ void PopupMenu::_notification(int p_what) {
for (int i = items.size() - 1; i >= search_from; i--) { for (int i = items.size() - 1; i >= search_from; i--) {
if (!items[i].separator && !items[i].disabled) { if (!items[i].separator && !items[i].disabled) {
mouse_over = i; mouse_over = i;
emit_signal(SNAME("id_focused"), i); emit_signal(SNAME("id_focused"), items[i].id);
scroll_to_item(i); scroll_to_item(i);
control->queue_redraw(); control->queue_redraw();
break; break;