@@ -186,7 +186,7 @@ proc updatePixelRatio(w: SdlWindow) {.inline.} =
186
186
w.pixelRatio = w.scaleFactor ()
187
187
w.viewportPixelRatio = w.pixelRatio
188
188
189
- proc initSdlWindow (w: SdlWindow , r: view.Rect ) =
189
+ proc initSdlWindow (w: SdlWindow , gfx: GraphicsContext , r: view.Rect ) =
190
190
initSDLIfNeeded ()
191
191
when defined (ios) or defined (android):
192
192
w.isFullscreen = true
@@ -210,13 +210,13 @@ proc initSdlWindow(w: SdlWindow, r: view.Rect) =
210
210
if w.sdlGlContext == nil :
211
211
error " Could not create context!"
212
212
discard glMakeCurrent (w.impl, w.sdlGlContext)
213
- w.gfx = newGraphicsContext ()
213
+ w.gfx = if gfx.isNil: newGraphicsContext () else : gfx
214
214
215
215
mainApplication ().addWindow (w)
216
216
discard w.impl.setData (" __nimx_wnd" , cast [pointer ](w))
217
217
218
218
method init * (w: SdlWindow , gfx: GraphicsContext , r: view.Rect ) =
219
- w.initSdlWindow (r)
219
+ w.initSdlWindow (gfx, r)
220
220
let r = w.getOsWindowFrame ()
221
221
procCall w.Window .init (w.gfx, r)
222
222
w.onResize (r.size)
@@ -241,9 +241,10 @@ proc newSdlWindow*(r: view.Rect): SdlWindow =
241
241
newSdlWindow (nil , r)
242
242
243
243
method show * (w: SdlWindow )=
244
- if w.impl.isNil:
245
- w.initSdlWindow (w.frame)
246
- w.setFrameOrigin zeroPoint
244
+ assert not w.impl.isNil
245
+ # if w.impl.isNil:
246
+ # w.initSdlWindow(w.frame)
247
+ # w.setFrameOrigin zeroPoint
247
248
248
249
w.impl.showWindow ()
249
250
w.impl.raiseWindow ()
0 commit comments