ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-04 22:58:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1841 from hasenj/hack-objc-window-init

Browse Source 
HACK work around for creating a cocoa window
This commit is contained in:
gingerBill
2022-06-12 17:08:10 +01:00
committed by GitHub
parent 65b8cfae82 4be92c7eb8
commit 108558ddfc
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vendor/darwin/Foundation/NSTypes.odin
Vendored
+6 -1
View File
@@ -36,7 +36,12 @@ NotFound :: IntegerMax
Float :: distinct (f32 when size_of(uint) == 4 else f64) Float :: distinct (f32 when size_of(uint) == 4 else f64)
Point :: struct {
x: Float,
y: Float,
}
Size :: struct { Size :: struct {
width: Float, width: Float,
height: Float, height: Float,
} }
vendor/darwin/Foundation/NSWindow.odin
Vendored
+16 -5
View File
@@ -3,8 +3,8 @@ package objc_Foundation
import NS "vendor:darwin/Foundation" import NS "vendor:darwin/Foundation"
Rect :: struct { Rect :: struct {
x, y: f64, using origin: Point,
width, height: f64, using size: Size,
} }
WindowStyleFlag :: enum NS.UInteger { WindowStyleFlag :: enum NS.UInteger {
@@ -102,8 +102,19 @@ Window_alloc :: proc() -> ^Window {
} }
@(objc_type=Window, objc_name="initWithContentRect") @(objc_type=Window, objc_name="initWithContentRect")
Window_initWithContentRect :: proc(self: ^Window, contentRect: Rect, styleMask: WindowStyleMask, backing: BackingStoreType, doDefer: bool) -> ^Window { Window_initWithContentRect :: proc (self: ^Window, contentRect: Rect, styleMask: WindowStyleMask, backing: BackingStoreType, doDefer: bool) -> ^Window {
return msgSend(^Window, self, "initWithContentRect:styleMask:backing:defer:", contentRect, styleMask, backing, doDefer) self := self
// HACK: due to a compiler bug, the generated calling code does not
// currently work for this message. Has to do with passing a struct along
// with other parameters, so we don't send the rect here.
// Omiting the rect argument here actually works, because of how the C
// calling conventions are defined.
self = msgSend(^Window, self, "initWithContentRect:styleMask:backing:defer:", styleMask, backing, doDefer)
// apply the contentRect now, since we did not pass it to the init call
msgSend(nil, self, "setContentSize:", contentRect.size)
msgSend(nil, self, "setFrameOrigin:", contentRect.origin)
return self
} }
@(objc_type=Window, objc_name="contentView") @(objc_type=Window, objc_name="contentView")
Window_contentView :: proc(self: ^Window) -> ^View { Window_contentView :: proc(self: ^Window) -> ^View {
@@ -148,4 +159,4 @@ Window_setTitle :: proc(self: ^Window, title: ^NS.String) {
@(objc_type=Window, objc_name="close") @(objc_type=Window, objc_name="close")
Window_close :: proc(self: ^Window) { Window_close :: proc(self: ^Window) {
msgSend(nil, self, "close") msgSend(nil, self, "close")
} }