diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-01-25 20:32:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-25 20:32:46 +0100 |
| commit | d7aea6ff6c54466dba51b75de5942154fbffe75d (patch) | |
| tree | 007454c2ce3140f711a17a38ea7a479c0412bc90 /scene | |
| parent | f7b814f9438984221bf0644f25c4c87447ba033e (diff) | |
| parent | 9d9d0f0bc995a4db9ee1e823380076bf2aca70d8 (diff) | |
| download | redot-engine-d7aea6ff6c54466dba51b75de5942154fbffe75d.tar.gz | |
Merge pull request #45447 from pycbouh/graphedit-minimap-active-invisible
Fix minimap capturing events and improve its theme and editor settings
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/gui/graph_edit.cpp | 6 | ||||
| -rw-r--r-- | scene/resources/default_theme/default_theme.cpp | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp index 6662992d46..bc87aabb2c 100644 --- a/scene/gui/graph_edit.cpp +++ b/scene/gui/graph_edit.cpp @@ -154,6 +154,10 @@ Vector2 GraphEditMinimap::_convert_to_graph_position(const Vector2 &p_position) } void GraphEditMinimap::_gui_input(const Ref<InputEvent> &p_ev) { + if (!ge->is_minimap_enabled()) { + return; + } + Ref<InputEventMouseButton> mb = p_ev; Ref<InputEventMouseMotion> mm = p_ev; @@ -1754,7 +1758,7 @@ GraphEdit::GraphEdit() { top_layer->add_child(minimap); minimap->set_name("_minimap"); minimap->set_modulate(Color(1, 1, 1, minimap_opacity)); - minimap->set_mouse_filter(MOUSE_FILTER_STOP); + minimap->set_mouse_filter(MOUSE_FILTER_PASS); minimap->set_custom_minimum_size(Vector2(50, 50)); minimap->set_size(minimap_size); minimap->set_anchors_preset(Control::PRESET_BOTTOM_RIGHT); diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp index 982239fe4e..5878467aaa 100644 --- a/scene/resources/default_theme/default_theme.cpp +++ b/scene/resources/default_theme/default_theme.cpp @@ -115,6 +115,7 @@ static Ref<Texture2D> flip_icon(Ref<Texture2D> p_texture, bool p_flip_y = false, Ref<ImageTexture> texture(memnew(ImageTexture)); Ref<Image> img = p_texture->get_data(); + img = img->duplicate(); if (p_flip_y) { img->flip_y(); |
