each view has a window assigned at init

Author: quantimnot

.gitignore

@@ -3,3 +3,5 @@ nakefile
 test/main
 *.exe
 build/
+.debug
+.vscode

doc/context.md

@@ -0,0 +1,17 @@
+Context
+=======
+
+WindowView
+----------
+
+Interfaces with window and graphics backend.
+
+Each view has a graphics context.
+
+TODO: The context may be unique or shared between windows depending on backend.
+
+A view may need app data and backend data to properly initialize itself.
+
+Some backends (js) do not currently support sharing between opengl contexts.
+
+

editor/nakefile.nim

@@ -11,3 +11,9 @@ preprocessResources = proc(b: Builder) =
     let sf = f.splitFile()
     if sf.ext == ".nimx":
       b.copyResourceAsIs(f.replace("res/", ""))
+
+task "debug", "Build for debugging":
+    let b = newBuilder()
+    b.additionalNimFlags.add "--debugger:on"
+    b.runAfterBuild = false
+    b.build()

nakefile.nim

@@ -34,3 +34,9 @@ task "docs", "Build documentation":
                 direShell "nim rst2html " & f & " &>/dev/null"
 
         copyDir "../js", "./livedemo"
+
+task "debug", "Build for debugging":
+    let b = newBuilder()
+    b.additionalNimFlags.add "--debugger:on"
+    b.runAfterBuild = false
+    b.build()

nimx/abstract_window.nim

@@ -83,20 +83,20 @@ method drawWindow*(w: Window) {.base.} =
     w.needsDisplay = false
 
     w.recursiveDrawSubviews()
-    let c = currentContext()
+    let c = w.gfxCtx
 
     let profiler = sharedProfiler()
     if profiler.enabled:
         updateFps()
-        profiler["Overdraw"] = GetOverdrawValue()
-        profiler["DIPs"] = GetDIPValue()
+        profiler["Overdraw"] = getOverdrawValue(w.gfxCtx)
+        profiler["DIPs"] = getDIPValue(w.gfxCtx)
         profiler["Animations"] = totalAnims
 
         const fontSize = 14
         const profilerWidth = 110
-        var font = systemFont()
+        var font = systemFont(c.fontCtx)
         let old_size = font.size
-        font.size = fontSize
+        `size=`(font, c.fontCtx, fontSize)
         var rect = newRect(w.frame.width - profilerWidth, 5, profilerWidth - 5, Coord(profiler.len) * font.height)
         c.fillColor = newGrayColor(1, 0.8)
         c.strokeWidth = 0
@@ -108,9 +108,9 @@ method drawWindow*(w: Window) {.base.} =
             pt.x = w.frame.width - profilerWidth
             c.drawText(font, pt, k & ": " & v)
             pt.y = pt.y + fontSize
-        font.size = old_size
-    ResetOverdrawValue()
-    ResetDIPValue()
+        `size=`(font, c.fontCtx, old_size)
+    resetOverdrawValue(c)
+    resetDIPValue(c)
 
     let dc = currentDragSystem()
     if not dc.pItem.isNil:
@@ -125,8 +125,7 @@ method drawWindow*(w: Window) {.base.} =
             c.drawRect(rect)
 
 method draw*(w: Window, rect: Rect) =
-    let c = currentContext()
-    let gl = c.gl
+    let gl = w.gfxCtx.gl
     if w.mActiveBgColor != w.backgroundColor:
         gl.clearColor(w.backgroundColor.r, w.backgroundColor.g, w.backgroundColor.b, w.backgroundColor.a)
         w.mActiveBgColor = w.backgroundColor
@@ -207,8 +206,8 @@ var newFullscreenWindow*: proc(): Window
 var newWindowWithNative*: proc(handle: pointer, r: Rect): Window
 var newFullscreenWindowWithNative*: proc(handle: pointer): Window
 
-method init*(w: Window, frame: Rect) =
-    procCall w.View.init(frame)
+method init*(w: Window, _: Window, frame: Rect) =
+    procCall w.View.init(w, frame)
     w.window = w
     w.needsDisplay = true
     w.mCurrentTouches = newTable[int, View]()

nimx/button.nim

@@ -52,38 +52,38 @@ Button.properties:
     imageMarginLeft
     image
 
-proc newButton*(r: Rect): Button =
+proc newButton*(w: Window, r: Rect): Button =
     result.new()
-    result.init(r)
+    result.init(w, r)
 
-proc newButton*(parent: View = nil, position: Point = newPoint(0, 0), size: Size = newSize(100, 20), title: string = "Button"): Button =
-    result = newButton(newRect(position.x, position.y, size.width, size.height))
+proc newButton*(parent: View = nil, w: Window, position: Point = newPoint(0, 0), size: Size = newSize(100, 20), title: string = "Button"): Button =
+    result = newButton(w, newRect(position.x, position.y, size.width, size.height))
     result.title = title
     if not isNil(parent):
         parent.addSubview(result)
 
