Moved FBScreenView to Views/

This commit is contained in:
Akop Karapetyan 2019-12-11 22:34:36 -08:00 committed by tmaul
parent 9952fd297b
commit d50fea39c6
4 changed files with 49 additions and 35 deletions

View File

@ -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 */,
);

View File

@ -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

View File

@ -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>

View File

@ -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