diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-10-26 06:01:55 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-10-26 06:01:55 +0000 |
| commit | f978f64f80ce932ac9285eba86b244cf59bc9867 (patch) | |
| tree | 848293d370ab20748bba8bdb379409c6d126fe00 /Common/NativeApp | |
| parent | Gracefully handling unsupported device modes (fixed https://github.com/Dilige... (diff) | |
| download | DiligentEngine-f978f64f80ce932ac9285eba86b244cf59bc9867.tar.gz DiligentEngine-f978f64f80ce932ac9285eba86b244cf59bc9867.zip | |
MacOS app: fixed app titles
Diffstat (limited to 'Common/NativeApp')
6 files changed, 9 insertions, 20 deletions
diff --git a/Common/NativeApp/Apple/Source/Classes/OSX/GLView.h b/Common/NativeApp/Apple/Source/Classes/OSX/GLView.h index 0a77c75..666305a 100644 --- a/Common/NativeApp/Apple/Source/Classes/OSX/GLView.h +++ b/Common/NativeApp/Apple/Source/Classes/OSX/GLView.h @@ -12,6 +12,4 @@ @interface GLView : ViewBase --(NSString*)getAppName; - @end diff --git a/Common/NativeApp/Apple/Source/Classes/OSX/GLView.m b/Common/NativeApp/Apple/Source/Classes/OSX/GLView.m index a68b794..2e91b35 100644 --- a/Common/NativeApp/Apple/Source/Classes/OSX/GLView.m +++ b/Common/NativeApp/Apple/Source/Classes/OSX/GLView.m @@ -208,12 +208,4 @@ static CVReturn MyDisplayLinkCallback(CVDisplayLinkRef displayLink, CGLUnlockContext([glContext CGLContextObj]); } --(NSString*)getAppName -{ - auto* theApp = [self lockApp]; - auto Title = [NSString stringWithFormat:@"%s (OpenGL)", theApp ? theApp->GetAppTitle() : ""]; - [self unlockApp]; - return Title; -} - @end diff --git a/Common/NativeApp/Apple/Source/Classes/OSX/MetalView.h b/Common/NativeApp/Apple/Source/Classes/OSX/MetalView.h index 4964c42..d9b6a7a 100644 --- a/Common/NativeApp/Apple/Source/Classes/OSX/MetalView.h +++ b/Common/NativeApp/Apple/Source/Classes/OSX/MetalView.h @@ -27,6 +27,4 @@ @interface MetalView : ViewBase --(NSString*)getAppName; - @end diff --git a/Common/NativeApp/Apple/Source/Classes/OSX/MetalView.m b/Common/NativeApp/Apple/Source/Classes/OSX/MetalView.m index d5cdf81..5d4a7dd 100644 --- a/Common/NativeApp/Apple/Source/Classes/OSX/MetalView.m +++ b/Common/NativeApp/Apple/Source/Classes/OSX/MetalView.m @@ -136,12 +136,4 @@ static CVReturn DisplayLinkCallback(CVDisplayLinkRef displayLink, [self unlockApp]; } --(NSString*)getAppName -{ - auto* theApp = [self lockApp]; - auto Title = [NSString stringWithFormat:@"%s (Vulkan)", theApp ? theApp->GetAppTitle() : ""]; - [self unlockApp]; - return Title; -} - @end diff --git a/Common/NativeApp/Apple/Source/Classes/OSX/ViewBase.h b/Common/NativeApp/Apple/Source/Classes/OSX/ViewBase.h index ed9ebe4..d3084dd 100644 --- a/Common/NativeApp/Apple/Source/Classes/OSX/ViewBase.h +++ b/Common/NativeApp/Apple/Source/Classes/OSX/ViewBase.h @@ -38,5 +38,6 @@ -(void)unlockApp; -(void)stopDisplayLink; -(void)startDisplayLink; +-(NSString*)getAppName; @end diff --git a/Common/NativeApp/Apple/Source/Classes/OSX/ViewBase.m b/Common/NativeApp/Apple/Source/Classes/OSX/ViewBase.m index a7195c8..b73a5eb 100644 --- a/Common/NativeApp/Apple/Source/Classes/OSX/ViewBase.m +++ b/Common/NativeApp/Apple/Source/Classes/OSX/ViewBase.m @@ -136,4 +136,12 @@ [self destroyApp]; } +-(NSString*)getAppName +{ + auto* theApp = [self lockApp]; + auto Title = [NSString stringWithFormat:@"%s", theApp ? theApp->GetAppTitle() : ""]; + [self unlockApp]; + return Title; +} + @end |