godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Rémi Verschelde 2023-01-26 22:49:38 +01:00
parent 44c0bfc94d 4b2323e030
commit 619604093f
No known key found for this signature in database
GPG Key ID: C3336907360768E1
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
editor/editor_node.cpp
View File

@ -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);
}

2
editor/editor_title_bar.cpp
View File

@ -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;
}

2
editor/editor_title_bar.h
View File

@ -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: