Frame onClick.

Controls/Button.moon

@@ -23,7 +23,6 @@ circleBorder = (box) =>
   if @enabled and @stroke > 0
     oldLineWidth = Graphics.getLineWidth!
     Graphics.setLineWidth @stroke
-    Graphics.setLineStyle @borderLineStyle
     Graphics.setColor @strokeColor
     Graphics.circle "line", box.x, box.y, box\getRadius!
     Graphics.setLineWidth oldLineWidth
@@ -33,7 +32,6 @@ polyBorder = (box) =>
   if @enabled and @stroke > 0
     oldLineWidth = Graphics.getLineWidth!
     Graphics.setLineWidth @stroke
-    Graphics.setLineStyle @borderLineStyle
     Graphics.setColor @strokeColor
     Graphics.polygon "line", box\getVertices!
     Graphics.setLineWidth oldLineWidth
@@ -64,6 +62,7 @@ drawPoly = =>
   r, g, b, a = Graphics.getColor!
   color = currentColor self
 
+  Graphics.setLineStyle @borderLineStyle
   -- Button body
   if @bgImage
     if not @isPressed
@@ -95,8 +94,8 @@ drawPoly = =>
   if @textDrawable
     Graphics.setColor @fontColor
     textW, textH = @textDrawable\getWidth!, @textDrawable\getHeight!
-    x = box.x - textW / 2
-    y = box.y - textH / 2
+    x = math.ceil(box.x - textW / 2)
+    y = math.ceil(box.y - textH / 2)
     Graphics.draw @textDrawable, x, y
 
   Graphics.setColor r, g, b, a
@@ -109,6 +108,8 @@ drawCircle = =>
   boxR = box\getRadius!
   color = currentColor self
 
+  Graphics.setLineStyle @borderLineStyle
+
   -- Button body
   if @bgImage
     if not @isPressed
@@ -153,6 +154,8 @@ drawRect = =>
     boxW, boxH = box\getWidth!, box\getHeight!
     color = currentColor self
 
+    Graphics.setLineStyle @borderLineStyle
+
     -- Button body
     if @bgImage
       imageW, imageH = @bgImage\getWidth!, @bgImage\getHeight!
@@ -176,7 +179,6 @@ drawRect = =>
     if @enabled and @stroke > 0
       oldLineWidth = Graphics.getLineWidth!
       Graphics.setLineWidth @stroke
-      Graphics.setLineStyle @borderLineStyle
       Graphics.setColor @strokeColor
       Graphics.rectangle "line", box.x, box.y, boxW, boxH, @rx, @ry
       Graphics.setLineWidth oldLineWidth

Controls/Frame.moon

@@ -38,7 +38,6 @@ class Frame extends Content
     @toolBarColor = t.frame.toolBarColor
     @toolBarColorUnfocused = t.frame.toolBarColorUnfocused
     @backgroundColor = t.frame.contentBackground
-    @toolBarTitleColor = t.frame.toolBarTitleColor
 
     @closeBtn = Button "Box"
 
@@ -54,25 +53,20 @@ class Frame extends Content
     @on "UI_DRAW", @onDraw, @
     @on "UI_FOCUS", @onFocus, @
     @on "UI_UN_FOCUS", @onUnFocus, @
+    @on "UI_CLICK", @onClick, @
     @on "UI_MOUSE_DOWN", @onMouseDown, @
     @on "UI_ON_ADD", @onAdd, @
 
     @addChild @closeBtn
     @setDrag true
     @setMakeTopWhenClicked true
 
-    @setToolBarTitle label, math.ceil(@toolBarHeight/2)
-
   onDraw: =>
     drawToolBar @
 
     box = @getBoundingBox!
     r, g, b, a = Graphics.getColor!
     boxW, boxH = box\getWidth!, box\getHeight!
-
-    Graphics.setColor @toolBarTitleColor
-    Graphics.draw @toolBarTitle, box.x + @titleOffSet, box.y + @titleOffSet
-
 
     Graphics.setColor @backgroundColor
     Graphics.rectangle "fill", box.x, box.y + @toolBarHeight, boxW, boxH - @toolBarHeight, @rx, @ry
@@ -113,6 +107,11 @@ class Frame extends Content
     manager\setFocus @
     @onFocus!
 
+<<<<<<< HEAD
+  onClick: =>
+    manager\setFocus @
+    @onFocus!
+
   setToolBarTitle: (text = @text, size, font) =>
     if size and font
       if type(font) == "number" then @font = Graphics.newFont font
@@ -124,5 +123,7 @@ class Frame extends Content
 
     @titleOffSet = math.floor ((@toolBarHeight-1) / 2) - (size/2)
 
+=======
+>>>>>>> parent of 36c498a (Frame toolbar title.)
 
 Frame

Controls/themes/blues.moon

@@ -25,7 +25,6 @@ Default =
       toolBarColor: {0.161, 0.29, 0.478}
       toolBarColorUnfocused: {0.62, 0.62, 0.576}
       contentBackground: {0.082, 0.086, 0.09}
-      toolBarTitleColor: {1, 1, 1}
 
     button:
       width: 100

init.moon

@@ -28,7 +28,7 @@ keyboard.setKeyRepeat true
 export MeowUI = {
   debug: true
   keyInput: true -- If you are using keyInput functions else disable it. (Some example controls will used it, so if you want to use them keep it as is).
-  version: "v0.0.0.116"
+  version: "v0.1"
   stage: "alpha"
   defTheme: "blues"
   author: "Tourahi Amine"

src/Core/Control.moon

@@ -190,7 +190,8 @@ class Control
 
     if @childrenEnabled
       for i = #@children, 1, -1
-        hitControl = @children[i]\hitTest x, y
+        control = @children[i]
+        hitControl = control\hitTest x, y
         if hitControl then return hitControl
 
     if @enabled
@@ -448,7 +449,6 @@ class Control
         @children[i]\setParent nil
         Tremove @children, i
         child.events\dispatch child.events\getEvent "UI_ON_REMOVE"
-        child = nil
         break
 
   --- drops the control children.