TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 08:44:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

windisplay: fix origin not respected when switching to windowed mode

Browse Source
This commit is contained in:
rdb 2022-01-12 10:23:19 +01:00
parent 14bdcf40fb
commit b518da99a6
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
panda/src/windisplay/winGraphicsWindow.cxx
View File

@ -283,6 +283,17 @@ process_events() {
*/ */
void WinGraphicsWindow:: void WinGraphicsWindow::
set_properties_now(WindowProperties &properties) { set_properties_now(WindowProperties &properties) {
if (properties.has_fullscreen() && !properties.get_fullscreen() &&
is_fullscreen()) {
if (do_windowed_switch()) {
_properties.set_fullscreen(false);
properties.clear_fullscreen();
} else {
windisplay_cat.warning()
<< "Switching to windowed mode failed!\n";
}
}
GraphicsWindow::set_properties_now(properties); GraphicsWindow::set_properties_now(properties);
if (!properties.is_any_specified()) { if (!properties.is_any_specified()) {
// The base class has already handled this case. // The base class has already handled this case.
@ -413,14 +424,6 @@ set_properties_now(WindowProperties &properties) {
windisplay_cat.warning() windisplay_cat.warning()
<< "Switching to fullscreen mode failed!\n"; << "Switching to fullscreen mode failed!\n";
} }
} else if (!properties.get_fullscreen() && is_fullscreen()){
if (do_windowed_switch()){
_properties.set_fullscreen(false);
properties.clear_fullscreen();
} else {
windisplay_cat.warning()
<< "Switching to windowed mode failed!\n";
}
} }
} }