diff options
| author | Matthias Richter <vrld@vrld.org> | 2012-03-14 16:19:46 +0100 |
|---|---|---|
| committer | Matthias Richter <vrld@vrld.org> | 2012-03-14 16:19:46 +0100 |
| commit | 6de65888dc6575a00d4e16defe92bcb0ccf08423 (patch) | |
| tree | 24a22f6780a1a8a38b8c7c01cba93ce372f10ab4 /slider2d.lua | |
| parent | 2e5927e963ed0652a512291d243403fa48a72cc0 (diff) | |
| download | Quickie-6de65888dc6575a00d4e16defe92bcb0ccf08423.tar.gz Quickie-6de65888dc6575a00d4e16defe92bcb0ccf08423.tar.bz2 Quickie-6de65888dc6575a00d4e16defe92bcb0ccf08423.tar.xz Quickie-6de65888dc6575a00d4e16defe92bcb0ccf08423.zip | |
Externalize widget hit test to style definition.
Diffstat (limited to 'slider2d.lua')
| -rw-r--r-- | slider2d.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/slider2d.lua b/slider2d.lua index 8614113..3a97ad9 100644 --- a/slider2d.lua +++ b/slider2d.lua @@ -1,6 +1,6 @@ local core = require((...):match("(.-)[^%.]+$") .. 'core') -return function(info, x,y,w,h, draw) +return function(info, x,y,w,h, widgetHit, draw) assert(type(info) == 'table' and type(info.value) == "table", "Incomplete slider value info") info.min = info.min or {x = 0, y = 0} info.max = info.max or {x = math.max(info.value.x or 0, 1), y = math.max(info.value.y or 0, 1)} @@ -11,7 +11,7 @@ return function(info, x,y,w,h, draw) } local id = core.generateID() - core.mouse.updateState(id, x,y,w,h) + core.mouse.updateState(id, widgetHit or core.style.widgetHit, x,y,w,h) core.makeCyclable(id) core.registerDraw(id,draw or core.style.Slider2D, fraction, x,y,w,h) |