asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #30961 from Calinou/window-size-error

Browse source 
Turn `OS.set_min/max_window_size()` warnings into errors
This commit is contained in:
Rémi Verschelde 2019-07-30 20:03:49 +02:00 committed by GitHub
commit 875075cd65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
platform/osx/os_osx.mm
View file

@ -2411,7 +2411,7 @@ Size2 OS_OSX::get_min_window_size() const {
void OS_OSX::set_min_window_size(const Size2 p_size) {
if ((p_size != Size2()) && (max_size != Size2()) && ((p_size.x > max_size.x) || (p_size.y > max_size.y))) {
WARN_PRINT("Minimum window size can't be larger than maximum window size!");
ERR_PRINT("Minimum window size can't be larger than maximum window size!");
return;
}
min_size = p_size;
@ -2427,7 +2427,7 @@ void OS_OSX::set_min_window_size(const Size2 p_size) {
void OS_OSX::set_max_window_size(const Size2 p_size) {
if ((p_size != Size2()) && ((p_size.x < min_size.x) || (p_size.y < min_size.y))) {
WARN_PRINT("Maximum window size can't be smaller than minimum window size!");
ERR_PRINT("Maximum window size can't be smaller than minimum window size!");
return;
}
max_size = p_size;

4
platform/windows/os_windows.cpp
View file

@ -1813,7 +1813,7 @@ Size2 OS_Windows::get_min_window_size() const {
void OS_Windows::set_min_window_size(const Size2 p_size) {
if ((p_size != Size2()) && (max_size != Size2()) && ((p_size.x > max_size.x) || (p_size.y > max_size.y))) {
WARN_PRINT("Minimum window size can't be larger than maximum window size!");
ERR_PRINT("Minimum window size can't be larger than maximum window size!");
return;
}
min_size = p_size;
@ -1822,7 +1822,7 @@ void OS_Windows::set_min_window_size(const Size2 p_size) {
void OS_Windows::set_max_window_size(const Size2 p_size) {
if ((p_size != Size2()) && ((p_size.x < min_size.x) || (p_size.y < min_size.y))) {
WARN_PRINT("Maximum window size can't be smaller than minimum window size!");
ERR_PRINT("Maximum window size can't be smaller than minimum window size!");
return;
}
max_size = p_size;

4
platform/x11/os_x11.cpp
View file

@ -1266,7 +1266,7 @@ Size2 OS_X11::get_min_window_size() const {
void OS_X11::set_min_window_size(const Size2 p_size) {
if ((p_size != Size2()) && (max_size != Size2()) && ((p_size.x > max_size.x) || (p_size.y > max_size.y))) {
WARN_PRINT("Minimum window size can't be larger than maximum window size!");
ERR_PRINT("Minimum window size can't be larger than maximum window size!");
return;
}
min_size = p_size;
@ -1295,7 +1295,7 @@ void OS_X11::set_min_window_size(const Size2 p_size) {
void OS_X11::set_max_window_size(const Size2 p_size) {
if ((p_size != Size2()) && ((p_size.x < min_size.x) || (p_size.y < min_size.y))) {
WARN_PRINT("Maximum window size can't be smaller than minimum window size!");
ERR_PRINT("Maximum window size can't be smaller than minimum window size!");
return;
}
max_size = p_size;