Merge pull request #97 from kirurobo/dev_mac

Added free positioning for macOS

Author: kirurobo

UniWinC/.gitignore

@@ -35,6 +35,7 @@ ExportedObj/
 *.csproj
 *.unityproj
 *.sln
+*.slnx
 *.suo
 *.tmp
 *.user

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

@@ -81,10 +81,14 @@ protected class LibUniWinC
             [return: MarshalAs(UnmanagedType.Bool)]
             public static extern bool IsBottommost();
 
-            [DllImport("LibUniWinC",CallingConvention=CallingConvention.Winapi)]
+            [DllImport("LibUniWinC", CallingConvention=CallingConvention.Winapi)]
             [return: MarshalAs(UnmanagedType.Bool)]
             public static extern bool IsMaximized();
 
+            [DllImport("LibUniWinC", CallingConvention=CallingConvention.Winapi)]
+            [return: MarshalAs(UnmanagedType.Bool)]
+            public static extern bool IsFreePositioningEnabled();
+            
             [DllImport("LibUniWinC",CallingConvention=CallingConvention.Winapi)]
             [return: MarshalAs(UnmanagedType.Bool)]
             public static extern bool AttachMyWindow();
@@ -122,8 +126,11 @@ protected class LibUniWinC
             [DllImport("LibUniWinC",CallingConvention=CallingConvention.Winapi)]
             public static extern void SetBottommost([MarshalAs(UnmanagedType.U1)] bool bEnabled);
 
-            [DllImport("LibUniWinC",CallingConvention=CallingConvention.Winapi)]
+            [DllImport("LibUniWinC", CallingConvention = CallingConvention.Winapi)]
             public static extern void SetMaximized([MarshalAs(UnmanagedType.U1)] bool bZoomed);
+            
+            [DllImport("LibUniWinC", CallingConvention = CallingConvention.Winapi)]
+            public static extern void EnableFreePositioning([MarshalAs(UnmanagedType.U1)] bool bEnabled);
 
             [DllImport("LibUniWinC",CallingConvention=CallingConvention.Winapi)]
             public static extern void SetPosition(float x, float y);
@@ -267,6 +274,18 @@ public static EditorWindow GetGameView()
         public bool IsClickThrough { get { return (IsActive && _isClickThrough); } }
         private bool _isClickThrough = false;
 
+        /// <summary>
+        /// Determines whether the attached window is borderless (no title bar and borders)
+        /// </summary>
+        public bool IsBorderless { get { return (IsActive && _isBorderless); } }
+        private bool _isBorderless = false;
+
+        /// <summary>
+        /// Determines whether the attached window can be freely positioned (macOS only)
+        /// </summary>
+        public bool IsFreePositioningEnabled { get { return (IsActive && _isFreePositioningEnabled); } }
+        private bool _isFreePositioningEnabled = false;
+
         /// <summary>
         /// Type of transparent method for Windows
         /// </summary>
@@ -789,9 +808,21 @@ public void SetKeyColor(Color32 color)
             LibUniWinC.SetKeyColor((UInt32)(color.b * 0x10000 + color.g * 0x100 + color.r));
             keyColor = color;
         }
-#endregion
+        #endregion
+
+        #region for macOS only
+        /// <summary>
+        /// ウィンドウの自由配置を設定／解除（macOSのみ対応）
+        /// </summary>
+        /// <param name="enabled"></param>
+        public void EnableFreePositioning(bool enabled)
+        {
+            LibUniWinC.EnableFreePositioning(enabled);
+            _isFreePositioningEnabled = LibUniWinC.IsFreePositioningEnabled();
+        }
+        #endregion
 
-#region About monitors
+        #region About monitors
         /// <summary>
         /// Get the monitor index where the window is located
         /// </summary>

UniWinC/Assets/Kirurobo/UniWindowController/Runtime/Plugins/Windows/x64/LibUniWinC.dll

