diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-09-08 23:21:48 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-09-08 23:21:48 +0200 |
| commit | 5a92e27bfd25648c06f754dba5f49cae1c293bc8 (patch) | |
| tree | e8d0fdbbb9af5dc82d9aaad233c5225879a26122 | |
| parent | 325c1cffc404be0e7474892ac6a8948bf6b27a23 (diff) | |
| parent | 8ff190b065bbe255349eef4ed708c3b580b24efd (diff) | |
| download | redot-engine-5a92e27bfd25648c06f754dba5f49cae1c293bc8.tar.gz | |
Merge pull request #96343 from passivestar/dock-scale
Fix dock width not respecting editor scale
| -rw-r--r-- | editor/editor_dock_manager.cpp | 4 | ||||
| -rw-r--r-- | editor/editor_node.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/editor/editor_dock_manager.cpp b/editor/editor_dock_manager.cpp index 75135532aa..0bdda41f26 100644 --- a/editor/editor_dock_manager.cpp +++ b/editor/editor_dock_manager.cpp @@ -509,7 +509,7 @@ void EditorDockManager::save_docks_to_config(Ref<ConfigFile> p_layout, const Str } for (int i = 0; i < hsplits.size(); i++) { - p_layout->set_value(p_section, "dock_hsplit_" + itos(i + 1), hsplits[i]->get_split_offset()); + p_layout->set_value(p_section, "dock_hsplit_" + itos(i + 1), int(hsplits[i]->get_split_offset() / EDSCALE)); } FileSystemDock::get_singleton()->save_layout_to_config(p_layout, p_section); @@ -605,7 +605,7 @@ void EditorDockManager::load_docks_from_config(Ref<ConfigFile> p_layout, const S continue; } int ofs = p_layout->get_value(p_section, "dock_hsplit_" + itos(i + 1)); - hsplits[i]->set_split_offset(ofs); + hsplits[i]->set_split_offset(ofs * EDSCALE); } FileSystemDock::get_singleton()->load_layout_from_config(p_layout, p_section); diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 2b8d6e5ad1..39291138a6 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -7617,8 +7617,8 @@ EditorNode::EditorNode() { default_layout->set_value(docks_section, "dock_split_" + itos(i + 1), 0); } default_layout->set_value(docks_section, "dock_hsplit_1", 0); - default_layout->set_value(docks_section, "dock_hsplit_2", 270 * EDSCALE); - default_layout->set_value(docks_section, "dock_hsplit_3", -270 * EDSCALE); + default_layout->set_value(docks_section, "dock_hsplit_2", 270); + default_layout->set_value(docks_section, "dock_hsplit_3", -270); default_layout->set_value(docks_section, "dock_hsplit_4", 0); _update_layouts_menu(); |