mirrors/JetBrainsRuntime
1
0
Fork 0
mirror of https://github.com/JetBrains/JetBrainsRuntime.git synced 2025-12-06 09:29:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

JBR-5259: fixed Canvas mispositioning after dragging JFrame to a monitor with different scale

Browse Source 
(cherry picked from commit de62b80ef2)
This commit is contained in:
Dmitrii Morskii
2023-07-28 19:08:36 +02:00
committed by jbrbot
parent c378fc9b82
commit bf09bee70b
2 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/java.desktop/windows/native/libawt/windows/awt_Window.cpp
View File

@@ -1297,6 +1297,7 @@ void AwtWindow::WmDPIChanged(const LPARAM &lParam) {
RECT *r = (RECT *) lParam;
ReshapeNoScale(r->left, r->top, r->right - r->left, r->bottom - r->top);
CheckIfOnNewScreen(true);
WmSize(SIZENORMAL, r->right - r->left, r->bottom - r->top);
}
MsgRouting AwtWindow::WmEraseBkgnd(HDC hDC, BOOL& didErase)
@@ -1456,8 +1457,13 @@ MsgRouting AwtWindow::WmSize(UINT type, int w, int h)
if (type == SIZE_MINIMIZED) {
return mrDoDefault;
}
if (CheckIfOnNewScreenWithDifferentScale()) { // postpone if different DPI
return mrDoDefault;
}
// Check for the new screen and update the java peer
CheckIfOnNewScreen(false); // postpone if different DPI
CheckIfOnNewScreen(false);
JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
if (env->EnsureLocalCapacity(1) < 0)
@@ -1706,10 +1712,9 @@ int AwtWindow::GetScreenImOn() {
}
/*
* Check to see if we've been moved onto another screen.
* If so, update internal data, surfaces, etc.
* Check to see if we've been moved onto another screen with different scale.
*/
BOOL AwtWindow::CheckIfOnNewScreen(BOOL force) {
BOOL AwtWindow::CheckIfOnNewScreenWithDifferentScale() {
int curScrn = GetScreenImOn();
if (curScrn != m_screenNum) { // we've been moved
@@ -1719,13 +1724,29 @@ BOOL AwtWindow::CheckIfOnNewScreen(BOOL force) {
Devices::InstanceAccess devices;
AwtWin32GraphicsDevice* oldDevice = devices->GetDevice(m_screenNum);
AwtWin32GraphicsDevice* newDevice = devices->GetDevice(curScrn);
if (!force && m_winSizeMove && oldDevice && newDevice) {
if (m_winSizeMove && oldDevice && newDevice) {
if (oldDevice->GetScaleX() != newDevice->GetScaleX()
|| oldDevice->GetScaleY() != newDevice->GetScaleY()) {
|| oldDevice->GetScaleY() != newDevice->GetScaleY()) {
// scales are different, wait for WM_DPICHANGED
return TRUE;
}
}
}
return FALSE;
}
/*
* Check to see if we've been moved onto another screen.
* If so, update internal data, surfaces, etc.
*/
BOOL AwtWindow::CheckIfOnNewScreen(BOOL force) {
int curScrn = GetScreenImOn();
if (curScrn != m_screenNum) { // we've been moved
if (!force && CheckIfOnNewScreenWithDifferentScale()) {
// scales are different, wait for WM_DPICHANGED
return TRUE;
}
JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);

1
src/java.desktop/windows/native/libawt/windows/awt_Window.h
View File

@@ -129,6 +129,7 @@ public:
virtual void RedrawNonClient();
virtual int GetScreenImOn();
virtual BOOL CheckIfOnNewScreen(BOOL force);
virtual BOOL CheckIfOnNewScreenWithDifferentScale();
virtual void Grab();
virtual void Ungrab();
virtual void Ungrab(BOOL doPost);