diff options
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/android/java/res/values-zh-rCN/strings.xml (renamed from platform/android/java/res/values-zh/strings.xml) | 2 | ||||
| -rw-r--r-- | platform/android/java/res/values-zh-rHK/strings.xml | 4 | ||||
| -rw-r--r-- | platform/android/java/res/values-zh-rTW/strings.xml | 4 | ||||
| -rw-r--r-- | platform/osx/os_osx.mm | 6 |
4 files changed, 12 insertions, 4 deletions
diff --git a/platform/android/java/res/values-zh/strings.xml b/platform/android/java/res/values-zh-rCN/strings.xml index 397e66285..6668c56bd 100644 --- a/platform/android/java/res/values-zh/strings.xml +++ b/platform/android/java/res/values-zh-rCN/strings.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="godot_project_name_string">godot-project-name-zh</string> -</resources>
\ No newline at end of file +</resources> diff --git a/platform/android/java/res/values-zh-rHK/strings.xml b/platform/android/java/res/values-zh-rHK/strings.xml new file mode 100644 index 000000000..8a6269da0 --- /dev/null +++ b/platform/android/java/res/values-zh-rHK/strings.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="godot_project_name_string">godot-project-name-zh_HK</string> +</resources> diff --git a/platform/android/java/res/values-zh-rTW/strings.xml b/platform/android/java/res/values-zh-rTW/strings.xml new file mode 100644 index 000000000..b1bb39d5d --- /dev/null +++ b/platform/android/java/res/values-zh-rTW/strings.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="godot_project_name_string">godot-project-name-zh_TW</string> +</resources> diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index ffae536ef..b084a08ec 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -1494,8 +1494,6 @@ Size2 OS_OSX::get_window_size() const { }; -const int menuHeight = [[NSStatusBar systemStatusBar] thickness]; - void OS_OSX::set_window_size(const Size2 p_size) { Size2 size=p_size; @@ -1504,8 +1502,10 @@ void OS_OSX::set_window_size(const Size2 p_size) { CGFloat menuBarHeight = [[[NSApplication sharedApplication] mainMenu] menuBarHeight]; if (menuBarHeight != 0.f) { size.y+= menuBarHeight; +#if MAC_OS_X_VERSION_MAX_ALLOWED <= 101104 } else { - size.y+= menuHeight; + size.y+= [[NSStatusBar systemStatusBar] thickness]; +#endif } NSRect frame = [window_object frame]; [window_object setFrame:NSMakeRect(frame.origin.x, frame.origin.y, size.x, size.y) display:YES]; |