Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
f003b3ef
Unverified
Commit
f003b3ef
authored
Feb 06, 2020
by
Rémi Verschelde
Committed by
GitHub
Feb 06, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #35068 from akien-mga/containers-mouse-filter-pass
Use MOUSE_FILTER_PASS for all containers
parents
d705f780
e2bebfbd
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
5 additions
and
11 deletions
+5
-11
editor_audio_buses.cpp
editor/editor_audio_buses.cpp
+0
-1
asset_library_editor_plugin.cpp
editor/plugins/asset_library_editor_plugin.cpp
+0
-3
box_container.cpp
scene/gui/box_container.cpp
+0
-2
container.cpp
scene/gui/container.cpp
+2
-0
graph_edit.cpp
scene/gui/graph_edit.cpp
+0
-2
grid_container.cpp
scene/gui/grid_container.cpp
+0
-2
panel.cpp
scene/gui/panel.cpp
+1
-1
panel_container.cpp
scene/gui/panel_container.cpp
+2
-0
No files found.
editor/editor_audio_buses.cpp
View file @
f003b3ef
...
...
@@ -856,7 +856,6 @@ EditorAudioBus::EditorAudioBus(EditorAudioBuses *p_buses, bool p_is_master) {
HBoxContainer
*
audioprev_hbc
=
memnew
(
HBoxContainer
);
audioprev_hbc
->
set_v_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_label
=
memnew
(
Label
);
...
...
editor/plugins/asset_library_editor_plugin.cpp
View file @
f003b3ef
...
...
@@ -139,8 +139,6 @@ EditorAssetLibraryItem::EditorAssetLibraryItem() {
set_custom_minimum_size
(
Size2
(
250
,
100
)
*
EDSCALE
);
set_h_size_flags
(
SIZE_EXPAND_FILL
);
set_mouse_filter
(
MOUSE_FILTER_PASS
);
}
//////////////////////////////////////////////////////////////////////////////
...
...
@@ -1455,7 +1453,6 @@ EditorAssetLibrary::EditorAssetLibrary(bool p_templates_only) {
library_scroll
->
add_child
(
library_vb_border
);
library_vb_border
->
add_style_override
(
"panel"
,
border2
);
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
->
set_h_size_flags
(
SIZE_EXPAND_FILL
);
...
...
scene/gui/box_container.cpp
View file @
f003b3ef
...
...
@@ -289,8 +289,6 @@ BoxContainer::BoxContainer(bool p_vertical) {
vertical
=
p_vertical
;
align
=
ALIGN_BEGIN
;
//set_ignore_mouse(true);
set_mouse_filter
(
MOUSE_FILTER_PASS
);
}
void
BoxContainer
::
_bind_methods
()
{
...
...
scene/gui/container.cpp
View file @
f003b3ef
...
...
@@ -197,4 +197,6 @@ void Container::_bind_methods() {
Container
::
Container
()
{
pending_sort
=
false
;
// All containers should let mouse events pass by default.
set_mouse_filter
(
MOUSE_FILTER_PASS
);
}
scene/gui/graph_edit.cpp
View file @
f003b3ef
...
...
@@ -261,7 +261,6 @@ void GraphEdit::add_child_notify(Node *p_child) {
gn
->
connect
(
"raise_request"
,
this
,
"_graph_node_raised"
,
varray
(
gn
));
gn
->
connect
(
"item_rect_changed"
,
connections_layer
,
"update"
);
_graph_node_moved
(
gn
);
gn
->
set_mouse_filter
(
MOUSE_FILTER_PASS
);
}
}
...
...
@@ -1342,7 +1341,6 @@ GraphEdit::GraphEdit() {
top_layer
->
set_mouse_filter
(
MOUSE_FILTER_PASS
);
top_layer
->
set_anchors_and_margins_preset
(
Control
::
PRESET_WIDE
);
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"
);
connections_layer
=
memnew
(
Control
);
...
...
scene/gui/grid_container.cpp
View file @
f003b3ef
...
...
@@ -247,7 +247,5 @@ Size2 GridContainer::get_minimum_size() const {
}
GridContainer
::
GridContainer
()
{
set_mouse_filter
(
MOUSE_FILTER_PASS
);
columns
=
1
;
}
scene/gui/panel.cpp
View file @
f003b3ef
...
...
@@ -42,7 +42,7 @@ void Panel::_notification(int p_what) {
}
Panel
::
Panel
()
{
// Has visible stylebox, so stop by default.
set_mouse_filter
(
MOUSE_FILTER_STOP
);
}
...
...
scene/gui/panel_container.cpp
View file @
f003b3ef
...
...
@@ -103,4 +103,6 @@ void PanelContainer::_notification(int p_what) {
}
PanelContainer
::
PanelContainer
()
{
// Has visible stylebox, so stop by default.
set_mouse_filter
(
MOUSE_FILTER_STOP
);
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment