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-2971 Log more information about window creation and property changes

Browse Source 
(cherry picked from commit 9d86b4d235)
(cherry picked from commit e93eeba9c2)
This commit is contained in:
Dmitry Batrak
2020-12-21 13:05:38 +03:00
committed by jbrbot
parent 1e8bf0e7dd
commit 1e26bf527a
1 changed files with 38 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
View File

@@ -364,17 +364,32 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
if (owner != null) {
hasOwnerPtr = 0L != owner.executeGet(ownerPtr -> {
ref.set(nativeCreateNSWindow(viewPtr, ownerPtr, styleBits,
bounds.x, bounds.y,
bounds.width, bounds.height));
if (logger.isLoggable(PlatformLogger.Level.FINE)) {
logger.fine("nativeCreateNSWindow: owner=" + Long.toHexString(ownerPtr)
+ ", styleBits=" + Integer.toHexString(styleBits)
+ ", bounds=" + bounds);
}
long windowPtr = nativeCreateNSWindow(viewPtr, ownerPtr, styleBits,
bounds.x, bounds.y, bounds.width, bounds.height);
if (logger.isLoggable(PlatformLogger.Level.FINE)) {
logger.fine("window created: " + Long.toHexString(windowPtr));
}
ref.set(windowPtr);
return 1;
});
}
if (!hasOwnerPtr) {
ref.set(nativeCreateNSWindow(viewPtr, 0,
styleBits, bounds.x, bounds.y,
bounds.width, bounds.height));
if (logger.isLoggable(PlatformLogger.Level.FINE)) {
logger.fine("nativeCreateNSWindow: styleBits=" + Integer.toHexString(styleBits)
+ ", bounds=" + bounds);
}
long windowPtr = nativeCreateNSWindow(viewPtr, 0, styleBits,
bounds.x, bounds.y, bounds.width, bounds.height);
if (logger.isLoggable(PlatformLogger.Level.FINE)) {
logger.fine("window created: " + Long.toHexString(windowPtr));
}
ref.set(windowPtr);
}
});
return ref.get();
@@ -559,7 +574,13 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
// this is the counter-point to -[CWindow _nativeSetStyleBit:]
private void setStyleBits(final int mask, final int value) {
execute(ptr -> nativeSetNSWindowStyleBits(ptr, mask, value));
execute(ptr -> {
if (logger.isLoggable(PlatformLogger.Level.FINE)) {
logger.fine("nativeSetNSWindowStyleBits: window=" + Long.toHexString(ptr)
+ ", mask=" + Integer.toHexString(mask) + ", value=" + Integer.toHexString(value));
}
nativeSetNSWindowStyleBits(ptr, mask, value);
});
}
private native void _toggleFullScreenMode(final long model);
@@ -747,6 +768,7 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
boolean isKeyWindow = CWrapper.NSWindow.isKeyWindow(ptr);
if (!isKeyWindow) {
logger.fine("setVisible: makeKeyWindow");
CWrapper.NSWindow.makeKeyWindow(ptr);
}
@@ -1075,7 +1097,12 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
execute(ptr -> nativeSynthesizeMouseEnteredExitedEvents(ptr, CocoaConstants.NSEventTypeMouseExited));
}
execute(ptr -> nativeSetEnabled(ptr, !blocked));
execute(ptr -> {
if (logger.isLoggable(PlatformLogger.Level.FINE)) {
logger.fine("nativeSetEnabled: window=" + Long.toHexString(ptr) + ", enabled=" + !blocked);
}
nativeSetEnabled(ptr, !blocked);
});
Window currFocus = LWKeyboardFocusManagerPeer.getInstance().getCurrentFocusedWindow();
if (!blocked && (target == currFocus)) {
@@ -1266,6 +1293,9 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo
pWindow.orderAboveSiblings();
pWindow.execute(ptr -> {
if (logger.isLoggable(PlatformLogger.Level.FINE)) {
logger.fine("Focus blocker " + Long.toHexString(ptr));
}
CWrapper.NSWindow.orderFrontRegardless(ptr);
CWrapper.NSWindow.makeKeyAndOrderFront(ptr);
CWrapper.NSWindow.makeMainWindow(ptr);