TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 02:42:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug on Windows when resizing windows in any way other than dragging them

Browse Source
This commit is contained in:
rdb 2014-09-15 16:46:28 +00:00
parent 9184fe71a9
commit e5ec2eaf50
2 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,7 +94,6 @@ WinGraphicsWindow(GraphicsEngine *engine, GraphicsPipe *pipe,
_ime_open = false; _ime_open = false;
_ime_active = false; _ime_active = false;
_tracking_mouse_leaving = false; _tracking_mouse_leaving = false;
_maximized = false;
_cursor = 0; _cursor = 0;
_lost_keypresses = false; _lost_keypresses = false;
_lshift_down = false; _lshift_down = false;
@ -1469,7 +1468,7 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
// When a fullscreen window goes inactive, it automatically // When a fullscreen window goes inactive, it automatically
// gets minimized. // gets minimized.
properties.set_minimized(true); properties.set_minimized(true);
// It seems order is important here. We must minimize the // It seems order is important here. We must minimize the
// window before restoring the display settings, or risk // window before restoring the display settings, or risk
// losing the graphics context. // losing the graphics context.
@ -1483,31 +1482,18 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
adjust_z_order(); adjust_z_order();
system_changed_properties(properties); system_changed_properties(properties);
break; break;
case WM_SIZE: case WM_SIZE:
if (windisplay_cat.is_debug()) { if (windisplay_cat.is_debug()) {
windisplay_cat.debug() windisplay_cat.debug()
<< "WM_SIZE: " << hwnd << ", " << wparam << "\n"; << "WM_SIZE: " << hwnd << ", " << wparam << "\n";
} }
// for maximized, unmaximize, need to call resize code
// artificially since no WM_EXITSIZEMOVE is generated. handle_reshape();
if (wparam == SIZE_MAXIMIZED) {
_maximized = true;
handle_reshape();
} else if (wparam == SIZE_RESTORED && _maximized) {
// SIZE_RESTORED might mean we restored to its original size
// before the maximize, but it might also be called while the
// user is resizing the window by hand. Checking the _maximized
// flag that we set above allows us to differentiate the two
// cases.
_maximized = false;
handle_reshape();
}
break; break;
case WM_EXITSIZEMOVE: case WM_EXITSIZEMOVE:
handle_reshape(); //handle_reshape();
break; break;
case WM_WINDOWPOSCHANGED: case WM_WINDOWPOSCHANGED:
@ -1526,7 +1512,7 @@ window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
_got_expose_event = true; _got_expose_event = true;
} }
break; break;
case WM_LBUTTONDOWN: case WM_LBUTTONDOWN:
if (_lost_keypresses) { if (_lost_keypresses) {
resend_lost_keypresses(); resend_lost_keypresses();

1
panda/src/windisplay/winGraphicsWindow.h
View File

@ -160,7 +160,6 @@ private:
bool _ime_open; bool _ime_open;
bool _ime_active; bool _ime_active;
bool _tracking_mouse_leaving; bool _tracking_mouse_leaving;
bool _maximized;
bool _bCursor_in_WindowClientArea; bool _bCursor_in_WindowClientArea;
HANDLE _input_device_handle[32]; HANDLE _input_device_handle[32];
HCURSOR _cursor; HCURSOR _cursor;