Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

wibox.layout.base: Use math.min/max 

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter 2013-01-05 20:50:17 +01:00
parent e653b0a652
commit ae69b2db03
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/wibox/layout/base.lua.in
View File

@ -7,6 +7,8 @@
local pairs = pairs local pairs = pairs
local pcall = pcall local pcall = pcall
local print = print local print = print
local min = math.min
local max = math.max
-- wibox.layout.base -- wibox.layout.base
local base = {} local base = {}
@ -14,15 +16,6 @@ local base = {}
--- Figure out the geometry in device coordinate space. This will break if --- Figure out the geometry in device coordinate space. This will break if
-- someone rotates the coordinate space by a non-multiple of 90°. -- someone rotates the coordinate space by a non-multiple of 90°.
function base.rect_to_device_geometry(cr, x, y, width, height) function base.rect_to_device_geometry(cr, x, y, width, height)
local function min(a, b)
if a < b then return a end
return b
end
local function max(a, b)
if a > b then return a end
return b
end
local x1, y1 = cr:user_to_device(x, y) local x1, y1 = cr:user_to_device(x, y)
local x2, y2 = cr:user_to_device(x + width, y + height) local x2, y2 = cr:user_to_device(x + width, y + height)
local x = min(x1, x2) local x = min(x1, x2)