Merge pull request #93257 from bruvzg/antrk_popup_drag

[AnimationTrackEdit] Cancel key drag when popup is shown.
godotengine · Jun 18, 2024 · a06a5e2 · a06a5e2
2 parents 2a47014 + 0e76739
commit a06a5e2
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/editor/animation_track_editor.cpp b/editor/animation_track_editor.cpp
@@ -2826,6 +2826,9 @@ void AnimationTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
  }
  menu->reset_size();
 
+ moving_selection_attempt = false;
+ moving_selection = false;
+
  Vector2 popup_pos = get_screen_position() + update_mode_rect.position + Vector2(0, update_mode_rect.size.height);
  menu->set_position(popup_pos);
  menu->popup();
@@ -2872,6 +2875,9 @@ void AnimationTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
  }
  menu->reset_size();
 
+ moving_selection_attempt = false;
+ moving_selection = false;
+
  Vector2 popup_pos = get_screen_position() + interp_mode_rect.position + Vector2(0, interp_mode_rect.size.height);
  menu->set_position(popup_pos);
  menu->popup();
@@ -2889,6 +2895,9 @@ void AnimationTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
  menu->add_icon_item(get_editor_theme_icon(SNAME("InterpWrapLoop")), TTR("Wrap Loop Interp"), MENU_LOOP_WRAP);
  menu->reset_size();
 
+ moving_selection_attempt = false;
+ moving_selection = false;
+
  Vector2 popup_pos = get_screen_position() + loop_wrap_rect.position + Vector2(0, loop_wrap_rect.size.height);
  menu->set_position(popup_pos);
  menu->popup();
@@ -2943,6 +2952,9 @@ void AnimationTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
  }
  menu->reset_size();
 
+ moving_selection_attempt = false;
+ moving_selection = false;
+
  menu->set_position(get_screen_position() + get_local_mouse_position());
  menu->popup();
 
@@ -2965,6 +2977,10 @@ void AnimationTrackEdit::gui_input(const Ref<InputEvent> &p_event) {
 
  path->set_text(animation->track_get_path(track));
  Vector2 theme_ofs = path->get_theme_stylebox(CoreStringName(normal), SNAME("LineEdit"))->get_offset();
+
+ moving_selection_attempt = false;
+ moving_selection = false;
+
  path_popup->set_position(get_screen_position() + path_rect.position - theme_ofs);
  path_popup->set_size(path_rect.size);
  path_popup->popup();