diff options
| author | mkosler <marekkpie@gmail.com> | 2012-02-21 12:50:21 -0600 |
|---|---|---|
| committer | mkosler <marekkpie@gmail.com> | 2012-02-21 12:50:21 -0600 |
| commit | d51babb366d1a46ebe978111ad0b31bfddf95913 (patch) | |
| tree | e9ccd0118f73463d657054b9cac3ce1be0f84e0f /core.lua | |
| parent | 541145560a3b35ad5d37ca76e301c07e32cd4eb0 (diff) | |
| parent | a094675a49cf4ab011ddb15fd1bc21632caceb9c (diff) | |
| download | Quickie-d51babb366d1a46ebe978111ad0b31bfddf95913.tar.gz Quickie-d51babb366d1a46ebe978111ad0b31bfddf95913.tar.bz2 Quickie-d51babb366d1a46ebe978111ad0b31bfddf95913.tar.xz Quickie-d51babb366d1a46ebe978111ad0b31bfddf95913.zip | |
Merge branch 'master' of git://github.com/vrld/Quickie.git
Diffstat (limited to 'core.lua')
| -rwxr-xr-x | core.lua | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,5 +1,6 @@ -- state local context = {maxid = 0} +local draw_items = {n = 0} local NO_WIDGET = function()end local function generateID() @@ -97,7 +98,6 @@ local function save_unpack(t, i) return t[i], save_unpack(t, i+1) end -local draw_items = {n = 0} local function registerDraw(id, f, ...) assert(type(f) == 'function' or (getmetatable(f) or {}).__call, 'Drawing function is not a callable type!') @@ -151,7 +151,7 @@ return { hasKeyFocus = hasKeyFocus, makeTabable = makeTabable, - style = require((...):match("^(.+)%.[^%.]+") .. '.style-default'), + style = require((...):match("(.-)[^%.]+$") .. '.style-default'), color = color, registerDraw = registerDraw, draw = draw, |