@@ -276,7 +276,20 @@ public bool allowDropFiles
         /// </summary>
         [Tooltip("Will be used the next time the window becomes transparent")]
         public Color32 keyColor = new Color32(0x01, 0x00, 0x01, 0x00);
-        
+
+        /// <summary>
+        /// macOSで、メニューバーより上にウィンドウを配置できるようにするか
+        /// </summary>
+        public bool isFreePositioningEnabled
+        {
+            get { return ((_uniWinCore == null) ? _isFreePositioningEnabled : _isFreePositioningEnabled = _uniWinCore.IsFreePositioningEnabled); }
+            set { SetFreePositioning(value); }
+        }
+        [Header("For macOS only")]
+        [Tooltip("Disable constrainFrameRect() *Only available on macOS")]
+        [SerializeField, EditableProperty]
+        private bool _isFreePositioningEnabled = false;
+
         /// <summary>
         /// Is the mouse pointer on an opaque pixel or an object
         /// </summary>
@@ -868,6 +881,7 @@ private void UpdateTargetWindow()
                     SetZoomed(_isZoomed);
                     SetClickThrough(_isClickThrough);
                     SetAllowDrop(_allowDropFiles);
+                    SetFreePositioning(_isFreePositioningEnabled);
 
                     // ウィンドウ取得時にはモニタ変更と同等の処理を行う
                     OnMonitorChanged?.Invoke();
@@ -1034,6 +1048,17 @@ private void SetAllowDrop(bool enabled)
             _allowDropFiles = enabled;
         }
 
+        /// <summary>
+        /// macOSで、メニューバーより上を含む自由な位置ウィンドウを配置できるようにする
+        /// </summary>
+        /// <param name="enabled"></param>
+        private void SetFreePositioning(bool enabled)
+        {
+            if (_uniWinCore == null) return;
+
+            _uniWinCore.EnableFreePositioning(enabled);
+            _isFreePositioningEnabled = _uniWinCore.IsFreePositioningEnabled;
+        }
 
         /// <summary>
         /// Get the number of connected monitors

UniWinC/Assets/Kirurobo/UniWindowController/Runtime/Plugins/Windows/x86/LibUniWinC.dll

@@ -38,7 +38,6 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &4
 LightmapSettings:
@@ -467,6 +466,7 @@ MonoBehaviour:
   m_DeselectOnBackgroundClick: 1
   m_PointerBehavior: 0
   m_CursorLockBehavior: 0
+  m_ScrollDeltaPerTick: 6
 --- !u!114 &305005405 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 7299255619972666376, guid: 38b9db02f63429f49bd117e7f988d985,
@@ -1396,6 +1396,11 @@ PrefabInstance:
       propertyPath: _isTransparent
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 2416199871598626845, guid: e893aefd93740714b999573b02916984,
+        type: 3}
+      propertyPath: _isFreePositioningEnabled
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents:
     - {fileID: 2416199871598626843, guid: e893aefd93740714b999573b02916984, type: 3}
     m_RemovedGameObjects: []

UniWinC/Assets/Kirurobo/UniWindowController/Runtime/Scripts/LowLevel/UniWinCore.cs

@@ -233,6 +233,12 @@ private void Update()
                 {
                     uniwinc.isZoomed = !uniwinc.isZoomed;
                 }
+
+                // Toggle free positioning
+                if (InputProxy.GetKeyUp("p"))
+                {
+                    uniwinc.isFreePositioningEnabled = !uniwinc.isFreePositioningEnabled;
+                }
             }
 
 

UniWinC/Assets/Kirurobo/UniWindowController/Runtime/Scripts/UniWindowController.cs

@@ -5,19 +5,19 @@ EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Scenes:
-  - enabled: 1
+  - enabled: 0
     path: Assets/Kirurobo/UniWindowController/Samples/00_Menu/SampleMenu.unity
     guid: bca881472b6085049ad37ab0ad8fe61e
