asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Allow scrolling theme preview when the control picker is active

Browse source 
(cherry picked from commit eb98210be4)
This commit is contained in:
Yuri Sizov 2021-12-02 19:03:31 +03:00 committed by Rémi Verschelde
parent 34bdca36de
commit 3d0676a588
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
editor/plugins/theme_editor_preview.cpp
View file

@ -150,6 +150,7 @@ void ThemeEditorPreview::_gui_input_picker_overlay(const Ref<InputEvent> &p_even
emit_signal("control_picked", theme_type); emit_signal("control_picked", theme_type);
picker_button->set_pressed(false); picker_button->set_pressed(false);
picker_overlay->set_visible(false); picker_overlay->set_visible(false);
return;
} }
} }
@ -160,6 +161,9 @@ void ThemeEditorPreview::_gui_input_picker_overlay(const Ref<InputEvent> &p_even
hovered_control = _find_hovered_control(preview_content, mp); hovered_control = _find_hovered_control(preview_content, mp);
picker_overlay->update(); picker_overlay->update();
} }
// Forward input to the scroll container underneath to allow scrolling.
preview_container->call("_gui_input", p_event);
} }
void ThemeEditorPreview::_reset_picker_overlay() { void ThemeEditorPreview::_reset_picker_overlay() {
@ -223,7 +227,7 @@ ThemeEditorPreview::ThemeEditorPreview() {
preview_body->set_v_size_flags(SIZE_EXPAND_FILL); preview_body->set_v_size_flags(SIZE_EXPAND_FILL);
add_child(preview_body); add_child(preview_body);
ScrollContainer *preview_container = memnew(ScrollContainer); preview_container = memnew(ScrollContainer);
preview_container->set_enable_v_scroll(true); preview_container->set_enable_v_scroll(true);
preview_container->set_enable_h_scroll(true); preview_container->set_enable_h_scroll(true);
preview_body->add_child(preview_container); preview_body->add_child(preview_container);

1
editor/plugins/theme_editor_preview.h
View file

@ -55,6 +55,7 @@
class ThemeEditorPreview : public VBoxContainer { class ThemeEditorPreview : public VBoxContainer {
GDCLASS(ThemeEditorPreview, VBoxContainer); GDCLASS(ThemeEditorPreview, VBoxContainer);
ScrollContainer *preview_container;
ColorRect *preview_bg; ColorRect *preview_bg;
MarginContainer *preview_overlay; MarginContainer *preview_overlay;
Control *picker_overlay; Control *picker_overlay;