mirrors
/
bgfx
mirror of https://github.com/bkaradzic/bgfx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup.

This commit is contained in:
Бранимир Караџић 2019-04-26 19:33:32 -07:00
parent 62ea70c449
commit 2747c75e0a
1 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
examples/common/entry/entry_osx.mm
View File

@ -551,11 +551,12 @@ namespace entry
{
void (^createWindowBlock)(void) = ^(void) {
NSRect rect = NSMakeRect(_x, _y, _width, _height);
NSWindow* window = [[NSWindow alloc]
initWithContentRect:rect
styleMask:s_ctx.m_style
backing:NSBackingStoreBuffered defer:NO
];
NSWindow* window = [
[NSWindow alloc]
initWithContentRect:rect
styleMask:s_ctx.m_style
backing:NSBackingStoreBuffered defer:NO
];
NSString* appName = [NSString stringWithUTF8String:_title];
[window setTitle:appName];
[window makeKeyAndOrderFront:window];
@ -586,24 +587,24 @@ namespace entry
{
if (isValid(_handle))
{
dispatch_async(dispatch_get_main_queue(), ^(void)
{
NSWindow *window = s_ctx.m_window[_handle.idx];
if ( NULL != window)
{
s_ctx.m_eventQueue.postWindowEvent(_handle);
s_ctx.m_window[_handle.idx] = NULL;
if ( _closeWindow )
{
[window close];
}
dispatch_async(dispatch_get_main_queue()
, ^(void){
NSWindow *window = s_ctx.m_window[_handle.idx];
if ( NULL != window)
{
s_ctx.m_eventQueue.postWindowEvent(_handle);
s_ctx.m_window[_handle.idx] = NULL;
if ( _closeWindow )
{
[window close];
}
if (0 == _handle.idx)
{
[NSApp terminate:nil];
}
}
});
if (0 == _handle.idx)
{
[NSApp terminate:nil];
}
}
});
bx::MutexScope scope(s_ctx.m_lock);
s_ctx.m_windowAlloc.free(_handle.idx);
@ -618,36 +619,36 @@ namespace entry
void setWindowPos(WindowHandle _handle, int32_t _x, int32_t _y)
{
dispatch_async(dispatch_get_main_queue()
, ^{
NSWindow* window = s_ctx.m_window[_handle.idx];
NSScreen* screen = [window screen];
, ^{
NSWindow* window = s_ctx.m_window[_handle.idx];
NSScreen* screen = [window screen];
NSRect screenRect = [screen frame];
CGFloat menuBarHeight = [[[NSApplication sharedApplication] mainMenu] menuBarHeight];
NSRect screenRect = [screen frame];
CGFloat menuBarHeight = [[[NSApplication sharedApplication] mainMenu] menuBarHeight];
NSPoint position = { float(_x), screenRect.size.height - menuBarHeight - float(_y) };
NSPoint position = { float(_x), screenRect.size.height - menuBarHeight - float(_y) };
[window setFrameTopLeftPoint: position];
});
[window setFrameTopLeftPoint: position];
});
}
void setWindowSize(WindowHandle _handle, uint32_t _width, uint32_t _height)
{
NSSize size = { float(_width), float(_height) };
dispatch_async(dispatch_get_main_queue()
, ^{
[s_ctx.m_window[_handle.idx] setContentSize: size];
});
, ^{
[s_ctx.m_window[_handle.idx] setContentSize: size];
});
}
void setWindowTitle(WindowHandle _handle, const char* _title)
{
NSString* title = [[NSString alloc] initWithCString:_title encoding:1];
dispatch_async(dispatch_get_main_queue()
, ^{
[s_ctx.m_window[_handle.idx] setTitle: title];
[title release];
});
, ^{
[s_ctx.m_window[_handle.idx] setTitle: title];
[title release];
});
}
void setWindowFlags(WindowHandle _handle, uint32_t _flags, bool _enabled)
@ -658,31 +659,30 @@ namespace entry
void toggleFullscreen(WindowHandle _handle)
{
dispatch_async(dispatch_get_main_queue()
, ^{
, ^{
NSWindow* window = s_ctx.m_window[_handle.idx];
NSScreen* screen = [window screen];
NSRect screenRect = [screen frame];
NSWindow* window = s_ctx.m_window[_handle.idx];
NSScreen* screen = [window screen];
NSRect screenRect = [screen frame];
if (!s_ctx.m_fullscreen)
{
s_ctx.m_style &= ~NSWindowStyleMaskTitled;
s_ctx.m_fullscreen = true;
if (!s_ctx.m_fullscreen)
{
s_ctx.m_style &= ~NSWindowStyleMaskTitled;
s_ctx.m_fullscreen = true;
[NSMenu setMenuBarVisible: false];
[window setStyleMask: s_ctx.m_style];
[window setFrame:screenRect display:YES];
}
else
{
s_ctx.m_style |= NSWindowStyleMaskTitled;
s_ctx.m_fullscreen = false;
[NSMenu setMenuBarVisible: false];
[window setStyleMask: s_ctx.m_style];
[window setFrame:screenRect display:YES];
}
else
{
s_ctx.m_style |= NSWindowStyleMaskTitled;
s_ctx.m_fullscreen = false;
[NSMenu setMenuBarVisible: true];
[window setStyleMask: s_ctx.m_style];
[window setFrame:s_ctx.m_windowFrame display:YES];
}
});
[NSMenu setMenuBarVisible: true];
[window setStyleMask: s_ctx.m_style];
[window setFrame:s_ctx.m_windowFrame display:YES];
}
});
}
void setMouseLock(WindowHandle _handle, bool _lock)