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

Make Godot detect if the screen is too small (<1200 pixels wide), and use single dock column like in 1.0 if that's the case.

Browse Source
This commit is contained in:
Juan Linietsky
2016-09-13 11:20:09 -03:00
parent 8bcb6a290c
commit bfe67a3b87
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tools/editor/editor_node.cpp
View File

@@ -5366,10 +5366,15 @@ EditorNode::EditorNode() {
// load settings // load settings
if (!EditorSettings::get_singleton()) if (!EditorSettings::get_singleton())
EditorSettings::create(); EditorSettings::create();
bool use_single_dock_column = false;
{ {
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_scale( OS::get_singleton()->get_screen_dpi(0) > 150 ? 2.0 : 1.0 ); editor_set_scale( OS::get_singleton()->get_screen_dpi(0) > 150 && OS::get_singleton()->get_screen_size(OS::get_singleton()->get_current_screen()).x>2000 ? 2.0 : 1.0 );
use_single_dock_column = OS::get_singleton()->get_screen_size(OS::get_singleton()->get_current_screen()).x<1200;
} else if (dpi_mode==1) { } else if (dpi_mode==1) {
editor_set_scale(0.75); editor_set_scale(0.75);
} else if (dpi_mode==2) { } else if (dpi_mode==2) {
@@ -5382,7 +5387,6 @@ EditorNode::EditorNode() {
} }
ResourceLoader::set_abort_on_missing_resources(false); ResourceLoader::set_abort_on_missing_resources(false);
FileDialog::set_default_show_hidden_files(EditorSettings::get_singleton()->get("file_dialog/show_hidden_files")); FileDialog::set_default_show_hidden_files(EditorSettings::get_singleton()->get("file_dialog/show_hidden_files"));
EditorFileDialog::set_default_show_hidden_files(EditorSettings::get_singleton()->get("file_dialog/show_hidden_files")); EditorFileDialog::set_default_show_hidden_files(EditorSettings::get_singleton()->get("file_dialog/show_hidden_files"));
@@ -6201,12 +6205,24 @@ EditorNode::EditorNode() {
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());
dock_slot[DOCK_SLOT_RIGHT_BL]->add_child(node_dock); 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);
}
scenes_dock = memnew( FileSystemDock(this) ); scenes_dock = memnew( FileSystemDock(this) );
scenes_dock->set_name(TTR("FileSystem")); scenes_dock->set_name(TTR("FileSystem"));
scenes_dock->set_display_mode(int(EditorSettings::get_singleton()->get("filesystem_dock/display_mode"))); scenes_dock->set_display_mode(int(EditorSettings::get_singleton()->get("filesystem_dock/display_mode")));
dock_slot[DOCK_SLOT_LEFT_UR]->add_child(scenes_dock);
if (use_single_dock_column) {
dock_slot[DOCK_SLOT_RIGHT_BL]->add_child(scenes_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(scenes_dock);
}
//prop_pallete->add_child(scenes_dock); //prop_pallete->add_child(scenes_dock);
scenes_dock->connect("open",this,"open_request"); scenes_dock->connect("open",this,"open_request");
scenes_dock->connect("instance",this,"_instance_request"); scenes_dock->connect("instance",this,"_instance_request");

2
tools/editor/project_manager.cpp
View File

@@ -1185,7 +1185,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_scale( OS::get_singleton()->get_screen_dpi(0) > 150 ? 2.0 : 1.0 ); editor_set_scale( OS::get_singleton()->get_screen_dpi(0) > 150 && OS::get_singleton()->get_screen_size(OS::get_singleton()->get_current_screen()).x>2000 ? 2.0 : 1.0 );
} else if (dpi_mode==1) { } else if (dpi_mode==1) {
editor_set_scale(0.75); editor_set_scale(0.75);
} else if (dpi_mode==2) { } else if (dpi_mode==2) {