-  - enabled: 1
+  - enabled: 0
     path: Assets/Kirurobo/UniWindowController/Samples/01_SimpleSample/SimpleSample.unity
     guid: b650a883366376446b7db29169c59420
   - enabled: 1
     path: Assets/Kirurobo/UniWindowController/Samples/02_UiSample/UiSample.unity
     guid: c4f4adeee10bff845b320d93a6b82f54
-  - enabled: 1
+  - enabled: 0
     path: Assets/Kirurobo/UniWindowController/Samples/03_Fullscreen/FullscreenSample.unity
     guid: cc8dc9342a8c4436397f75a2389ffc1a
-  - enabled: 1
+  - enabled: 0
     path: Assets/Kirurobo/UniWindowController/Samples/04_FileDialog/FileDialogSample.unity
     guid: 48a0f5141a4d64ffd86a58d24b841e0c
   m_configObjects:

UniWinC/Assets/Kirurobo/UniWindowController/Samples/02_UiSample/UiSample.unity

@@ -17,7 +17,7 @@ PlayerSettings:
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
-  m_ShowUnitySplashScreen: 1
+  m_ShowUnitySplashScreen: 0
   m_ShowUnitySplashLogo: 1
   m_SplashScreenOverlayOpacity: 1
   m_SplashScreenAnimation: 1
@@ -77,13 +77,15 @@ PlayerSettings:
   androidMinimumWindowHeight: 300
   androidFullscreenMode: 1
   androidAutoRotationBehavior: 1
+  androidPredictiveBackSupport: 1
   defaultIsNativeResolution: 1
   macRetinaSupport: 1
   runInBackground: 1
   captureSingleScreen: 0
   muteOtherAudioSources: 0
   Prepare IOS For Recording: 0
   Force IOS Speakers When Recording: 0
+  audioSpatialExperience: 0
   deferSystemGesturesMode: 0
   hideHomeButton: 0
   submitAnalytics: 1
@@ -139,8 +141,9 @@ PlayerSettings:
   loadStoreDebugModeEnabled: 0
   visionOSBundleVersion: 1.0
   tvOSBundleVersion: 1.0
-  bundleVersion: 0.9.7
-  preloadedAssets: []
+  bundleVersion: 0.9.8
+  preloadedAssets:
+  - {fileID: 11400000, guid: dc660a2a123d34488abe1d07904475f4, type: 2}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1
@@ -185,8 +188,10 @@ PlayerSettings:
   strictShaderVariantMatching: 0
   VertexChannelCompressionMask: 4054
   iPhoneSdkVersion: 988
+  iOSSimulatorArchitecture: 0
   iOSTargetOSVersionString: 12.0
   tvOSSdkVersion: 0
+  tvOSSimulatorArchitecture: 0
   tvOSRequireExtendedGameController: 0
   tvOSTargetOSVersionString: 12.0
   VisionOSSdkVersion: 0
@@ -233,6 +238,7 @@ PlayerSettings:
   iOSMetalForceHardShadows: 0
   metalEditorSupport: 1
   metalAPIValidation: 1
+  metalCompileShaderBinary: 0
   iOSRenderExtraFrameOnPause: 0
   iosCopyPluginsCodeInsteadOfSymlink: 0
   appleDeveloperTeamID: 
@@ -530,6 +536,7 @@ PlayerSettings:
   switchSocketBufferEfficiency: 4
   switchSocketInitializeEnabled: 1
   switchNetworkInterfaceManagerInitializeEnabled: 1
+  switchDisableHTCSPlayerConnection: 0
   switchUseNewStyleFilepaths: 0
   switchUseLegacyFmodPriorities: 0
   switchUseMicroSleepForYield: 1
@@ -696,6 +703,7 @@ PlayerSettings:
   metroSplashScreenBackgroundColor: {r: 0.12941177, g: 0.17254902, b: 0.21568628,
     a: 1}
   metroSplashScreenUseBackgroundColor: 0
+  syncCapabilities: 0
   platformCapabilities: {}
   metroTargetDeviceFamilies: {}
   metroFTAName: