Merge branch 'master' of https://github.com/yglukhov/nimx

Author: quantimnot

nimx/formatted_text.nim

@@ -645,15 +645,22 @@ void compose()
 """, false, "mediump")
 
 type ForEachLineAttributeCallback = proc(c: GraphicsContext, t: FormattedText, p: var Point, curLine, endIndex: int, str: string) {.nimcall.}
-proc forEachLineAttribute(c: GraphicsContext, origP: Point, t: FormattedText, cb: ForEachLineAttributeCallback) =
+proc forEachLineAttribute(c: GraphicsContext, inRect: Rect, origP: Point, t: FormattedText, cb: ForEachLineAttributeCallback) =
     var p = origP
     let numLines = t.lines.len
     var curLine = 0
     let top = t.topOffset() + origP.y
+    let inRectValid = (inRect.y + inRect.height) > 0.01
 
     while curLine < numLines:
         p.x = origP.x + t.lineLeft(curLine)
         p.y = t.lines[curLine].top + t.lines[curLine].baseline + top
+        if inRectValid:
+            if p.y < inRect.y:
+                curLine.inc
+                continue
+            elif p.y > inRect.height:
+                break
 
         var lastCurAttrIndex: int
         var lastAttrStartIndex: int
@@ -719,9 +726,9 @@ proc forEachLineAttribute(c: GraphicsContext, origP: Point, t: FormattedText, cb
         curLine.inc
 
 
-proc drawShadow(c: GraphicsContext, origP: Point, t: FormattedText) =
+proc drawShadow(c: GraphicsContext, inRect: Rect, origP: Point, t: FormattedText) =
     # TODO: Optimize heavily
-    forEachLineAttribute(c, origP, t) do(c: GraphicsContext, t: FormattedText, p: var Point, curLine, curAttrIndex: int, str: string):
+    forEachLineAttribute(c, inRect, origP, t) do(c: GraphicsContext, t: FormattedText, p: var Point, curLine, curAttrIndex: int, str: string):
         c.fillColor = t.mAttributes[curAttrIndex].shadowColor
         let font = t.mAttributes[curAttrIndex].font
         let oldBaseline = font.baseline
@@ -762,9 +769,9 @@ proc drawShadow(c: GraphicsContext, origP: Point, t: FormattedText) =
         font.baseline = oldBaseline
         p.x += pp.x - ppp.x
 
-proc drawStroke(c: GraphicsContext, origP: Point, t: FormattedText) =
+proc drawStroke(c: GraphicsContext, inRect: Rect, origP: Point, t: FormattedText) =
     # TODO: Optimize heavily
-    forEachLineAttribute(c, origP, t) do(c: GraphicsContext, t: FormattedText, p: var Point, curLine, curAttrIndex: int, str: string):
+    forEachLineAttribute(c, inRect, origP, t) do(c: GraphicsContext, t: FormattedText, p: var Point, curLine, curAttrIndex: int, str: string):
         const magicStrokeMaxSizeCoof = 0.46
         let font = t.mAttributes[curAttrIndex].font
 
@@ -806,14 +813,14 @@ proc drawStroke(c: GraphicsContext, origP: Point, t: FormattedText) =
             # Dirty hack to advance x position. Should be optimized, of course.
             c.drawText(font, p, str)
 
-proc drawText*(c: GraphicsContext, origP: Point, t: FormattedText) =
+proc drawText*(c: GraphicsContext, origP: Point, t: FormattedText, inRect: Rect = zeroRect) =
     t.updateCacheIfNeeded()
 
     if t.overrideColor.a == 0:
-        if t.shadowAttrs.len > 0: c.drawShadow(origP, t)
-        if t.strokeAttrs.len > 0: c.drawStroke(origP, t)
+        if t.shadowAttrs.len > 0: c.drawShadow(inRect, origP, t)
+        if t.strokeAttrs.len > 0: c.drawStroke(inRect, origP, t)
 
-    forEachLineAttribute(c, origP, t) do(c: GraphicsContext, t: FormattedText, p: var Point, curLine, curAttrIndex: int, str: string):
+    forEachLineAttribute(c, inRect, origP, t) do(c: GraphicsContext, t: FormattedText, p: var Point, curLine, curAttrIndex: int, str: string):
         let font = t.mAttributes[curAttrIndex].font
         let oldBaseline = font.baseline
         font.baseline = bAlphabetic

nimx/scroll_bar.nim

@@ -10,20 +10,21 @@ type ScrollBar* = ref object of Slider
                     # document is 0.5.
     trackingPos: Coord # Position of mouse coordinate (x or y depending on orientation) within knob
 
+const minKnobSize = 0.05
 method init*(s: ScrollBar, r: Rect) =
     procCall s.Slider.init(r)
     s.mKnobSize = 0.2
 
 proc knobRect(s: ScrollBar): Rect =
     result = s.bounds
     if s.isHorizontal:
-        result.size.width *= s.mKnobSize
+        result.size.width *= max(s.mKnobSize, minKnobSize)
         result.origin.x = max((s.bounds.width - result.width) * s.value, 3)
         if result.maxX > s.bounds.width - 3:
             result.size.width = s.bounds.width - result.x - 3
         result = inset(result, 0, 2)
     else:
-        result.size.height *= s.mKnobSize
+        result.size.height *= max(s.mKnobSize, minKnobSize)
         result.origin.y = max((s.bounds.height - result.height) * s.value, 3)
         if result.maxY > s.bounds.height - 3:
             result.size.height = s.bounds.height - result.y - 3

nimx/text_field.nim

@@ -246,6 +246,15 @@ proc drawSelection(t: TextField) {.inline.} =
         r.size.width = endOff
         c.drawRect(r)
 
+#todo: replace by generic visibleRect which should be implemented in future
+proc visibleRect(t: TextField): Rect =
+    let wndRect = t.convertRectToWindow(t.bounds)
+    let wndBounds = t.window.bounds
+
+    result.origin.y = if wndRect.y < 0.0: abs(wndRect.y) else: 0.0
+    result.size.width = t.bounds.width
+    result.size.height = min(t.bounds.height, wndBounds.height) + result.y - max(wndRect.y, 0.0)
+
 method draw*(t: TextField, r: Rect) =
     procCall t.View.draw(r)
 
@@ -267,7 +276,11 @@ method draw*(t: TextField, r: Rect) =
         t.mText.overrideColor = whiteColor()
     else:
         t.mText.overrideColor.a = 0
-    c.drawText(pt, t.mText)
+
+    if t.bounds.height > t.window.bounds.height:
+        c.drawText(pt, t.mText, t.visibleRect())
+    else:
+        c.drawText(pt, t.mText)
 
     if t.isEditing:
         if t.hasBezel: