浏览代码

bugs fix.

SakiKawasaki 4 年之前
父节点
当前提交
c3cae534cc

+ 3 - 3
src/nodesnim/nodescontrol/edittext.nim

@@ -71,7 +71,7 @@ method getTextSize*(self: EditTextPtr): Vector2Ref {.base.} =
 method getLine*(self: EditTextPtr): int {.base.} =
   var
     caret_pos = 0
-    line = 0
+    l = 0
   for line in self.text.splitLines():
     for c in line:
       if caret_pos == self.caret_position:
@@ -79,9 +79,9 @@ method getLine*(self: EditTextPtr): int {.base.} =
       inc caret_pos
     if caret_pos == self.caret_position:
       break
-    inc line
+    inc l
     inc caret_pos
-  return line
+  return l
 
 method draw*(self: EditTextPtr, w, h: GLfloat) =
   self.calcGlobalPosition()

+ 4 - 4
src/nodesnim/nodescontrol/rich_edit_text.nim

@@ -67,17 +67,17 @@ method getTextSize*(self: RichEditTextPtr): Vector2Ref {.base.} =
 method getLine*(self: RichEditTextPtr): int {.base.} =
   var
     caret_pos = 0
-    line = 0
+    l = 0
   for line in self.text.splitLines():
-    for c in line:
+    for c in line.chars:
       if caret_pos == self.caret_position:
         break
       inc caret_pos
     if caret_pos == self.caret_position:
       break
-    inc line
+    inc l
     inc caret_pos
-  return line
+  return l
 
 method draw*(self: RichEditTextPtr, w, h: GLfloat) =
   self.calcGlobalPosition()

+ 0 - 4
src/nodesnim/nodescontrol/scroll.nim

@@ -80,8 +80,6 @@ method draw2stage*(self: ScrollPtr, w, h: GLfloat) =
     var child = self.children[0]
     self.resize(child.rect_size.x, child.rect_size.y)
     let
-      hback_w = self.viewport_w
-      vback_h = self.viewport_h
       thumb_h = self.viewport_h * (self.viewport_h / self.rect_size.y)
       thumb_w = self.viewport_w * (self.viewport_w / self.rect_size.x)
       thumb_x = self.viewport_w * (self.viewport_x / self.rect_size.x)
@@ -127,8 +125,6 @@ method handle*(self: ScrollPtr, event: InputEvent, mouse_on: var NodePtr) =
 
   let
     mouse_in = Rect2(self.global_position, Vector2(self.viewport_w, self.viewport_h)).hasPoint(event.x, event.y)
-    hback_w = self.viewport_w
-    vback_h = self.viewport_h
     thumb_h = self.viewport_h * (self.viewport_h / self.rect_size.y)
     thumb_w = self.viewport_w * (self.viewport_w / self.rect_size.x)
     thumb_x = self.viewport_w * (self.viewport_x / self.rect_size.x)

+ 1 - 6
src/nodesnim/nodescontrol/slider.nim

@@ -81,12 +81,7 @@ method setProgressColor*(self: SliderPtr, color: ColorRef) {.base.} =
 
 method handle*(self: SliderPtr, event: InputEvent, mouse_on: var NodePtr) =
   procCall self.ControlPtr.handle(event, mouse_on)
-  
-  let
-    mouse_in = Rect2(
-      self.global_position,
-      Vector2(self.rect_size.x, self.rect_size.y)
-    ).hasPoint(event.x, event.y)
+
   if self.pressed:
     let
       value = normalize(1f - ((self.global_position.x + self.rect_size.x - event.x) / self.rect_size.x), 0, 1)

+ 1 - 6
src/nodesnim/nodescontrol/vslider.nim

@@ -81,12 +81,7 @@ method setProgressColor*(self: VSliderPtr, color: ColorRef) {.base.} =
 
 method handle*(self: VSliderPtr, event: InputEvent, mouse_on: var NodePtr) =
   procCall self.ControlPtr.handle(event, mouse_on)
-  
-  let
-    mouse_in = Rect2(
-      self.global_position,
-      Vector2(self.rect_size.x, self.rect_size.y)
-    ).hasPoint(event.x, event.y)
+
   if self.pressed:
     let
       value = normalize(((self.global_position.y + self.rect_size.y - event.y) / self.rect_size.y), 0, 1)

+ 1 - 1
src/nodesnim/window.nim

@@ -227,7 +227,7 @@ proc Window*(title: cstring, w: cint = 640, h: cint = 360) {.cdecl.} =
   # Set up window.
   glutInitWindowSize(w, h)
   glutInitWindowPosition(100, 100)
-  let success = glutCreateWindow(title)
+  discard glutCreateWindow(title)
 
   # Set up OpenGL
   let (r, g, b, a) = env.color.toFloatTuple()