From 1629e9b1fa64c227bc86683312c7a602899c1838 Mon Sep 17 00:00:00 2001
From: Giganzo <158825920+Giganzo@users.noreply.github.com>
Date: Thu, 5 Sep 2024 01:45:06 +0200
Subject: [PATCH] Fix shift clicking on Add Sun/Environment to Scene buttons

(cherry picked from commit 1b6af3acd380358eda46be60d0278bca3ba39a2c)
---
 editor/plugins/node_3d_editor_plugin.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/editor/plugins/node_3d_editor_plugin.cpp b/editor/plugins/node_3d_editor_plugin.cpp
index ad24939446f..b787563d64b 100644
--- a/editor/plugins/node_3d_editor_plugin.cpp
+++ b/editor/plugins/node_3d_editor_plugin.cpp
@@ -7788,6 +7788,9 @@ void Node3DEditor::_sun_environ_settings_pressed() {
 	sun_environ_popup->set_position(pos - Vector2(sun_environ_popup->get_contents_minimum_size().width / 2, 0));
 	sun_environ_popup->reset_size();
 	sun_environ_popup->popup();
+	// Grabbing the focus is required for Shift modifier checking to be functional
+	// (when the Add sun/environment buttons are pressed).
+	sun_environ_popup->grab_focus();
 }
 
 void Node3DEditor::_add_sun_to_scene(bool p_already_added_environment) {