Browse Source

Merge pull request #71725 from bruvzg/mac_mpass_title

[macOS] Move extended title bar input to _gui_input and add mouse filters to prevent editor buttons from passing double-click to title.
Rémi Verschelde 2 years ago
parent
commit
619604093f
3 changed files with 3 additions and 2 deletions
  1. 1 0
      editor/editor_node.cpp
  2. 1 1
      editor/editor_title_bar.cpp
  3. 1 1
      editor/editor_title_bar.h

+ 1 - 0
editor/editor_node.cpp

@@ -7262,6 +7262,7 @@ EditorNode::EditorNode() {
 		project_title->set_text_overrun_behavior(TextServer::OVERRUN_TRIM_ELLIPSIS);
 		project_title->set_vertical_alignment(VERTICAL_ALIGNMENT_CENTER);
 		project_title->set_h_size_flags(Control::SIZE_EXPAND_FILL);
+		project_title->set_mouse_filter(Control::MOUSE_FILTER_PASS);
 		left_spacer->add_child(project_title);
 	}
 

+ 1 - 1
editor/editor_title_bar.cpp

@@ -30,7 +30,7 @@
 
 #include "editor/editor_title_bar.h"
 
-void EditorTitleBar::input(const Ref<InputEvent> &p_event) {
+void EditorTitleBar::gui_input(const Ref<InputEvent> &p_event) {
 	if (!can_move) {
 		return;
 	}

+ 1 - 1
editor/editor_title_bar.h

@@ -42,7 +42,7 @@ class EditorTitleBar : public HBoxContainer {
 	bool can_move = false;
 
 protected:
-	virtual void input(const Ref<InputEvent> &p_event) override;
+	virtual void gui_input(const Ref<InputEvent> &p_event) override;
 	static void _bind_methods(){};
 
 public: