seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix type mismatch in OS::set_borderless_window

Browse Source 
Closes #14663.
This commit is contained in:
Rémi Verschelde
2017-12-14 19:15:46 +01:00
parent e1b374d5b6
commit fb84b49d87
7 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/os/os.h
View File

@ -191,7 +191,7 @@ public:
virtual bool is_window_maximized() const { return true; } virtual bool is_window_maximized() const { return true; }
virtual void request_attention() {} virtual void request_attention() {}
virtual void set_borderless_window(int p_borderless) {} virtual void set_borderless_window(bool p_borderless) {}
virtual bool get_borderless_window() { return 0; } virtual bool get_borderless_window() { return 0; }
virtual void set_ime_position(const Point2 &p_pos) {} virtual void set_ime_position(const Point2 &p_pos) {}

2
platform/osx/os_osx.h
View File

@ -204,7 +204,7 @@ public:
virtual void request_attention(); virtual void request_attention();
virtual String get_joy_guid(int p_device) const; 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 bool get_borderless_window();
virtual void set_ime_position(const Point2 &p_pos); virtual void set_ime_position(const Point2 &p_pos);
virtual void set_ime_intermediate_text_callback(ImeCallback p_callback, void *p_inp); virtual void set_ime_intermediate_text_callback(ImeCallback p_callback, void *p_inp);

3
platform/osx/os_osx.mm
View File

@ -1818,7 +1818,7 @@ void OS_OSX::request_attention() {
[NSApp requestUserAttention:NSCriticalRequest]; [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 // OrderOut prevents a lose focus bug with the window
[window_object orderOut:nil]; [window_object orderOut:nil];
@ -1975,7 +1975,6 @@ void OS_OSX::force_process_input() {
process_events(); // get rid of pending events process_events(); // get rid of pending events
joypad_osx->process_joypads(); joypad_osx->process_joypads();
} }
void OS_OSX::run() { void OS_OSX::run() {

2
platform/windows/os_windows.cpp
View File

@ -1598,7 +1598,7 @@ bool OS_Windows::is_window_maximized() const {
return maximized; return maximized;
} }
void OS_Windows::set_borderless_window(int p_borderless) { void OS_Windows::set_borderless_window(bool p_borderless) {
if (video_mode.borderless_window == p_borderless) if (video_mode.borderless_window == p_borderless)
return; return;

2
platform/windows/os_windows.h
View File

@ -210,7 +210,7 @@ public:
virtual bool is_window_maximized() const; virtual bool is_window_maximized() const;
virtual void request_attention(); virtual void request_attention();
virtual void set_borderless_window(int p_borderless); virtual void set_borderless_window(bool p_borderless);
virtual bool get_borderless_window(); virtual bool get_borderless_window();
virtual Error open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path = false); virtual Error open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path = false);

2
platform/x11/os_x11.cpp
View File

@ -1098,7 +1098,7 @@ bool OS_X11::is_window_maximized() const {
return false; return false;
} }
void OS_X11::set_borderless_window(int p_borderless) { void OS_X11::set_borderless_window(bool p_borderless) {
if (current_videomode.borderless_window == p_borderless) if (current_videomode.borderless_window == p_borderless)
return; return;

2
platform/x11/os_x11.h
View File

@ -258,7 +258,7 @@ public:
virtual bool is_window_maximized() const; virtual bool is_window_maximized() const;
virtual void request_attention(); virtual void request_attention();
virtual void set_borderless_window(int p_borderless); virtual void set_borderless_window(bool p_borderless);
virtual bool get_borderless_window(); virtual bool get_borderless_window();
virtual void set_ime_position(const Point2 &p_pos); virtual void set_ime_position(const Point2 &p_pos);