Fix for displaying log window in front of the blurred background when MunkiStatus runs at/over the loginwindow

This commit is contained in:
Greg Neagle
2024-09-05 09:57:57 -07:00
parent ee5d52442b
commit 2d34cbee2c
3 changed files with 7 additions and 6 deletions
@@ -152,7 +152,7 @@
isa = PBXProject;
attributes = {
LastSwiftUpdateCheck = 0920;
LastUpgradeCheck = 1420;
LastUpgradeCheck = 1540;
ORGANIZATIONNAME = "The Munki Project";
TargetAttributes = {
C0544D4720AF0EDA00DC86F6 = {
@@ -451,7 +451,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.14;
MACOSX_DEPLOYMENT_TARGET = 10.13;
PRODUCT_BUNDLE_IDENTIFIER = com.googlecode.munki.MunkiStatus;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -475,7 +475,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.14;
MACOSX_DEPLOYMENT_TARGET = 10.13;
PRODUCT_BUNDLE_IDENTIFIER = com.googlecode.munki.MunkiStatus;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
+1 -1
View File
@@ -19,7 +19,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>6.6.0</string>
<string>6.6.1</string>
<key>CFBundleVersion</key>
<string>1</string>
<key>GitRevision</key>
@@ -112,7 +112,8 @@ class LogViewController: NSViewController {
}
if atLoginWindow() {
logWindow.canBecomeVisibleWithoutLogin = true
logWindow.level = statusWindowLevel
// make sure the log window is above the blurred background windows
logWindow.level = NSWindow.Level(rawValue: Int(CGWindowLevelForKey(.maximumWindow) + 1))
}
var windowRect = NSScreen.main!.frame
windowRect.origin.x = 100.0
@@ -125,7 +126,7 @@ class LogViewController: NSViewController {
logWindow.setFrame(windowRect, display: false)
logWindow.makeKeyAndOrderFront(self)
watchLogFile(logFileURL)
logView.setDraggingSourceOperationMask(.all, forLocal: false)
logView.setDraggingSourceOperationMask(.every, forLocal: false)
}
func watchLogFile(_ logFileURL: URL) {