Slick default style

1 files changed, 82 insertions, 48 deletions

diff --git a/style-default.lua b/style-default.lua
index 1514c8e..bb4920e 100644
--- a/style-default.lua
+++ b/style-default.lua
@@ -26,116 +26,150 @@ THE SOFTWARE.
 
 -- default style
 local color = {
-	normal = {bg = {128,128,128,200}, fg = {59,59,59,200}},
-	hot    = {bg = {145,153,153,200}, fg = {60,61,54,200}},
-	active = {bg = {145,153,153,255}, fg = {60,61,54,255}}
+--	normal = {bg = {180,180,180}, fg = {48,48,48},  border={100,100,100}},
+--	hot    = {bg = {215,215,215}, fg = {52,65,160}, border={100,100,100}},
+--	active = {bg = {230,230,230}, fg = {69,84,201}, border={100,100,100}}
+	normal = {bg = {78,78,78}, fg = {200,200,200}, border={20,20,20}},
+	hot    = {bg = {98,98,98}, fg = {69,201,84},   border={30,30,30}},
+	active = {bg = {88,88,88}, fg = {49,181,64},   border={10,10,10}}
 }
 
+-- box drawing
+local gradient = {}
+function gradient:set(from, to)
+	local id = love.image.newImageData(1,2)
+	id:setPixel(0,0, to,to,to,255)
+	id:setPixel(0,1, from,from,from,255)
+	gradient.img = love.graphics.newImage(id)
+	gradient.img:setFilter('linear', 'linear')
+end
+gradient:set(200,255)
+
+local function box(x,y,w,h, bg, border, flip)
+	love.graphics.setLine(1, 'rough')
+
+	love.graphics.setColor(bg)
+	local sy = flip and -h/2 or h/2
+	love.graphics.draw(gradient.img, x,y+h/2, 0,w,sy, 0,1)
+	love.graphics.setColor(border)
+	love.graphics.rectangle('line', x,y,w,h)
+end
+
 -- load default font
 if not love.graphics.getFont() then
 	love.graphics.setFont(love.graphics.newFont(12))
 end
 
-local function widgetHit(xx,yy, x,y,w,h)
-	return xx >= x and xx <= x+w and yy >= y and yy <= y+h
-end
-
 local function Button(state, title, x,y,w,h)
 	local c = color[state]
-	love.graphics.setColor(c.bg)
-	love.graphics.rectangle('fill', x,y,w,h)
+	box(x,y,w,h, c.bg, c.border, state == 'active')
+	local f = assert(love.graphics.getFont())
+	x,y = x + (w-f:getWidth(title))/2, y + (h-f:getHeight(title))/2
 	love.graphics.setColor(c.fg)
-	local f = love.graphics.getFont()
-	love.graphics.print(title, x + (w-f:getWidth(title))/2, y + (h-f:getHeight(title))/2)
+	love.graphics.print(title, x,y)
 end
 
-local function Label(state, text, x,y,w,h,align)
+local function Label(state, text, align, x,y,w,h)
 	local c = color[state]
 	love.graphics.setColor(c.fg)
 	local f = assert(love.graphics.getFont())
+	y = y + (h - f:getHeight(text))/2
 	if align == 'center' then
 		x = x + (w - f:getWidth(text))/2
-		y = y + (h - f:getHeight(text))/2
 	elseif align == 'right' then
 		x = x + w - f:getWidth(text)
-		y = y + h - f:getHeight(text)
 	end
 	love.graphics.print(text, x,y)
 end
 
-local function Slider(state, fraction, x,y,w,h, vertical)
+local function Slider(state, fraction, vertical, x,y,w,h)
 	local c = color[state]
+	
+	love.graphics.setLineWidth(2)
+	love.graphics.setColor(c.border)
+	love.graphics.line(x,y+h/2-1,x+w,y+h/2-1)
+	love.graphics.line(x,y+h/2+1,x+w,y+h/2+1)
 	love.graphics.setColor(c.bg)
-	love.graphics.rectangle('fill', x,y,w,h)
+	love.graphics.line(x,y+h/2,x+w,y+h/2)
 
-	love.graphics.setColor(c.fg)
-	local hw,hh = w,h
 	if vertical then
-		hh = h * fraction
-		y = y + (h - hh)
+		y = math.floor(y + h * fraction - 5)
+		h = 10
 	else
