Commit 403e241d authored by Johan McGwire's avatar Johan McGwire

Fixing BackgroundImageAlpha on multiple mechs and killing effect windows on EULAUI

parent de3ae8af
Pipeline #48193534 passed with stage
in 1 minute and 34 seconds
......@@ -178,6 +178,8 @@ class EULAUI : NSWindowController {
if error != noErr {
os_log("Got error setting authentication result", log: uiLog, type: .error)
}
backgroundWindow.close()
effectWindow.close()
NSApp.abortModal()
self.window?.close()
}
......@@ -225,7 +227,13 @@ class EULAUI : NSWindowController {
defer: true)
effectWindow.contentView = effectView
effectWindow.alphaValue = 0.8
if let backgroundImageAlpha = getManagedPreference(key: .BackgroundImageAlpha) as? Int {
effectWindow.alphaValue = CGFloat(Double(backgroundImageAlpha) * 0.1)
} else {
effectWindow.alphaValue = 0.8
}
effectWindow.orderFrontRegardless()
effectWindow.canBecomeVisibleWithoutLogin = true
}
......
......@@ -24,7 +24,7 @@
<window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" releasedWhenClosed="NO" animationBehavior="default" id="QvC-M9-y7g">
<windowStyleMask key="styleMask" titled="YES"/>
<rect key="contentRect" x="196" y="240" width="706" height="449"/>
<rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
<rect key="screenRect" x="0.0" y="0.0" width="1920" height="1057"/>
<view key="contentView" wantsLayer="YES" id="EiT-Mj-1SZ">
<rect key="frame" x="0.0" y="0.0" width="706" height="449"/>
<autoresizingMask key="autoresizingMask"/>
......
......@@ -17,7 +17,7 @@
<key>CFBundleShortVersionString</key>
<string>1.3.0</string>
<key>CFBundleVersion</key>
<string>329</string>
<string>331</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2019 Orchard &amp; Grove. All rights reserved.</string>
<key>NSPrincipalClass</key>
......
......@@ -182,7 +182,13 @@ class NoLoNotify : NSWindowController, TrackerDelegate {
defer: true)
effectWindow.contentView = effectView
effectWindow.alphaValue = 0.8
if let backgroundImageAlpha = getManagedPreference(key: .BackgroundImageAlpha) as? Int {
effectWindow.alphaValue = CGFloat(Double(backgroundImageAlpha) * 0.1)
} else {
effectWindow.alphaValue = 0.8
}
effectWindow.orderFrontRegardless()
effectWindow.canBecomeVisibleWithoutLogin = true
}
......
......@@ -99,33 +99,7 @@ class SignIn: NSWindowController {
effectWindow.contentView = effectView
if let backgroundImageAlpha = getManagedPreference(key: .BackgroundImageAlpha) as? Int {
switch backgroundImageAlpha {
case 0 :
effectWindow.alphaValue = 0.0
case 1 :
effectWindow.alphaValue = 0.1
case 2 :
effectWindow.alphaValue = 0.2
case 3 :
effectWindow.alphaValue = 0.3
case 4 :
effectWindow.alphaValue = 0.4
case 5 :
effectWindow.alphaValue = 0.5
case 6 :
effectWindow.alphaValue = 0.6
case 7 :
effectWindow.alphaValue = 0.7
case 8 :
effectWindow.alphaValue = 0.8
case 9 :
effectWindow.alphaValue = 0.9
case 10 :
effectWindow.alphaValue = 1.0
default :
effectWindow.alphaValue = 1.0
}
effectWindow.alphaValue = CGFloat(Double(backgroundImageAlpha) * 0.1)
} else {
effectWindow.alphaValue = 0.8
}
......
......@@ -27,7 +27,7 @@
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" titlebarAppearsTransparent="YES" id="F0z-JX-Cv5" customClass="NoLoWindow" customModule="NoMADLoginAD" customModuleProvider="target">
<rect key="contentRect" x="276" y="219" width="521" height="511"/>
<rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
<rect key="screenRect" x="0.0" y="0.0" width="1920" height="1057"/>
<view key="contentView" wantsLayer="YES" id="se5-gp-TjO">
<rect key="frame" x="0.0" y="0.0" width="521" height="511"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
......
......@@ -262,7 +262,13 @@ class UserInputUI : NSWindowController {
defer: true)
effectWindow.contentView = effectView
effectWindow.alphaValue = 0.8
if let backgroundImageAlpha = getManagedPreference(key: .BackgroundImageAlpha) as? Int {
effectWindow.alphaValue = CGFloat(Double(backgroundImageAlpha) * 0.1)
} else {
effectWindow.alphaValue = 0.8
}
effectWindow.orderFrontRegardless()
effectWindow.canBecomeVisibleWithoutLogin = true
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment