godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-16 14:00:40 +00:00
Code Releases Wiki Activity

Only assume HiDPI mode if DPI >= 192 and width > 2000

Browse Source 
Also use single-dock column if width < 1200.

Manually adapted from bfe67a3b87
and c103f32ea3.

Fixes #6096.
This commit is contained in:
Rémi Verschelde
2017-03-24 18:23:48 +01:00
parent fd17d301d0
commit a531051a61
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
editor/editor_node.cpp
View File

@@ -5088,7 +5088,7 @@ EditorNode::EditorNode() {
{ {
int dpi_mode = EditorSettings::get_singleton()->get("global/hidpi_mode"); int dpi_mode = EditorSettings::get_singleton()->get("global/hidpi_mode");
if (dpi_mode == 0) { if (dpi_mode == 0) {
editor_set_hidpi(OS::get_singleton()->get_screen_dpi(0) > 150); editor_set_hidpi(OS::get_singleton()->get_screen_dpi(0) >= 192 && OS::get_singleton()->get_screen_size(OS::get_singleton()->get_current_screen()).x > 2000);
} else if (dpi_mode == 2) { } else if (dpi_mode == 2) {
editor_set_hidpi(true); editor_set_hidpi(true);
} else { } else {
@@ -5875,14 +5875,29 @@ EditorNode::EditorNode() {
prop_editor_base->add_child(property_editor); prop_editor_base->add_child(property_editor);
property_editor->set_undo_redo(&editor_data.get_undo_redo()); property_editor->set_undo_redo(&editor_data.get_undo_redo());
bool use_single_dock_column = OS::get_singleton()->get_screen_size(OS::get_singleton()->get_current_screen()).x < 1200;
node_dock = memnew(NodeDock); node_dock = memnew(NodeDock);
//node_dock->set_undoredo(&editor_data.get_undo_redo()); //node_dock->set_undoredo(&editor_data.get_undo_redo());
if (use_single_dock_column) {
dock_slot[DOCK_SLOT_RIGHT_UL]->add_child(node_dock);
} else {
dock_slot[DOCK_SLOT_RIGHT_BL]->add_child(node_dock); dock_slot[DOCK_SLOT_RIGHT_BL]->add_child(node_dock);
}
filesystem_dock = memnew(FileSystemDock(this)); filesystem_dock = memnew(FileSystemDock(this));
filesystem_dock->set_name(TTR("FileSystem")); filesystem_dock->set_name(TTR("FileSystem"));
filesystem_dock->set_display_mode(int(EditorSettings::get_singleton()->get("filesystem_dock/display_mode"))); filesystem_dock->set_display_mode(int(EditorSettings::get_singleton()->get("filesystem_dock/display_mode")));
if (use_single_dock_column) {
dock_slot[DOCK_SLOT_RIGHT_BL]->add_child(filesystem_dock);
left_r_vsplit->hide();
dock_slot[DOCK_SLOT_LEFT_UR]->hide();
dock_slot[DOCK_SLOT_LEFT_BR]->hide();
} else {
dock_slot[DOCK_SLOT_LEFT_UR]->add_child(filesystem_dock); dock_slot[DOCK_SLOT_LEFT_UR]->add_child(filesystem_dock);
}
//prop_pallete->add_child(filesystem_dock); //prop_pallete->add_child(filesystem_dock);
filesystem_dock->connect("open", this, "open_request"); filesystem_dock->connect("open", this, "open_request");
filesystem_dock->connect("instance", this, "_instance_request"); filesystem_dock->connect("instance", this, "_instance_request");

2
editor/project_manager.cpp
View File

@@ -1180,7 +1180,7 @@ ProjectManager::ProjectManager() {
{ {
int dpi_mode = EditorSettings::get_singleton()->get("global/hidpi_mode"); int dpi_mode = EditorSettings::get_singleton()->get("global/hidpi_mode");
if (dpi_mode == 0) { if (dpi_mode == 0) {
editor_set_hidpi(OS::get_singleton()->get_screen_dpi(0) > 150); editor_set_hidpi(OS::get_singleton()->get_screen_dpi(0) >= 192 && OS::get_singleton()->get_screen_size(OS::get_singleton()->get_current_screen()).x > 2000);
} else if (dpi_mode == 2) { } else if (dpi_mode == 2) {
editor_set_hidpi(true); editor_set_hidpi(true);
} else { } else {