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

Merge pull request #55550 from pycbouh/editor-scroll-dat-preview-3.x

This commit is contained in:
Rémi Verschelde 2021-12-02 17:22:58 +01:00 committed by GitHub
parent d5b22e614e eb98210be4
commit 9d509c735a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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);
picker_button->set_pressed(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);
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() {
@ -223,7 +227,7 @@ ThemeEditorPreview::ThemeEditorPreview() {
preview_body->set_v_size_flags(SIZE_EXPAND_FILL);
add_child(preview_body);
ScrollContainer *preview_container = memnew(ScrollContainer);
preview_container = memnew(ScrollContainer);
preview_container->set_enable_v_scroll(true);
preview_container->set_enable_h_scroll(true);
preview_body->add_child(preview_container);

1
editor/plugins/theme_editor_preview.h
View File

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