-proc newCheckbox*(r: Rect): Button =
-    result = newButton(r)
+proc newCheckbox*(w: Window, r: Rect): Button =
+    result = newButton(w, r)
     result.style = bsCheckbox
     result.behavior = bbToggle
 
-proc newRadiobox*(r: Rect): Button =
-    result = newButton(r)
+proc newRadiobox*(w: Window, r: Rect): Button =
+    result = newButton(w, r)
     result.style = bsRadiobox
     result.behavior = bbToggle
 
-proc newImageButton*(r: Rect): Button =
-    result = newButton(r)
+proc newImageButton*(w: Window, r: Rect): Button =
+    result = newButton(w, r)
     result.style = bsImage
 
-proc newImageButton*(parent: View = nil, position: Point = newPoint(0, 0), size: Size = newSize(100, 20), image: Image = nil): Button =
-    result = newImageButton(newRect(position.x, position.y, size.width, size.height))
+proc newImageButton*(parent: View = nil, w: Window, position: Point = newPoint(0, 0), size: Size = newSize(100, 20), image: Image = nil): Button =
+    result = newImageButton(w, newRect(position.x, position.y, size.width, size.height))
     result.image = image
     if not isNil(parent):
         parent.addSubview(result)
 
-method init*(b: Button, frame: Rect) =
-    procCall b.Control.init(frame)
+method init*(b: Button, w: Window, frame: Rect) =
+    procCall b.Control.init(w, frame)
     b.state = bsUp
     b.enabled = true
     b.backgroundColor = whiteColor()
@@ -93,29 +93,31 @@ method init*(b: Button, frame: Rect) =
     b.imageMarginTop = 2
     b.imageMarginBottom = 2
 
-method init*(b: Checkbox, frame: Rect) =
-    procCall b.Button.init(frame)
+method init*(b: Checkbox, w: Window, frame: Rect) =
+    procCall b.Button.init(w, frame)
     b.style = bsCheckbox
     b.behavior = bbToggle
 
-method init*(b: Radiobox, frame: Rect) =
-    procCall b.Button.init(frame)
+method init*(b: Radiobox, w: Window, frame: Rect) =
+    procCall b.Button.init(w, frame)
     b.style = bsRadiobox
     b.behavior = bbToggle
 
 proc drawTitle(b: Button, xOffset: Coord) =
+    template gfxCtx: untyped = b.window.gfxCtx
+    template fontCtx: untyped = b.window.gfxCtx.fontCtx
+    template gl: untyped = b.window.gfxCtx.gl
     if b.title.len != 0:
-        let c = currentContext()
-        c.fillColor = if b.state == bsDown and b.style == bsRegular:
+        gfxCtx.fillColor = if b.state == bsDown and b.style == bsRegular:
                 whiteColor()
             else:
                 blackColor()
 
-        let font = systemFont()
+        let font = systemFont(fontCtx)
         var titleRect = b.bounds
-        var pt = centerInRect(font.sizeOfString(b.title), titleRect)
+        var pt = centerInRect(sizeOfString(fontCtx, gl, font, b.title), titleRect)
         if pt.x < xOffset: pt.x = xOffset
-        c.drawText(font, pt, b.title)
+        gfxCtx.drawText(font, pt, b.title)
 
 var regularButtonComposition = newComposition """
 uniform vec4 uStrokeColor;
@@ -134,7 +136,7 @@ void compose() {
 """
 
 proc drawRegularBezel(b: Button) =
-    regularButtonComposition.draw b.bounds:
+    draw b.window.gfxCtx, regularButtonComposition, b.bounds:
         if b.state == bsUp:
             setUniform("uStrokeColor", newGrayColor(0.78))
             setUniform("uFillColorStart", if b.enabled: b.backgroundColor else: grayColor())
@@ -162,10 +164,10 @@ proc drawCheckboxStyle(b: Button, r: Rect) =
     let
         size = b.bounds.height
         bezelRect = newRect(0, 0, size, size)
-        c = currentContext()
+        c = b.window.gfxCtx
 
     if b.value != 0:
-        checkButtonComposition.draw bezelRect:
+        draw c, checkButtonComposition, bezelRect:
             setUniform("uStrokeColor", selectionColor)
             setUniform("uFillColor", selectionColor)
             setUniform("uRadius", 4.0)
@@ -182,7 +184,7 @@ proc drawCheckboxStyle(b: Button, r: Rect) =
         c.drawLine(newPoint(size / 4.0, size * 1.0 / 2.0), newPoint(size / 4.0 * 2.0, size * 1.0 / 2.0 + size / 5.0 - c.strokeWidth / 2.0))
         c.drawLine(newPoint(size / 4.0 * 2.0 - c.strokeWidth / 2.0, size * 1.0 / 2.0 + size / 5.0), newPoint(size / 4.0 * 3.0 - c.strokeWidth / 2.0, size / 4.0))
     else:
