diff --git a/init.lua b/init.lua index f099af6..419c635 100644 --- a/init.lua +++ b/init.lua @@ -23,6 +23,7 @@ loveframes.config["DEFAULTSKIN"] = "Blue" loveframes.config["ACTIVESKIN"] = "Blue" loveframes.config["INDEXSKINIMAGES"] = true loveframes.config["DEBUG"] = false +loveframes.config["ENABLE_SYSTEM_CURSORS"] = true -- misc library vars loveframes.state = "none" @@ -34,6 +35,7 @@ loveframes.modalobject = false loveframes.inputobject = false loveframes.downobject = false loveframes.resizeobject = false +loveframes.dragobject = false loveframes.hover = false loveframes.input_cursor_set = false loveframes.prevcursor = nil @@ -86,84 +88,86 @@ function loveframes.update(dt) end end - local hoverobject = loveframes.hoverobject - local arrow = love.mouse.getSystemCursor("arrow") - local curcursor = love.mouse.getCursor() - if hoverobject then - local ibeam = love.mouse.getSystemCursor("ibeam") - local mx, my = love.mouse.getPosition() - if hoverobject.type == "textinput" and not loveframes.resizeobject then - if curcursor ~= ibeam then - love.mouse.setCursor(ibeam) - end - elseif hoverobject.type == "frame" then - if not hoverobject.dragging and hoverobject.canresize then - if loveframes.util.BoundingBox(hoverobject.x, mx, hoverobject.y, my, 5, 1, 5, 1) then - local sizenwse = love.mouse.getSystemCursor("sizenwse") - if curcursor ~= sizenwse then - love.mouse.setCursor(sizenwse) - end - elseif loveframes.util.BoundingBox(hoverobject.x + hoverobject.width - 5, mx, hoverobject.y + hoverobject.height - 5, my, 5, 1, 5, 1) then - local sizenwse = love.mouse.getSystemCursor("sizenwse") - if curcursor ~= sizenwse then - love.mouse.setCursor(sizenwse) - end - elseif loveframes.util.BoundingBox(hoverobject.x + hoverobject.width - 5, mx, hoverobject.y, my, 5, 1, 5, 1) then - local sizenesw = love.mouse.getSystemCursor("sizenesw") - if curcursor ~= sizenesw then - love.mouse.setCursor(sizenesw) - end - elseif loveframes.util.BoundingBox(hoverobject.x, mx, hoverobject.y + hoverobject.height - 5, my, 5, 1, 5, 1) then - local sizenesw = love.mouse.getSystemCursor("sizenesw") - if curcursor ~= sizenesw then - love.mouse.setCursor(sizenesw) - end - elseif loveframes.util.BoundingBox(hoverobject.x + 5, mx, hoverobject.y, my, hoverobject.width - 10, 1, 2, 1) then - local sizens = love.mouse.getSystemCursor("sizens") - if curcursor ~= sizens then - love.mouse.setCursor(sizens) - end - elseif loveframes.util.BoundingBox(hoverobject.x + 5, mx, hoverobject.y + hoverobject.height - 2, my, hoverobject.width - 10, 1, 2, 1) then - local sizens = love.mouse.getSystemCursor("sizens") - if curcursor ~= sizens then - love.mouse.setCursor(sizens) - end - elseif loveframes.util.BoundingBox(hoverobject.x, mx, hoverobject.y + 5, my, 2, 1, hoverobject.height - 10, 1) then - local sizewe = love.mouse.getSystemCursor("sizewe") - if curcursor ~= sizewe then - love.mouse.setCursor(sizewe) - end - elseif loveframes.util.BoundingBox(hoverobject.x + hoverobject.width - 2, mx, hoverobject.y + 5, my, 2, 1, hoverobject.height - 10, 1) then - local sizewe = love.mouse.getSystemCursor("sizewe") - if curcursor ~= sizewe then - love.mouse.setCursor(sizewe) - end - else - if not loveframes.resizeobject then - local arrow = love.mouse.getSystemCursor("arrow") - if curcursor ~= arrow then - love.mouse.setCursor(arrow) + if loveframes.config["ENABLE_SYSTEM_CURSORS"] then + local hoverobject = loveframes.hoverobject + local arrow = love.mouse.getSystemCursor("arrow") + local curcursor = love.mouse.getCursor() + if hoverobject then + local ibeam = love.mouse.getSystemCursor("ibeam") + local mx, my = love.mouse.getPosition() + if hoverobject.type == "textinput" and not loveframes.resizeobject then + if curcursor ~= ibeam then + love.mouse.setCursor(ibeam) + end + elseif hoverobject.type == "frame" then + if not hoverobject.dragging and hoverobject.canresize then + if loveframes.util.BoundingBox(hoverobject.x, mx, hoverobject.y, my, 5, 1, 5, 1) then + local sizenwse = love.mouse.getSystemCursor("sizenwse") + if curcursor ~= sizenwse then + love.mouse.setCursor(sizenwse) + end + elseif loveframes.util.BoundingBox(hoverobject.x + hoverobject.width - 5, mx, hoverobject.y + hoverobject.height - 5, my, 5, 1, 5, 1) then + local sizenwse = love.mouse.getSystemCursor("sizenwse") + if curcursor ~= sizenwse then + love.mouse.setCursor(sizenwse) + end + elseif loveframes.util.BoundingBox(hoverobject.x + hoverobject.width - 5, mx, hoverobject.y, my, 5, 1, 5, 1) then + local sizenesw = love.mouse.getSystemCursor("sizenesw") + if curcursor ~= sizenesw then + love.mouse.setCursor(sizenesw) + end + elseif loveframes.util.BoundingBox(hoverobject.x, mx, hoverobject.y + hoverobject.height - 5, my, 5, 1, 5, 1) then + local sizenesw = love.mouse.getSystemCursor("sizenesw") + if curcursor ~= sizenesw then + love.mouse.setCursor(sizenesw) + end + elseif loveframes.util.BoundingBox(hoverobject.x + 5, mx, hoverobject.y, my, hoverobject.width - 10, 1, 2, 1) then + local sizens = love.mouse.getSystemCursor("sizens") + if curcursor ~= sizens then + love.mouse.setCursor(sizens) + end + elseif loveframes.util.BoundingBox(hoverobject.x + 5, mx, hoverobject.y + hoverobject.height - 2, my, hoverobject.width - 10, 1, 2, 1) then + local sizens = love.mouse.getSystemCursor("sizens") + if curcursor ~= sizens then + love.mouse.setCursor(sizens) + end + elseif loveframes.util.BoundingBox(hoverobject.x, mx, hoverobject.y + 5, my, 2, 1, hoverobject.height - 10, 1) then + local sizewe = love.mouse.getSystemCursor("sizewe") + if curcursor ~= sizewe then + love.mouse.setCursor(sizewe) + end + elseif loveframes.util.BoundingBox(hoverobject.x + hoverobject.width - 2, mx, hoverobject.y + 5, my, 2, 1, hoverobject.height - 10, 1) then + local sizewe = love.mouse.getSystemCursor("sizewe") + if curcursor ~= sizewe then + love.mouse.setCursor(sizewe) + end + else + if not loveframes.resizeobject then + local arrow = love.mouse.getSystemCursor("arrow") + if curcursor ~= arrow then + love.mouse.setCursor(arrow) + end end end end + elseif hoverobject.type == "text" and hoverobject.linkcol and not loveframes.resizeobject then + local hand = love.mouse.getSystemCursor("hand") + if curcursor ~= hand then + love.mouse.setCursor(hand) + end end - elseif hoverobject.type == "text" and hoverobject.linkcol and not loveframes.resizeobject then - local hand = love.mouse.getSystemCursor("hand") - if curcursor ~= hand then - love.mouse.setCursor(hand) + if curcursor ~= arrow then + if hoverobject.type ~= "textinput" and hoverobject.type ~= "frame" and not hoverobject.linkcol and not loveframes.resizeobject then + love.mouse.setCursor(arrow) + elseif hoverobject.type ~= "textinput" and curcursor == ibeam then + love.mouse.setCursor(arrow) + end end - end - if curcursor ~= arrow then - if hoverobject.type ~= "textinput" and hoverobject.type ~= "frame" and not hoverobject.linkcol and not loveframes.resizeobject then - love.mouse.setCursor(arrow) - elseif hoverobject.type ~= "textinput" and curcursor == ibeam then + else + if curcursor ~= arrow and not loveframes.resizeobject then love.mouse.setCursor(arrow) end end - else - if curcursor ~= arrow and not loveframes.resizeobject then - love.mouse.setCursor(arrow) - end end loveframes.collisions = {} diff --git a/objects/frame.lua b/objects/frame.lua index f4ff33f..a093ebc 100644 --- a/objects/frame.lua +++ b/objects/frame.lua @@ -506,12 +506,14 @@ function newobject:mousepressed(x, y, button) self.clicky = y - self.staticy end self.dragging = true + loveframes.dragobject = self end end 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 self.resizing = true self.dragging = false + loveframes.dragobject = false self.resize_mode = "top_left" self.resizex = x 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 self.resizing = true self.dragging = false + loveframes.dragobject = false self.resize_mode = "top_right" self.resizex = x 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 self.resizing = true self.dragging = false + loveframes.dragobject = false self.resize_mode = "bottom_left" self.resizex = x 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 self.resizing = true self.dragging = false + loveframes.dragobject = false self.resize_mode = "top" self.resizex = x 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 self.resizing = true self.dragging = false + loveframes.dragobject = false self.resize_mode = "bottom" self.resizex = x 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 self.resizing = true self.dragging = false + loveframes.dragobject = false self.resize_mode = "left" self.resizex = x 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 self.resizing = true self.dragging = false + loveframes.dragobject = false self.resize_mode = "right" self.resizex = x self.resizey = y @@ -656,6 +664,7 @@ function newobject:mousereleased(x, y, button) local internals = self.internals self.dragging = false + loveframes.dragobject = false if self.resizing then self.resizex = 0