Cleanup from mac attempts

This commit is contained in:
Firerise9402 2023-08-14 16:49:47 -04:00
parent ae708d7430
commit 859d10e0f1

View file

@ -12,10 +12,6 @@ using System;
using System.Runtime.InteropServices;
/*#if UNITY_STANDALONE_OSX
using AppKit;
using Foundation;
#endif*/
@ -98,26 +94,6 @@ namespace HeavenStudio
System.IntPtr HWND_TOP = new System.IntPtr(0);
System.IntPtr HWND_TOPMOST = new System.IntPtr(-1);
System.IntPtr HWND_NOTOPMOST = new System.IntPtr(-2);
/*#elif UNITY_STANDALONE_OSX
NSWindow _window;
var style = NSWindowStyle.Closable | NSWindowStyle.Resizable | NSWindowStyle.tilted;
public void SetWindowPos(double x, double y, double cX, double cY)
{
_window = new NSWindow(
new CoreGraphics.CGRect(x, Screen.mainWindowDisplayInfo.height - y, cx, cy),
style,
NSBackingStore.Buffered,
false
);
}
public override NSWindow mainWindowDisplayInfo
{
get { return _window; }
}*/
#endif
@ -128,8 +104,6 @@ namespace HeavenStudio
if(Application.isEditor || !Editor.Editor.instance.fullscreen) return;
#if UNITY_STANDALONE_WIN
SetWindowPos(ptr, HWND_NOTOPMOST, x, y, resX, resY, SWP_SHOWWINDOW);
//#elif UNITY_STANDALONE_OSX
//SetWindowPos(x, y, resX, resY);
#endif
}
@ -191,10 +165,7 @@ namespace HeavenStudio
#if UNITY_STANDALONE_WIN
SetPosition(hWnd, Convert.ToInt16(pan.x), Convert.ToInt16(pan.y), Convert.ToInt16(scale.x), Convert.ToInt16(scale.y));
#elif UNITY_STANDALONE_OSX
//SetPosition(pan.x, pan.y, scale.x, scale.y);
#endif
//SetPosition(hWnd, Convert.ToInt16(pan.x + shakeResult.x), Convert.ToInt16(pan.y + shakeResult.y), Convert.ToInt16(scale.x), Convert.ToInt16(scale.y));
}
private void UpdatePan()
@ -306,8 +277,6 @@ namespace HeavenStudio
if(Application.isEditor) return;
#if UNITY_STANDALONE_WIN
SetWindowPos(hWnd, HWND_NOTOPMOST, Convert.ToInt16(pan.x), Convert.ToInt16(pan.y), Convert.ToInt16(scale.x), Convert.ToInt16(scale.y), SWP_SHOWWINDOW);
#elif UNITY_STANDALONE_OSX
//SetWindowPos(pan.x, pan.y, scale.x, scale.y);
#endif
}
}