summaryrefslogtreecommitdiff
path: root/platform/osx
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2017-12-14 19:15:46 +0100
committerRémi Verschelde <rverschelde@gmail.com>2017-12-14 19:16:20 +0100
commitfb84b49d87757226305cbaa96224e3fd84df5389 (patch)
treede632fcc690d3f43ffa035d58f3d057509cfd29b /platform/osx
parente1b374d5b624c1e0a09d8c6e5c11fc53f8d90423 (diff)
Fix type mismatch in OS::set_borderless_window
Closes #14663.
Diffstat (limited to 'platform/osx')
-rw-r--r--platform/osx/os_osx.h2
-rw-r--r--platform/osx/os_osx.mm3
2 files changed, 2 insertions, 3 deletions
diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h
index 33127a8c2a..ede50a05ba 100644
--- a/platform/osx/os_osx.h
+++ b/platform/osx/os_osx.h
@@ -204,7 +204,7 @@ public:
virtual void request_attention();
virtual String get_joy_guid(int p_device) const;
- virtual void set_borderless_window(int p_borderless);
+ virtual void set_borderless_window(bool p_borderless);
virtual bool get_borderless_window();
virtual void set_ime_position(const Point2 &p_pos);
virtual void set_ime_intermediate_text_callback(ImeCallback p_callback, void *p_inp);
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm
index 3d4883e269..f3809e6eed 100644
--- a/platform/osx/os_osx.mm
+++ b/platform/osx/os_osx.mm
@@ -1818,7 +1818,7 @@ void OS_OSX::request_attention() {
[NSApp requestUserAttention:NSCriticalRequest];
}
-void OS_OSX::set_borderless_window(int p_borderless) {
+void OS_OSX::set_borderless_window(bool p_borderless) {
// OrderOut prevents a lose focus bug with the window
[window_object orderOut:nil];
@@ -1975,7 +1975,6 @@ void OS_OSX::force_process_input() {
process_events(); // get rid of pending events
joypad_osx->process_joypads();
-
}
void OS_OSX::run() {