Merge branch 'master' into love_0_11_0

Author: gustavostuff

gooi/button.lua

@@ -17,7 +17,9 @@ function gooi.newButton(params)
         params.h or theH * 2,
         "button"
     )
-
+    
+	local yLocal = params.yLocal or 0
+    
     b = component.new("button", x, y, w, h, params.group)
     b = gooi.setStyleComp(b)
     b.text = params.text or defaultText
@@ -77,7 +79,10 @@ function gooi.newButton(params)
                 math.floor(self.icon:getHeight() / 2))
         end
         love.graphics.setColor(fg)
-        local yLine = self.y + self.h / 2
+    
+    
+    
+        local yLine = yLocal + self.y + self.h / 2
         yLine = yLine - (gooi.getFont(self):getHeight()) * #self.textParts / 2
         for i = 1, #self.textParts do
             local part = self.textParts[i]

gooi/component.lua

@@ -306,6 +306,7 @@ function component:draw()-- Every component has the same base:
 		end
 
     if self.bgImage then
+
 			love.graphics.setColor(1, 1, 1)
       love.graphics.draw(self.bgImage,
         math.floor(self.x),
@@ -320,6 +321,7 @@ function component:draw()-- Every component has the same base:
 		if style.showBorder then
 			love.graphics.setColor(newColor)
 			if not self.enabled then
+
 				love.graphics.setColor(1/4, 1/4, 1/4)
 			end
 			love.graphics.rectangle("line",
@@ -347,7 +349,6 @@ function component:drawShadowPressed()
                 50)
         end, "replace", 1)
         love.graphics.setStencilTest("greater", 0)
-
         love.graphics.setColor(1, 1, 1)
         love.graphics.draw(self.imgShadow,
             self.x + self.w / 2,

gooi/gooi.lua

@@ -337,6 +337,7 @@ end
 
 -- Draw the stuff:
 function gooi.draw(group)
+    love.graphics.origin() --to take in account scale,translate,rotate
     local actualGroup = group or "default"
 
     local prevFont  = love.graphics.getFont()

gooi/label.lua

@@ -68,7 +68,6 @@ function gooi.newLabel(params)
             local xImg = math.floor(self.x + self.h / 2)
             love.graphics.setColor(1, 1, 1)
             if not self.enabled then love.graphics.setColor(1/4, 1/4, 1/4) end
-
             if t:len() == 0 then
                 xImg = math.floor(self.x + self.w / 2)
             end