فهرست منبع

Fix type mismatch in OS::set_borderless_window

Closes #14663.
Rémi Verschelde 7 سال پیش
والد
کامیت
fb84b49d87
7فایلهای تغییر یافته به همراه7 افزوده شده و 8 حذف شده
  1. 1 1
      core/os/os.h
  2. 1 1
      platform/osx/os_osx.h
  3. 1 2
      platform/osx/os_osx.mm
  4. 1 1
      platform/windows/os_windows.cpp
  5. 1 1
      platform/windows/os_windows.h
  6. 1 1
      platform/x11/os_x11.cpp
  7. 1 1
      platform/x11/os_x11.h

+ 1 - 1
core/os/os.h

@@ -191,7 +191,7 @@ public:
 	virtual bool is_window_maximized() const { return true; }
 	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 void set_ime_position(const Point2 &p_pos) {}

+ 1 - 1
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);

+ 1 - 2
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() {

+ 1 - 1
platform/windows/os_windows.cpp

@@ -1598,7 +1598,7 @@ bool OS_Windows::is_window_maximized() const {
 	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)
 		return;
 

+ 1 - 1
platform/windows/os_windows.h

@@ -210,7 +210,7 @@ public:
 	virtual bool is_window_maximized() const;
 	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 Error open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path = false);

+ 1 - 1
platform/x11/os_x11.cpp

@@ -1098,7 +1098,7 @@ bool OS_X11::is_window_maximized() const {
 	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)
 		return;

+ 1 - 1
platform/x11/os_x11.h

@@ -258,7 +258,7 @@ public:
 	virtual bool is_window_maximized() const;
 	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 void set_ime_position(const Point2 &p_pos);