From d50fea39c6bac04e9144a325ce382770039c76ab Mon Sep 17 00:00:00 2001
From: Akop Karapetyan <dev@akop.org>
Date: Wed, 11 Dec 2019 22:34:36 -0800
Subject: [PATCH] Moved FBScreenView to Views/

---
 .../xcode/Emulator.xcodeproj/project.pbxproj  |  4 +--
 .../xcode/Emulator/Views/FBScreenView.h       | 35 +++++++++++++++++++
 .../xcode/Emulator/Views}/FBScreenView.mm     | 17 ++++++---
 src/intf/video/macos/FBScreenView.h           | 28 ---------------
 4 files changed, 49 insertions(+), 35 deletions(-)
 create mode 100644 projectfiles/xcode/Emulator/Views/FBScreenView.h
 rename {src/intf/video/macos => projectfiles/xcode/Emulator/Views}/FBScreenView.mm (95%)
 delete mode 100644 src/intf/video/macos/FBScreenView.h

diff --git a/projectfiles/xcode/Emulator.xcodeproj/project.pbxproj b/projectfiles/xcode/Emulator.xcodeproj/project.pbxproj
index 77b37bf63..45202a066 100644
--- a/projectfiles/xcode/Emulator.xcodeproj/project.pbxproj
+++ b/projectfiles/xcode/Emulator.xcodeproj/project.pbxproj
@@ -2574,6 +2574,8 @@
 				FE0A7EA32394ED91001E6997 /* FBDropFileScrollView.m */,
 				FE0A7EA02394B87B001E6997 /* FBRomSetStatusAsNSImage.h */,
 				FE0A7E9F2394B87B001E6997 /* FBRomSetStatusAsNSImage.m */,
+				FEC5D3D7235C160600ABA9FB /* FBScreenView.h */,
+				FEC5D3D8235C160600ABA9FB /* FBScreenView.mm */,
 			);
 			path = Views;
 			sourceTree = "<group>";
@@ -4722,8 +4724,6 @@
 		FEA5E7982356472200DA2D9D /* macos */ = {
 			isa = PBXGroup;
 			children = (
-				FEC5D3D7235C160600ABA9FB /* FBScreenView.h */,
-				FEC5D3D8235C160600ABA9FB /* FBScreenView.mm */,
 				FEC5D3D4235C136E00ABA9FB /* FBVideo.h */,
 				FEC5D3D5235C136F00ABA9FB /* FBVideo.mm */,
 			);
diff --git a/projectfiles/xcode/Emulator/Views/FBScreenView.h b/projectfiles/xcode/Emulator/Views/FBScreenView.h
new file mode 100644
index 000000000..6665215ab
--- /dev/null
+++ b/projectfiles/xcode/Emulator/Views/FBScreenView.h
@@ -0,0 +1,35 @@
+// Copyright (c) Akop Karapetyan
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#import <Cocoa/Cocoa.h>
+
+#import "FBVideo.h"
+
+@protocol FBScreenViewDelegate<NSObject>
+
+@optional
+- (void) mouseDidIdle;
+- (void) mouseStateDidChange;
+- (void) mouseDidMove:(NSPoint) point;
+- (void) mouseButtonStateDidChange:(NSEvent *) event;
+
+@end
+
+@interface FBScreenView : NSOpenGLView<FBVideoDelegate>
+
+- (NSSize) screenSize;
+
+@property (nonatomic, weak) id<FBScreenViewDelegate> delegate;
+
+@end
diff --git a/src/intf/video/macos/FBScreenView.mm b/projectfiles/xcode/Emulator/Views/FBScreenView.mm
similarity index 95%
rename from src/intf/video/macos/FBScreenView.mm
rename to projectfiles/xcode/Emulator/Views/FBScreenView.mm
index 91a075212..ae647d9a9 100644
--- a/src/intf/video/macos/FBScreenView.mm
+++ b/projectfiles/xcode/Emulator/Views/FBScreenView.mm
@@ -1,9 +1,16 @@
-// Portions from FinalBurn X: Port of FinalBurn to OS X
-//   https://github.com/0xe1f/FinalBurn-X
+// Copyright (c) Akop Karapetyan
 //
-// Copyright (C) Akop Karapetyan
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   http://www.apache.org/licenses/LICENSE-2.0
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
 #include <OpenGL/gl.h>
 #include <time.h>
diff --git a/src/intf/video/macos/FBScreenView.h b/src/intf/video/macos/FBScreenView.h
deleted file mode 100644
index 4205f7a4e..000000000
--- a/src/intf/video/macos/FBScreenView.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Portions from FinalBurn X: Port of FinalBurn to OS X
-//   https://github.com/0xe1f/FinalBurn-X
-//
-// Copyright (C) Akop Karapetyan
-//   Licensed under the Apache License, Version 2.0 (the "License");
-//   http://www.apache.org/licenses/LICENSE-2.0
-
-#import <Cocoa/Cocoa.h>
-
-#import "FBVideo.h"
-
-@protocol FBScreenViewDelegate<NSObject>
-
-@optional
-- (void) mouseDidIdle;
-- (void) mouseStateDidChange;
-- (void) mouseDidMove:(NSPoint) point;
-- (void) mouseButtonStateDidChange:(NSEvent *) event;
-
-@end
-
-@interface FBScreenView : NSOpenGLView<FBVideoDelegate>
-
-- (NSSize) screenSize;
-
-@property (nonatomic, weak) id<FBScreenViewDelegate> delegate;
-
-@end