Merge pull request #23181 from Calinou/tweak-min-panel-sizes-hidpi

Resize some editor panel minimum sizes on hiDPI displays
This commit is contained in:
Rémi Verschelde 2018-10-21 11:26:58 +02:00 committed by GitHub
commit 3ac0e8d0df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions

View file

@ -180,7 +180,7 @@ PluginConfigDialog::PluginConfigDialog() {
grid->add_child(desc_lb); grid->add_child(desc_lb);
desc_edit = memnew(TextEdit); desc_edit = memnew(TextEdit);
desc_edit->set_custom_minimum_size(Size2(400.0f, 50.0f)); desc_edit->set_custom_minimum_size(Size2(400, 80) * EDSCALE);
grid->add_child(desc_edit); grid->add_child(desc_edit);
Label *author_lb = memnew(Label); Label *author_lb = memnew(Label);

View file

@ -2912,7 +2912,7 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) {
script_list = memnew(ItemList); script_list = memnew(ItemList);
list_split->add_child(script_list); list_split->add_child(script_list);
script_list->set_custom_minimum_size(Size2(150 * EDSCALE, 90)); //need to give a bit of limit to avoid it from disappearing script_list->set_custom_minimum_size(Size2(150, 90) * EDSCALE); //need to give a bit of limit to avoid it from disappearing
script_list->set_v_size_flags(SIZE_EXPAND_FILL); script_list->set_v_size_flags(SIZE_EXPAND_FILL);
script_split->set_split_offset(140); script_split->set_split_offset(140);
_sort_list_on_update = true; _sort_list_on_update = true;
@ -2951,7 +2951,7 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) {
overview_vbox->add_child(members_overview); overview_vbox->add_child(members_overview);
members_overview->set_allow_reselect(true); members_overview->set_allow_reselect(true);
members_overview->set_custom_minimum_size(Size2(0, 90)); //need to give a bit of limit to avoid it from disappearing members_overview->set_custom_minimum_size(Size2(0, 90) * EDSCALE); //need to give a bit of limit to avoid it from disappearing
members_overview->set_v_size_flags(SIZE_EXPAND_FILL); members_overview->set_v_size_flags(SIZE_EXPAND_FILL);
members_overview->set_allow_rmb_select(true); members_overview->set_allow_rmb_select(true);
members_overview->set_drag_forwarding(this); members_overview->set_drag_forwarding(this);
@ -2959,12 +2959,12 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) {
help_overview = memnew(ItemList); help_overview = memnew(ItemList);
overview_vbox->add_child(help_overview); overview_vbox->add_child(help_overview);
help_overview->set_allow_reselect(true); help_overview->set_allow_reselect(true);
help_overview->set_custom_minimum_size(Size2(0, 90)); //need to give a bit of limit to avoid it from disappearing help_overview->set_custom_minimum_size(Size2(0, 90) * EDSCALE); //need to give a bit of limit to avoid it from disappearing
help_overview->set_v_size_flags(SIZE_EXPAND_FILL); help_overview->set_v_size_flags(SIZE_EXPAND_FILL);
tab_container = memnew(TabContainer); tab_container = memnew(TabContainer);
tab_container->set_tabs_visible(false); tab_container->set_tabs_visible(false);
tab_container->set_custom_minimum_size(Size2(200 * EDSCALE, 0)); tab_container->set_custom_minimum_size(Size2(200, 0) * EDSCALE);
script_split->add_child(tab_container); script_split->add_child(tab_container);
tab_container->set_h_size_flags(SIZE_EXPAND_FILL); tab_container->set_h_size_flags(SIZE_EXPAND_FILL);

View file

@ -355,7 +355,7 @@ void ScriptEditorDebugger::_video_mem_request() {
Size2 ScriptEditorDebugger::get_minimum_size() const { Size2 ScriptEditorDebugger::get_minimum_size() const {
Size2 ms = Control::get_minimum_size(); Size2 ms = Control::get_minimum_size();
ms.y = MAX(ms.y, 250); ms.y = MAX(ms.y, 250 * EDSCALE);
return ms; return ms;
} }
void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_data) { void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_data) {