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

Use MOUSE_FILTER_PASS for all containers (but PanelContainer)

Browse Source 
Containers are meant to forward mouse input to their the Controls
they contain.

PanelContainer has a visible Panel stylebox, so it still defaults
to STOP.

Fixes #34933.
This commit is contained in:
Rémi Verschelde 2020-01-13 08:55:16 +01:00
parent 7a15569c6f
commit e2bebfbd4c
8 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
editor/editor_audio_buses.cpp
View File

@ -856,7 +856,6 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) {
HBoxContainer *audioprev_hbc = memnew(HBoxContainer); HBoxContainer *audioprev_hbc = memnew(HBoxContainer);
audioprev_hbc->set_v_size_flags(SIZE_EXPAND_FILL); audioprev_hbc->set_v_size_flags(SIZE_EXPAND_FILL);
audioprev_hbc->set_h_size_flags(SIZE_EXPAND_FILL); audioprev_hbc->set_h_size_flags(SIZE_EXPAND_FILL);
audioprev_hbc->set_mouse_filter(MOUSE_FILTER_PASS);
audio_value_preview_box->add_child(audioprev_hbc); audio_value_preview_box->add_child(audioprev_hbc);
audio_value_preview_label = memnew(Label); audio_value_preview_label = memnew(Label);

3
editor/plugins/asset_library_editor_plugin.cpp
View File

@ -139,8 +139,6 @@ EditorAssetLibraryItem::EditorAssetLibraryItem() {
set_custom_minimum_size(Size2(250, 100) * EDSCALE); set_custom_minimum_size(Size2(250, 100) * EDSCALE);
set_h_size_flags(SIZE_EXPAND_FILL); set_h_size_flags(SIZE_EXPAND_FILL);
set_mouse_filter(MOUSE_FILTER_PASS);
} }
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
@ -1452,7 +1450,6 @@ EditorAssetLibrary::EditorAssetLibrary(bool p_templates_only) {
library_scroll->add_child(library_vb_border); library_scroll->add_child(library_vb_border);
library_vb_border->add_style_override("panel", border2); library_vb_border->add_style_override("panel", border2);
library_vb_border->set_h_size_flags(SIZE_EXPAND_FILL); library_vb_border->set_h_size_flags(SIZE_EXPAND_FILL);
library_vb_border->set_mouse_filter(MOUSE_FILTER_PASS);
library_vb = memnew(VBoxContainer); library_vb = memnew(VBoxContainer);
library_vb->set_h_size_flags(SIZE_EXPAND_FILL); library_vb->set_h_size_flags(SIZE_EXPAND_FILL);

2
scene/gui/box_container.cpp
View File

@ -289,8 +289,6 @@ BoxContainer::BoxContainer(bool p_vertical) {
vertical = p_vertical; vertical = p_vertical;
align = ALIGN_BEGIN; align = ALIGN_BEGIN;
//set_ignore_mouse(true);
set_mouse_filter(MOUSE_FILTER_PASS);
} }
void BoxContainer::_bind_methods() { void BoxContainer::_bind_methods() {

2
scene/gui/container.cpp
View File

@ -197,4 +197,6 @@ void Container::_bind_methods() {
Container::Container() { Container::Container() {
pending_sort = false; pending_sort = false;
// All containers should let mouse events pass by default.
set_mouse_filter(MOUSE_FILTER_PASS);
} }

2
scene/gui/graph_edit.cpp
View File

@ -254,7 +254,6 @@ void GraphEdit::add_child_notify(Node *p_child) {
gn->connect("raise_request", this, "_graph_node_raised", varray(gn)); gn->connect("raise_request", this, "_graph_node_raised", varray(gn));
gn->connect("item_rect_changed", connections_layer, "update"); gn->connect("item_rect_changed", connections_layer, "update");
_graph_node_moved(gn); _graph_node_moved(gn);
gn->set_mouse_filter(MOUSE_FILTER_PASS);
} }
} }
@ -1335,7 +1334,6 @@ GraphEdit::GraphEdit() {
top_layer->set_mouse_filter(MOUSE_FILTER_PASS); top_layer->set_mouse_filter(MOUSE_FILTER_PASS);
top_layer->set_anchors_and_margins_preset(Control::PRESET_WIDE); top_layer->set_anchors_and_margins_preset(Control::PRESET_WIDE);
top_layer->connect("draw", this, "_top_layer_draw"); top_layer->connect("draw", this, "_top_layer_draw");
top_layer->set_mouse_filter(MOUSE_FILTER_PASS);
top_layer->connect("gui_input", this, "_top_layer_input"); top_layer->connect("gui_input", this, "_top_layer_input");
connections_layer = memnew(Control); connections_layer = memnew(Control);

2
scene/gui/grid_container.cpp
View File

@ -247,7 +247,5 @@ Size2 GridContainer::get_minimum_size() const {
} }
GridContainer::GridContainer() { GridContainer::GridContainer() {
set_mouse_filter(MOUSE_FILTER_PASS);
columns = 1; columns = 1;
} }

2
scene/gui/panel.cpp
View File

@ -42,7 +42,7 @@ void Panel::_notification(int p_what) {
} }
Panel::Panel() { Panel::Panel() {
// Has visible stylebox, so stop by default.
set_mouse_filter(MOUSE_FILTER_STOP); set_mouse_filter(MOUSE_FILTER_STOP);
} }

2
scene/gui/panel_container.cpp
View File

@ -103,4 +103,6 @@ void PanelContainer::_notification(int p_what) {
} }
PanelContainer::PanelContainer() { PanelContainer::PanelContainer() {
// Has visible stylebox, so stop by default.
set_mouse_filter(MOUSE_FILTER_STOP);
} }