vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

gg: borderless windows on macos without animation

pull/5228/head
Alexander Medvednikov 2020-06-05 15:43:44 +02:00
parent 44442223a2
commit 3478430762
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
thirdparty/sokol/sokol_app.h vendored
View File

@ -1209,7 +1209,16 @@ _SOKOL_PRIVATE void _sapp_frame(void) {
@end @end
#endif #endif
static NSWindow* _sapp_macos_window_obj; @interface MyWindow : NSWindow {
}
@end
@implementation MyWindow
- (BOOL)canBecomeKeyWindow { return YES;}
@end
static MyWindow* _sapp_macos_window_obj;
static _sapp_macos_window_delegate* _sapp_macos_win_dlg_obj; static _sapp_macos_window_delegate* _sapp_macos_win_dlg_obj;
static _sapp_macos_app_delegate* _sapp_macos_app_dlg_obj; static _sapp_macos_app_delegate* _sapp_macos_app_dlg_obj;
static _sapp_macos_view* _sapp_view_obj; static _sapp_macos_view* _sapp_view_obj;
@ -1401,13 +1410,17 @@ _SOKOL_PRIVATE void _sapp_macos_frame(void) {
} }
_sapp.dpi_scale = (float)_sapp.framebuffer_width / (float) _sapp.window_width; _sapp.dpi_scale = (float)_sapp.framebuffer_width / (float) _sapp.window_width;
} }
const NSUInteger style = NSUInteger style = NSWindowStyleMaskBorderless;
if (!_sapp.desc.fullscreen) {
style =
NSWindowStyleMaskTitled | NSWindowStyleMaskTitled |
NSWindowStyleMaskClosable | NSWindowStyleMaskClosable |
NSWindowStyleMaskMiniaturizable | NSWindowStyleMaskMiniaturizable |
NSWindowStyleMaskResizable; NSWindowStyleMaskResizable;
}
NSRect window_rect = NSMakeRect(0, 0, _sapp.window_width, _sapp.window_height); NSRect window_rect = NSMakeRect(0, 0, _sapp.window_width, _sapp.window_height);
_sapp_macos_window_obj = [[NSWindow alloc] _sapp_macos_window_obj = [[MyWindow alloc]
initWithContentRect:window_rect initWithContentRect:window_rect
styleMask:style styleMask:style
backing:NSBackingStoreBuffered backing:NSBackingStoreBuffered
@ -1480,7 +1493,7 @@ _SOKOL_PRIVATE void _sapp_macos_frame(void) {
[[NSRunLoop currentRunLoop] addTimer:_sapp_macos_timer_obj forMode:NSDefaultRunLoopMode]; [[NSRunLoop currentRunLoop] addTimer:_sapp_macos_timer_obj forMode:NSDefaultRunLoopMode];
#endif #endif
_sapp.valid = true; _sapp.valid = true;
if (_sapp.desc.fullscreen) { if (_sapp.desc.fullscreen && false) {
/* on GL, this already toggles a rendered frame, so set the valid flag before */ /* on GL, this already toggles a rendered frame, so set the valid flag before */
[_sapp_macos_window_obj toggleFullScreen:self]; [_sapp_macos_window_obj toggleFullScreen:self];
} }
@ -1617,6 +1630,7 @@ _SOKOL_PRIVATE void _sapp_macos_app_event(sapp_event_type type) {
- (BOOL)acceptsFirstResponder { - (BOOL)acceptsFirstResponder {
return YES; return YES;
} }
- (void)updateTrackingAreas { - (void)updateTrackingAreas {
if (trackingArea != nil) { if (trackingArea != nil) {
[self removeTrackingArea:trackingArea]; [self removeTrackingArea:trackingArea];

9
vlib/gg/gg.v
View File

@ -241,7 +241,14 @@ pub fn (gg &Context) end() {
} }
} }
pub fn (ctx &Context) draw_line(x, y, x2, y2 f32, color gx.Color) {} pub fn (ctx &Context) draw_line(x, y, x2, y2 f32, c gx.Color) {
sgl.c4b(c.r, c.g, c.b, 128)
sgl.begin_line_strip()
sgl.v2f(x * ctx.scale, y * ctx.scale)
sgl.v2f(x2 * ctx.scale, y2 * ctx.scale)
sgl.end()
}
fn C.WaitMessage() fn C.WaitMessage()