diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-26 22:49:38 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2023-01-26 22:49:38 +0100 |
| commit | 619604093f26fb92a205bdb138b5570450d8a0ab (patch) | |
| tree | 37a2b4f25113e8bc58f1afd1eee4c642372a5e2c /editor | |
| parent | 44c0bfc94d81e758b39a8ee43df5915d64200ed6 (diff) | |
| parent | 4b2323e0303434c90935585b5d5c03b3d3e0f23c (diff) | |
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.
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_node.cpp | 1 | ||||
| -rw-r--r-- | editor/editor_title_bar.cpp | 2 | ||||
| -rw-r--r-- | editor/editor_title_bar.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 173cbc6893..0d5c820a3c 100644 --- a/editor/editor_node.cpp +++ b/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); } diff --git a/editor/editor_title_bar.cpp b/editor/editor_title_bar.cpp index 0271bbd64a..ae5cdfd72b 100644 --- a/editor/editor_title_bar.cpp +++ b/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; } diff --git a/editor/editor_title_bar.h b/editor/editor_title_bar.h index 6cac163830..4055476b82 100644 --- a/editor/editor_title_bar.h +++ b/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: |