diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-08-20 15:25:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-20 15:25:14 +0200 |
| commit | 20ab8c11567c6edadb26292ce99367281f251d4e (patch) | |
| tree | cfb2f349f1e0f80ce9459b0e39c53405f3d5193b /editor | |
| parent | 177583e282bb04945e118ee9424204ed11d4222d (diff) | |
| parent | 686294e4f2e19598c350008e2268a1e103d6281a (diff) | |
Merge pull request #10473 from akien-mga/run_window_placement_default
Rename "Default" window placement mode to "Top Left"
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_run.cpp | 2 | ||||
| -rw-r--r-- | editor/editor_settings.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/editor/editor_run.cpp b/editor/editor_run.cpp index 4954b1f741..e1ef20255b 100644 --- a/editor/editor_run.cpp +++ b/editor/editor_run.cpp @@ -93,7 +93,7 @@ Error EditorRun::run(const String &p_scene, const String p_custom_args, const Li int window_placement = EditorSettings::get_singleton()->get("run/window_placement/rect"); switch (window_placement) { - case 0: { // default + case 0: { // top left args.push_back("-p"); args.push_back(itos(screen_rect.position.x) + "x" + itos(screen_rect.position.y)); diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index a5bc0735c7..843e5d0748 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -686,7 +686,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) { set("editors/poly_editor/point_grab_radius", 8); set("run/window_placement/rect", 1); - hints["run/window_placement/rect"] = PropertyInfo(Variant::INT, "run/window_placement/rect", PROPERTY_HINT_ENUM, "Default,Centered,Custom Position,Force Maximized,Force Full Screen"); + hints["run/window_placement/rect"] = PropertyInfo(Variant::INT, "run/window_placement/rect", PROPERTY_HINT_ENUM, "Top Left,Centered,Custom Position,Force Maximized,Force Fullscreen"); String screen_hints = TTR("Default (Same as Editor)"); for (int i = 0; i < OS::get_singleton()->get_screen_count(); i++) { screen_hints += ",Monitor " + itos(i + 1); |