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

Merge pull request #35037 from timothyqiu/plugin-min-height

Browse Source 
Fixes min size of various editor plugins on HiDPI
This commit is contained in:
Rémi Verschelde 2020-01-12 13:39:34 +01:00 committed by GitHub
commit 26bb08f8b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
editor/plugins/animation_tree_editor_plugin.cpp
View File

@ -39,6 +39,7 @@
#include "core/os/input.h" #include "core/os/input.h"
#include "core/os/keyboard.h" #include "core/os/keyboard.h"
#include "core/project_settings.h" #include "core/project_settings.h"
#include "editor/editor_scale.h"
#include "scene/animation/animation_blend_tree.h" #include "scene/animation/animation_blend_tree.h"
#include "scene/animation/animation_player.h" #include "scene/animation/animation_player.h"
#include "scene/gui/menu_button.h" #include "scene/gui/menu_button.h"
@ -284,7 +285,7 @@ AnimationTreeEditorPlugin::AnimationTreeEditorPlugin(EditorNode *p_node) {
editor = p_node; editor = p_node;
anim_tree_editor = memnew(AnimationTreeEditor); anim_tree_editor = memnew(AnimationTreeEditor);
anim_tree_editor->set_custom_minimum_size(Size2(0, 300)); anim_tree_editor->set_custom_minimum_size(Size2(0, 300) * EDSCALE);
button = editor->add_bottom_panel_item(TTR("AnimationTree"), anim_tree_editor); button = editor->add_bottom_panel_item(TTR("AnimationTree"), anim_tree_editor);
button->hide(); button->hide();

3
editor/plugins/audio_stream_editor_plugin.cpp
View File

@ -33,6 +33,7 @@
#include "core/io/resource_loader.h" #include "core/io/resource_loader.h"
#include "core/project_settings.h" #include "core/project_settings.h"
#include "editor/audio_stream_preview.h" #include "editor/audio_stream_preview.h"
#include "editor/editor_scale.h"
#include "editor/editor_settings.h" #include "editor/editor_settings.h"
void AudioStreamEditor::_notification(int p_what) { void AudioStreamEditor::_notification(int p_what) {
@ -208,7 +209,7 @@ void AudioStreamEditor::_bind_methods() {
AudioStreamEditor::AudioStreamEditor() { AudioStreamEditor::AudioStreamEditor() {
set_custom_minimum_size(Size2(1, 100)); set_custom_minimum_size(Size2(1, 100) * EDSCALE);
_current = 0; _current = 0;
_dragging = false; _dragging = false;

3
editor/plugins/resource_preloader_editor_plugin.cpp
View File

@ -32,6 +32,7 @@
#include "core/io/resource_loader.h" #include "core/io/resource_loader.h"
#include "core/project_settings.h" #include "core/project_settings.h"
#include "editor/editor_scale.h"
#include "editor/editor_settings.h" #include "editor/editor_settings.h"
void ResourcePreloaderEditor::_gui_input(Ref<InputEvent> p_event) { void ResourcePreloaderEditor::_gui_input(Ref<InputEvent> p_event) {
@ -438,7 +439,7 @@ ResourcePreloaderEditorPlugin::ResourcePreloaderEditorPlugin(EditorNode *p_node)
editor = p_node; editor = p_node;
preloader_editor = memnew(ResourcePreloaderEditor); preloader_editor = memnew(ResourcePreloaderEditor);
preloader_editor->set_custom_minimum_size(Size2(0, 250)); preloader_editor->set_custom_minimum_size(Size2(0, 250) * EDSCALE);
button = editor->add_bottom_panel_item(TTR("ResourcePreloader"), preloader_editor); button = editor->add_bottom_panel_item(TTR("ResourcePreloader"), preloader_editor);
button->hide(); button->hide();

3
editor/plugins/shader_editor_plugin.cpp
View File

@ -35,6 +35,7 @@
#include "core/os/keyboard.h" #include "core/os/keyboard.h"
#include "core/os/os.h" #include "core/os/os.h"
#include "editor/editor_node.h" #include "editor/editor_node.h"
#include "editor/editor_scale.h"
#include "editor/editor_settings.h" #include "editor/editor_settings.h"
#include "editor/property_editor.h" #include "editor/property_editor.h"
#include "servers/visual/shader_types.h" #include "servers/visual/shader_types.h"
@ -756,7 +757,7 @@ ShaderEditorPlugin::ShaderEditorPlugin(EditorNode *p_node) {
editor = p_node; editor = p_node;
shader_editor = memnew(ShaderEditor(p_node)); shader_editor = memnew(ShaderEditor(p_node));
shader_editor->set_custom_minimum_size(Size2(0, 300)); shader_editor->set_custom_minimum_size(Size2(0, 300) * EDSCALE);
button = editor->add_bottom_panel_item(TTR("Shader"), shader_editor); button = editor->add_bottom_panel_item(TTR("Shader"), shader_editor);
button->hide(); button->hide();
} }

2
editor/plugins/visual_shader_editor_plugin.cpp
View File

@ -2852,7 +2852,7 @@ VisualShaderEditorPlugin::VisualShaderEditorPlugin(EditorNode *p_node) {
editor = p_node; editor = p_node;
visual_shader_editor = memnew(VisualShaderEditor); visual_shader_editor = memnew(VisualShaderEditor);
visual_shader_editor->set_custom_minimum_size(Size2(0, 300)); visual_shader_editor->set_custom_minimum_size(Size2(0, 300) * EDSCALE);
button = editor->add_bottom_panel_item(TTR("VisualShader"), visual_shader_editor); button = editor->add_bottom_panel_item(TTR("VisualShader"), visual_shader_editor);
button->hide(); button->hide();