alex/baseview
1
0
Fork 0
Code Activity

macOS: fix build

Browse source
This commit is contained in:
William Light 2020-09-11 18:38:55 +02:00
parent bc79e42314
commit 409b03cfdb
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/macos/window.rs
View file

@ -25,8 +25,8 @@ pub struct WindowHandle;
impl WindowHandle { impl WindowHandle {
pub fn app_run_blocking(self) { pub fn app_run_blocking(self) {
unsafe { unsafe {
let current_app = NSRunningApplication::currentApplication(nil); let app = NSApp();
current_app.activateWithOptions_(NSApplicationActivateIgnoringOtherApps); app.setActivationPolicy_(NSApplicationActivationPolicyRegular);
app.run(); app.run();
} }
} }
@ -37,9 +37,6 @@ impl Window {
unsafe { unsafe {
let _pool = NSAutoreleasePool::new(nil); let _pool = NSAutoreleasePool::new(nil);
let app = NSApp();
app.setActivationPolicy_(NSApplicationActivationPolicyRegular);
let rect = NSRect::new( let rect = NSRect::new(
NSPoint::new(0.0, 0.0), NSPoint::new(0.0, 0.0),
NSSize::new(options.width as f64, options.height as f64), NSSize::new(options.width as f64, options.height as f64),
@ -54,7 +51,7 @@ impl Window {
) )
.autorelease(); .autorelease();
ns_window.center(); ns_window.center();
ns_window.setTitle_(NSString::alloc(nil).init_str(options.title)); ns_window.setTitle_(NSString::alloc(nil).init_str(&options.title));
ns_window.makeKeyAndOrderFront_(nil); ns_window.makeKeyAndOrderFront_(nil);
let ns_view = NSView::alloc(nil).init(); let ns_view = NSView::alloc(nil).init();
@ -64,6 +61,10 @@ impl Window {
let handler = H::build(&mut window); let handler = H::build(&mut window);
// FIXME: only do this in the unparented case
let current_app = NSRunningApplication::currentApplication(nil);
current_app.activateWithOptions_(NSApplicationActivateIgnoringOtherApps);
WindowHandle WindowHandle
} }
} }