-		hw = w * fraction
+		x = math.floor(x + w * fraction - 5)
+		w = 10
 	end
-	love.graphics.rectangle('fill', x,y,hw,hh)
+	box(x,y,w,h, c.bg,c.border)
 end
 
 local function Slider2D(state, fraction, x,y,w,h)
 	local c = color[state]
-	love.graphics.setColor(c.bg)
-	love.graphics.rectangle('fill', x,y,w,h)
+	box(x,y,w,h, c.bg, c.border)
 
 	-- draw quadrants
-	local lw = love.graphics.getLineWidth()
-	love.graphics.setLineWidth(1)
-	love.graphics.setColor(c.fg[1], c.fg[2], c.fg[3], math.min(c.fg[4], 127))
+	love.graphics.setLine(1, 'rough')
+	love.graphics.setColor(c.fg[1], c.fg[2], c.fg[3], math.min(127,c.fg[4] or 255))
 	love.graphics.line(x+w/2,y, x+w/2,y+h)
 	love.graphics.line(x,y+h/2, x+w,y+h/2)
-	love.graphics.setLineWidth(lw)
 
 	-- draw cursor
-	local xx = x + fraction.x * w
-	local yy = y + fraction.y * h
+	local xx = math.ceil(x + fraction[1] * w)
+	local yy = math.ceil(y + fraction[2] * h)
 	love.graphics.setColor(c.fg)
-	love.graphics.circle('fill', xx,yy,4,4)
+	love.graphics.line(xx-3,yy,xx+2,yy)
+	love.graphics.line(xx,yy-3,xx,yy+2)
 end
 
 local function Input(state, text, cursor, x,y,w,h)
 	local c = color[state]
-	love.graphics.setColor(c.bg)
-	love.graphics.rectangle('fill', x,y,w,h)
-	love.graphics.setColor(c.fg)
-
-	local lw = love.graphics.getLineWidth()
-	love.graphics.setLineWidth(1)
-	love.graphics.rectangle('line', x,y,w,h)
+	box(x,y,w,h, c.bg, c.border, state ~= 'active')
 
 	local f = love.graphics.getFont()
 	local th = f:getHeight(text)
 	local cursorPos = x + 2 + f:getWidth(text:sub(1,cursor))
 
+	love.graphics.setLine(1, 'rough')
+	love.graphics.setColor(color.normal.fg)
 	love.graphics.print(text, x+2,y+(h-th)/2)
+	love.graphics.setColor(color.active.fg)
 	love.graphics.line(cursorPos, y+4, cursorPos, y+h-4)
-
-	love.graphics.setLineWidth(lw)
 end
 
-local function Checkbox(state, checked, x,y,w,h)
+local function Checkbox(state, checked, label, align, x,y,w,h)
 	local c = color[state]
-	love.graphics.setColor(c.bg)
-	love.graphics.rectangle('fill', x,y,w,h)
-	love.graphics.setColor(c.fg)
-	love.graphics.rectangle('line', x,y,w,h)
+	local bw, bx, by  = math.min(w,h)*.7, x, y
+	by = y + (h-bw)/2
+
+	local f = assert(love.graphics.getFont())
+	local tw,th = f:getWidth(label), f:getHeight(label)
+	local tx, ty = x, y + (h-th)/2
+	if align == 'left' then
+		-- [ ] LABEL
+		bx, tx = x, x+bw+4
+	else
+		-- LABEL [ ]
+		tx, bx = x, x+4+tw
+	end
+
+	box(bx,by,bw,bw, c.bg, c.border)
+
 	if checked then
-		local r = math.max(math.min(w/7,h/7), 2)
-		love.graphics.rectangle('fill', x+r,y+r, w-2*r,h-2*r)
+		bx,by = bx+bw*.25, by+bw*.25
+		bw = bw * .5
+		love.graphics.setColor(color.active.fg)
+		box(bx,by,bw,bw, color.hot.fg, {0,0,0,0}, true)
 	end
+
+	love.graphics.setColor(c.fg)
+	love.graphics.print(label, tx, ty)
 end
 
 
 -- the style
 return {
-	widgetHit  = widgetHit,
 	color    = color,
+	gradient = gradient,
+
 	Button   = Button,
 	Label    = Label,
 	Slider   = Slider,