-        checkButtonComposition.draw bezelRect:
+        draw c, checkButtonComposition, bezelRect:
             setUniform("uStrokeColor", newGrayColor(0.78))
             setUniform("uFillColor", whiteColor())
             setUniform("uRadius", 4.0)
@@ -206,16 +208,17 @@ void compose() {
 
 proc drawRadioboxStyle(b: Button, r: Rect) =
     let bezelRect = newRect(0, 0, b.bounds.height, b.bounds.height)
+    let c = b.window.gfxCtx
 
     # Selected
     if b.value != 0:
-        radioButtonComposition.draw bezelRect:
+        draw c, radioButtonComposition, bezelRect:
             setUniform("uStrokeColor", selectionColor)
             setUniform("uFillColor", selectionColor)
             setUniform("uRadioValue", bezelRect.height * 0.3)
             setUniform("uStrokeWidth", 0.0)
     else:
-        radioButtonComposition.draw bezelRect:
+        draw c, radioButtonComposition, bezelRect:
             setUniform("uStrokeColor", newGrayColor(0.78))
             setUniform("uFillColor", whiteColor())
             setUniform("uRadioValue", 1.0)
@@ -224,7 +227,7 @@ proc drawRadioboxStyle(b: Button, r: Rect) =
     b.drawTitle(bezelRect.width + 1)
 
 proc drawImage(b: Button) =
-    let c = currentContext()
+    let c = b.window.gfxCtx
     let r = b.bounds
     if b.imageMarginLeft != 0 or b.imageMarginRight != 0 or
             b.imageMarginTop != 0 or b.imageMarginBottom != 0:
@@ -315,12 +318,8 @@ method onTouchEv*(b: Button, e: var Event): bool =
         result = b.handleToggleTouchEv(e)
 
 registerClass(Button)
-
-const checkBox = proc(): RootRef= newCheckbox(zeroRect)
-registerClass(Checkbox, checkBox)
-
-const radiButton = proc(): RootRef = newRadiobox(zeroRect)
-registerClass(Radiobox, radiButton)
+registerClass(Checkbox)
+registerClass(Radiobox)
 
 genVisitorCodeForView(Button)
 genVisitorCodeForView(Checkbox)

nimx/class_registry.nim

@@ -96,13 +96,13 @@ template registerClass*(a: typedesc) =
         return res
     registerClass(a, c)
 
-template isClassRegistered*(name: string): bool = name in classFactory
-
 proc newObjectOfClass*(name: string): RootRef =
     let c = classFactory.getOrDefault(name)
     if c.creatorProc.isNil: raise newException(Exception, "Class '" & name & "' is not registered")
     result = c.creatorProc()
 
+template isClassRegistered*(name: string): bool = name in classFactory
+
 iterator registeredClasses*(): string =
     for k in classFactory.keys: yield k
 

nimx/clip_view.nim

@@ -3,9 +3,9 @@ import nimx / meta_extensions / [ property_desc, visitors_gen, serializers_gen ]
 
 type ClipView* = ref object of View
 
-proc newClipView*(r: Rect): ClipView =
+proc newClipView*(w: Window, r: Rect): ClipView =
     result.new()
-    result.init(r)
+    result.init(w, r)
     result.autoresizingMask = { afFlexibleWidth, afFlexibleHeight }
 
 method subviewDidChangeDesiredSize*(v: ClipView, sub: View, desiredSize: Size) =

nimx/collection_view.nim

@@ -40,13 +40,13 @@ const
 
 proc updateLayout*(v: CollectionView)
 
-proc newCollectionView*(r: Rect, itemSize: Size, layoutDirection: LayoutDirection, layoutWidth: int = LayoutWidthAuto): CollectionView =
+proc newCollectionView*(w: Window, r: Rect, itemSize: Size, layoutDirection: LayoutDirection, layoutWidth: int = LayoutWidthAuto): CollectionView =
     ## CollectionView constructor
     result.new()
     result.layoutDirection = layoutDirection
     result.layoutWidth = layoutWidth
     result.itemSize = itemSize
-    result.init(r)
+    result.init(w, r)
 
 method clipType*(v: CollectionView): ClipType = ctDefaultClip
 
@@ -162,8 +162,8 @@ proc updateLayout*(v: CollectionView) =
    v.scrollOffset = 0.0
    v.update()
 
-method init*(v: CollectionView, r: Rect) =
-    procCall v.View.init(r)
+method init*(v: CollectionView, w: Window, r: Rect) =
+    procCall v.View.init(w, r)
     v.rangeCache.dirty = true
     v.offset = 2.0
     let scrollListener = new(CollectionScrollListener)
@@ -204,7 +204,6 @@ CollectionView.properties:
     layoutWidth
     itemSize
 
-const collectionCreator = proc(): RootRef = newCollectionView(zeroRect, zeroSize, LeftToRight)
-registerClass(CollectionView, collectionCreator)
+registerClass(CollectionView)
 genVisitorCodeForView(CollectionView)
 genSerializeCodeForView(CollectionView)