LiRuochen_WorkFlow/UniWindow-Controller
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added setAlphaValue(). Incremented the version number to v0.8.3.

Browse Source
This commit is contained in:
Kirurobo
2021-10-25 15:04:37 +09:00
parent fb8bcb3876
commit 44ed01482f
5 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
UniWinC/Assets/Kirurobo/UniWindowController/Runtime/Plugins/MacOS/LibUniWinC.bundle/Contents/Info.plist
View File

@@ -17,7 +17,7 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
<string>0.8.2</string>
<string>0.8.3</string>
<key>CFBundleSupportedPlatforms</key>
<array>
<string>MacOSX</string>

BIN
UniWinC/Assets/Kirurobo/UniWindowController/Runtime/Plugins/MacOS/LibUniWinC.bundle/Contents/MacOS/LibUniWinC
View File

Binary file not shown.

4
Xcode/LibUniWinC.xcodeproj/project.pbxproj
View File

@@ -290,7 +290,7 @@
"@loader_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = 0.8.2;
MARKETING_VERSION = 0.8.3;
PRODUCT_BUNDLE_IDENTIFIER = com.kirurobo.libuniwinc;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
@@ -318,7 +318,7 @@
"@loader_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = 0.8.2;
MARKETING_VERSION = 0.8.3;
PRODUCT_BUNDLE_IDENTIFIER = com.kirurobo.libuniwinc;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;

4
Xcode/LibUniWinC/LibUniWinC.mm
View File

@@ -162,6 +162,10 @@ UNIWINC_EXPORT void SetKeyColor(SInt32 color) {
[LibUniWinC setKeyColorWithColor: color];
}
UNIWINC_EXPORT void SetWindowAlpha(Float32 alpha) {
[LibUniWinC setAlphaValueWithAlpha: alpha];
}
// Call periodically to maintain window state.
UNIWINC_EXPORT void Update() {
[LibUniWinC update];

14
Xcode/LibUniWinC/LibUniWinC.swift
View File

@@ -31,6 +31,7 @@ public class LibUniWinC : NSObject {
public var isBottommost: Bool = false
public var isBorderless: Bool = false
public var isTransparent: Bool = false
public var alphaValue: Float32 = 1
// サイズ変更がなされると不正確となる。透過時にこれを使う
public var isZoomed: Bool = false
@@ -91,6 +92,7 @@ public class LibUniWinC : NSObject {
public var isOpaque: Bool = true
public var hasShadow: Bool = true
public var isKeyWindow: Bool = true
public var alphaValue: CGFloat = 1
public var contentViewWantsLayer: Bool = true
public var contentViewLayerIsOpaque: Bool = true
public var contentViewLayerBackgroundColor: CGColor? = CGColor.clear
@@ -107,6 +109,7 @@ public class LibUniWinC : NSObject {
self.isOpaque = window.isOpaque
self.hasShadow = window.hasShadow
self.isKeyWindow = window.isKeyWindow
self.alphaValue = window.alphaValue
if let view = window.contentView {
self.contentViewWantsLayer = view.wantsLayer
@@ -127,6 +130,7 @@ public class LibUniWinC : NSObject {
window.backgroundColor = self.backgroundColor
window.isOpaque = self.isOpaque
window.hasShadow = self.hasShadow
window.alphaValue = self.alphaValue
window.contentView?.wantsLayer = self.contentViewWantsLayer
window.contentView?.layer?.isOpaque = self.contentViewLayerIsOpaque
@@ -461,6 +465,7 @@ public class LibUniWinC : NSObject {
setBorderless(isBorderless: state.isBorderless)
setTransparent(isTransparent: state.isTransparent)
setMaximized(isZoomed: state.isZoomed)
setAlphaValue(alpha: state.alphaValue)
}
}
@@ -562,6 +567,15 @@ public class LibUniWinC : NSObject {
/// - Parameter color: 透過する色
@objc public static func setKeyColor(color: Int32) -> Void {
}
/// Sets window alpha value
/// - Parameter alpha: 0.0 - 1.0
@objc public static func setAlphaValue(alpha: Float32) -> Void {
if let window: NSWindow = targetWindow {
window.alphaValue = CGFloat(alpha)
}
state.alphaValue = alpha
}
/// ウィンドウ透過を有効化／無効化
/// - Parameter isTransparent: trueなら透過ウィンドウにする