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

Mac側プラグインも名称変更。

Browse Source
This commit is contained in:
Kirurobo
2020-12-10 15:43:25 +09:00
parent 85500affdf
commit ac73bee6db
7 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -290,7 +290,7 @@
"@loader_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = 0.7.1;
MARKETING_VERSION = 0.7.2;
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.7.1;
MARKETING_VERSION = 0.7.2;
PRODUCT_BUNDLE_IDENTIFIER = com.kirurobo.libuniwinc;
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;

8
Xcode/LibUniWinC/LibUniWinC.mm
View File

@@ -104,12 +104,12 @@ UNIWINC_EXPORT BOOL GetMonitorRectangle(SInt32 monitorIndex, Float32* x, Float32
return [LibUniWinC getMonitorRectangleWithMonitorIndex:monitorIndex x:x y:y width:width height:height];
}
UNIWINC_EXPORT BOOL RegisterDisplayChangedCallback(IntCallback callback) {
return [LibUniWinC registerDisplayChangedCallbackWithCallback: callback];
UNIWINC_EXPORT BOOL RegisterMonitorChangedCallback(IntCallback callback) {
return [LibUniWinC registerMonitorChangedCallbackWithCallback: callback];
}
UNIWINC_EXPORT BOOL UnregisterDisplayChangedCallback() {
return [LibUniWinC unregisterDisplayChangedCallback];
UNIWINC_EXPORT BOOL UnregisterMonitorChangedCallback() {
return [LibUniWinC unregisterMonitorChangedCallback];
}
UNIWINC_EXPORT BOOL SetAllowDrop(BOOL enabled) {

18
Xcode/LibUniWinC/LibUniWinC.swift
View File

@@ -110,7 +110,7 @@ public class LibUniWinC : NSObject {
public typealias stringCallback = (@convention(c) (UnsafeRawPointer) -> Void)
public typealias intCallback = (@convention(c) (Int32) -> Void)
public static var dropFilesCallback: stringCallback? = nil
public static var displayChangedCallback: intCallback? = nil
public static var monitorChangedCallback: intCallback? = nil
/// Sub view to implement file dropping
private static var overlayView: OverlayView? = nil
@@ -167,7 +167,7 @@ public class LibUniWinC : NSObject {
object: NSApplication.shared,
queue: OperationQueue.main
) {
notification -> Void in _onDisplayChanged()
notification -> Void in _onMonitorChanged()
}
// Flag as initialized
@@ -175,12 +175,12 @@ public class LibUniWinC : NSObject {
}
/// Called when screen parameeters changed
private static func _onDisplayChanged() -> Void {
private static func _onMonitorChanged() -> Void {
_updateScreenInfo()
// Run callback
let count = getMonitorCount()
displayChangedCallback?(count)
monitorChangedCallback?(count)
}
/// Retrieve current monitor settings
@@ -542,7 +542,7 @@ public class LibUniWinC : NSObject {
}
// MARK: - Display Info.
// MARK: - Monitor Info.
/// 現在有効な画面数を取得
/// - Returns: 画面数
@@ -620,13 +620,13 @@ public class LibUniWinC : NSObject {
}
@objc public static func registerDisplayChangedCallback(callback: @escaping intCallback) -> Bool {
displayChangedCallback = callback
@objc public static func registerMonitorChangedCallback(callback: @escaping intCallback) -> Bool {
monitorChangedCallback = callback
return true
}
@objc public static func unregisterDisplayChangedCallback() -> Bool {
displayChangedCallback = nil
@objc public static func unregisterMonitorChangedCallback() -> Bool {
monitorChangedCallback = nil
return true
}