Move Apple retained platform state into platform target
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
#include "app.h"
|
||||
#include "keymap.h"
|
||||
#include "main.h"
|
||||
#include "platform_legacy/legacy_platform_state.h"
|
||||
#include "platform_apple/apple_platform_services.h"
|
||||
#include "settings.h"
|
||||
#include <CoreFoundation/CoreFoundation.h>
|
||||
#include <Cocoa/Cocoa.h>
|
||||
@@ -534,7 +534,7 @@ NSString* keyCodeToString(NSUInteger keyCode, NSUInteger mods)
|
||||
|
||||
view = [[View alloc] initWithFrame:r];
|
||||
controller = [[Controller alloc] initWithWindow:window];
|
||||
pp::platform::legacy::set_legacy_apple_state(view, nullptr);
|
||||
pp::platform::apple::set_legacy_apple_state(view, nullptr);
|
||||
|
||||
float z = (float)window.backingScaleFactor;
|
||||
App::I->zoom = Settings::value_or<Serializer::Float>("ui-scale", (z > 0.f) ? z : 1.f);
|
||||
@@ -633,7 +633,7 @@ int main(int argc, const char * argv[])
|
||||
return 0;
|
||||
|
||||
AppOSX* app = [AppOSX sharedApplication];
|
||||
pp::platform::legacy::set_legacy_apple_state(nullptr, app);
|
||||
pp::platform::apple::set_legacy_apple_state(nullptr, app);
|
||||
[app run];
|
||||
|
||||
return 0;
|
||||
|
||||
Reference in New Issue
Block a user