library-mirrors/LoveFrames
1
0
Fork 0
mirror of https://github.com/linux-man/LoveFrames.git synced 2024-11-26 05:14:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge https://github.com/KennyShields/LoveFrames

Browse Source
This commit is contained in:
Stepets 2014-11-09 18:48:03 +03:00
commit 34a84f6823
2 changed files with 83 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
init.lua
View File

@ -23,6 +23,7 @@ loveframes.config["DEFAULTSKIN"] = "Blue"
loveframes.config["ACTIVESKIN"] = "Blue" loveframes.config["ACTIVESKIN"] = "Blue"
loveframes.config["INDEXSKINIMAGES"] = true loveframes.config["INDEXSKINIMAGES"] = true
loveframes.config["DEBUG"] = false loveframes.config["DEBUG"] = false
loveframes.config["ENABLE_SYSTEM_CURSORS"] = true
-- misc library vars -- misc library vars
loveframes.state = "none" loveframes.state = "none"
@ -34,6 +35,7 @@ loveframes.modalobject = false
loveframes.inputobject = false loveframes.inputobject = false
loveframes.downobject = false loveframes.downobject = false
loveframes.resizeobject = false loveframes.resizeobject = false
loveframes.dragobject = false
loveframes.hover = false loveframes.hover = false
loveframes.input_cursor_set = false loveframes.input_cursor_set = false
loveframes.prevcursor = nil loveframes.prevcursor = nil
@ -86,6 +88,7 @@ function loveframes.update(dt)
end end
end end
if loveframes.config["ENABLE_SYSTEM_CURSORS"] then
local hoverobject = loveframes.hoverobject local hoverobject = loveframes.hoverobject
local arrow = love.mouse.getSystemCursor("arrow") local arrow = love.mouse.getSystemCursor("arrow")
local curcursor = love.mouse.getCursor() local curcursor = love.mouse.getCursor()
@ -165,6 +168,7 @@ function loveframes.update(dt)
love.mouse.setCursor(arrow) love.mouse.setCursor(arrow)
end end
end end
end
loveframes.collisions = {} loveframes.collisions = {}
base:update(dt) base:update(dt)

9
objects/frame.lua
View File

@ -506,12 +506,14 @@ function newobject:mousepressed(x, y, button)
self.clicky = y - self.staticy self.clicky = y - self.staticy
end end
self.dragging = true self.dragging = true
loveframes.dragobject = self
end end
end end
if not self.resizing and self.canresize and loveframes.hoverobject == self then if not self.resizing and self.canresize and loveframes.hoverobject == self then
if loveframes.util.BoundingBox(self.x, x, self.y, y, 5, 1, 5, 1) then if loveframes.util.BoundingBox(self.x, x, self.y, y, 5, 1, 5, 1) then
self.resizing = true self.resizing = true
self.dragging = false self.dragging = false
loveframes.dragobject = false
self.resize_mode = "top_left" self.resize_mode = "top_left"
self.resizex = x self.resizex = x
self.resizey = y self.resizey = y
@ -541,6 +543,7 @@ function newobject:mousepressed(x, y, button)
elseif loveframes.util.BoundingBox(self.x + self.width - 5, x, self.y, y, 5, 1, 5, 1) then elseif loveframes.util.BoundingBox(self.x + self.width - 5, x, self.y, y, 5, 1, 5, 1) then
self.resizing = true self.resizing = true
self.dragging = false self.dragging = false
loveframes.dragobject = false
self.resize_mode = "top_right" self.resize_mode = "top_right"
self.resizex = x self.resizex = x
self.resizey = y self.resizey = y
@ -556,6 +559,7 @@ function newobject:mousepressed(x, y, button)
elseif loveframes.util.BoundingBox(self.x, x, self.y + self.height - 5, y, 5, 1, 5, 1) then elseif loveframes.util.BoundingBox(self.x, x, self.y + self.height - 5, y, 5, 1, 5, 1) then
self.resizing = true self.resizing = true
self.dragging = false self.dragging = false
loveframes.dragobject = false
self.resize_mode = "bottom_left" self.resize_mode = "bottom_left"
self.resizex = x self.resizex = x
self.resizey = y self.resizey = y
@ -571,6 +575,7 @@ function newobject:mousepressed(x, y, button)
elseif loveframes.util.BoundingBox(self.x + 5, x, self.y, y, self.width - 10, 1, 2, 1) then elseif loveframes.util.BoundingBox(self.x + 5, x, self.y, y, self.width - 10, 1, 2, 1) then
self.resizing = true self.resizing = true
self.dragging = false self.dragging = false
loveframes.dragobject = false
self.resize_mode = "top" self.resize_mode = "top"
self.resizex = x self.resizex = x
self.resizey = y self.resizey = y
@ -583,6 +588,7 @@ function newobject:mousepressed(x, y, button)
elseif loveframes.util.BoundingBox(self.x + 5, x, self.y + self.height - 2, y, self.width - 10, 1, 2, 1) then elseif loveframes.util.BoundingBox(self.x + 5, x, self.y + self.height - 2, y, self.width - 10, 1, 2, 1) then
self.resizing = true self.resizing = true
self.dragging = false self.dragging = false
loveframes.dragobject = false
self.resize_mode = "bottom" self.resize_mode = "bottom"
self.resizex = x self.resizex = x
self.resizey = y self.resizey = y
@ -595,6 +601,7 @@ function newobject:mousepressed(x, y, button)
elseif loveframes.util.BoundingBox(self.x, x, self.y + 5, y, 2, 1, self.height - 10, 1) then elseif loveframes.util.BoundingBox(self.x, x, self.y + 5, y, 2, 1, self.height - 10, 1) then
self.resizing = true self.resizing = true
self.dragging = false self.dragging = false
loveframes.dragobject = false
self.resize_mode = "left" self.resize_mode = "left"
self.resizex = x self.resizex = x
self.resizey = y self.resizey = y
@ -607,6 +614,7 @@ function newobject:mousepressed(x, y, button)
elseif loveframes.util.BoundingBox(self.x + self.width - 2, x, self.y + 5, y, 2, 1, self.height - 10, 1) then elseif loveframes.util.BoundingBox(self.x + self.width - 2, x, self.y + 5, y, 2, 1, self.height - 10, 1) then
self.resizing = true self.resizing = true
self.dragging = false self.dragging = false
loveframes.dragobject = false
self.resize_mode = "right" self.resize_mode = "right"
self.resizex = x self.resizex = x
self.resizey = y self.resizey = y
@ -656,6 +664,7 @@ function newobject:mousereleased(x, y, button)
local internals = self.internals local internals = self.internals
self.dragging = false self.dragging = false
loveframes.dragobject = false
if self.resizing then if self.resizing then
self.resizex = 0 self.resizex = 0