2016-01-10 08:39:14 +01:00
|
|
|
---------------------------------------------------------------------------
|
|
|
|
--- A layout filling all the available space. Each widget is assigned a
|
|
|
|
-- ratio (percentage) of the total space. Multiple methods are available to
|
|
|
|
-- ajust this ratio.
|
2016-05-25 21:23:51 +02:00
|
|
|
--
|
|
|
|
--@DOC_wibox_layout_defaults_ratio_EXAMPLE@
|
2016-01-10 08:39:14 +01:00
|
|
|
-- @author Emmanuel Lepage Vallee
|
|
|
|
-- @copyright 2016 Emmanuel Lepage Vallee
|
|
|
|
-- @classmod wibox.layout.ratio
|
|
|
|
---------------------------------------------------------------------------
|
|
|
|
|
|
|
|
local base = require("wibox.widget.base" )
|
|
|
|
local flex = require("wibox.layout.flex" )
|
|
|
|
local table = table
|
|
|
|
local pairs = pairs
|
|
|
|
local floor = math.floor
|
|
|
|
local util = require("awful.util")
|
|
|
|
|
|
|
|
local ratio = {}
|
|
|
|
|
2016-05-09 07:37:12 +02:00
|
|
|
--@DOC_fixed_COMMON@
|
2016-01-10 08:39:14 +01:00
|
|
|
|
|
|
|
-- Compute the sum of all ratio (ideally, it should be 1)
|
|
|
|
local function gen_sum(self, i_s, i_e)
|
|
|
|
local sum, new_w = 0,0
|
|
|
|
|
2016-05-27 01:41:58 +02:00
|
|
|
for i = i_s or 1, i_e or #self._private.widgets do
|
|
|
|
if self._private.ratios[i] then
|
|
|
|
sum = sum + self._private.ratios[i]
|
2016-01-10 08:39:14 +01:00
|
|
|
else
|
|
|
|
new_w = new_w + 1
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
return sum, new_w
|
|
|
|
end
|
|
|
|
|
|
|
|
-- The ratios are expressed as percentages. For this to work, the sum of all
|
|
|
|
-- ratio must be 1. This function attempt to ajust them. Space can be taken
|
|
|
|
-- from or added to a ratio when widgets are being added or removed. If a
|
|
|
|
-- specific ratio must be enforced for a widget, it has to be done with the
|
|
|
|
-- `ajust_ratio` method after each insertion or deletion
|
|
|
|
local function normalize(self)
|
2016-05-27 01:41:58 +02:00
|
|
|
local count = #self._private.widgets
|
2016-01-10 08:39:14 +01:00
|
|
|
if count == 0 then return end
|
|
|
|
|
|
|
|
-- Instead of adding "if" everywhere, just handle this common case
|
|
|
|
if count == 1 then
|
2016-05-27 01:41:58 +02:00
|
|
|
self._private.ratios = { 1 }
|
2016-01-10 08:39:14 +01:00
|
|
|
return
|
|
|
|
end
|
|
|
|
|
|
|
|
local sum, new_w = gen_sum(self)
|
2016-05-27 01:41:58 +02:00
|
|
|
local old_count = #self._private.widgets - new_w
|
2016-01-10 08:39:14 +01:00
|
|
|
|
|
|
|
local to_add = (sum == 0) and 1 or (sum / old_count)
|
|
|
|
|
|
|
|
-- Make sure all widgets have a ratio
|
2016-05-27 01:41:58 +02:00
|
|
|
for i=1, #self._private.widgets do
|
|
|
|
if not self._private.ratios[i] then
|
|
|
|
self._private.ratios[i] = to_add
|
2016-01-10 08:39:14 +01:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
sum = sum + to_add*new_w
|
|
|
|
|
|
|
|
local delta, new_sum = (1 - sum) / count,0
|
|
|
|
|
|
|
|
-- Increase or decrease each ratio so it the sum become 1
|
2016-05-27 01:41:58 +02:00
|
|
|
for i=1, #self._private.widgets do
|
|
|
|
self._private.ratios[i] = self._private.ratios[i] + delta
|
|
|
|
new_sum = new_sum + self._private.ratios[i]
|
2016-01-10 08:39:14 +01:00
|
|
|
end
|
|
|
|
|
|
|
|
-- Floating points is not an exact science, but it should still be close
|
|
|
|
-- to 1.00.
|
|
|
|
assert(new_sum > 0.99 and new_sum < 1.01)
|
|
|
|
end
|
|
|
|
|
2016-02-07 14:13:43 +01:00
|
|
|
function ratio:layout(_, width, height)
|
2016-01-10 08:39:14 +01:00
|
|
|
local result = {}
|
2016-05-27 01:41:58 +02:00
|
|
|
local pos,spacing = 0, self._private.spacing
|
2016-01-10 08:39:14 +01:00
|
|
|
|
2016-05-27 01:41:58 +02:00
|
|
|
for k, v in ipairs(self._private.widgets) do
|
2016-02-07 14:13:43 +01:00
|
|
|
local space
|
2016-01-10 08:39:14 +01:00
|
|
|
local x, y, w, h
|
|
|
|
|
2016-05-27 01:41:58 +02:00
|
|
|
if self._private.dir == "y" then
|
|
|
|
space = height * self._private.ratios[k]
|
2016-01-10 08:39:14 +01:00
|
|
|
x, y = 0, util.round(pos)
|
|
|
|
w, h = width, floor(space)
|
|
|
|
else
|
2016-05-27 01:41:58 +02:00
|
|
|
space = width * self._private.ratios[k]
|
2016-01-10 08:39:14 +01:00
|
|
|
x, y = util.round(pos), 0
|
|
|
|
w, h = floor(space), height
|
|
|
|
end
|
|
|
|
|
|
|
|
table.insert(result, base.place_widget_at(v, x, y, w, h))
|
|
|
|
|
|
|
|
pos = pos + space + spacing
|
|
|
|
|
|
|
|
-- Make sure all widgets fit in the layout, if they aren't, something
|
|
|
|
-- went wrong
|
2016-05-27 01:41:58 +02:00
|
|
|
if (self._private.dir == "y" and util.round(pos) >= height) or
|
|
|
|
(self._private.dir ~= "y" and util.round(pos) >= width) then
|
2016-01-10 08:39:14 +01:00
|
|
|
break
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
return result
|
|
|
|
end
|
|
|
|
|
|
|
|
--- Increase the ratio of "widget"
|
|
|
|
-- If the increment produce an invalid ratio (not between 0 and 1), the method
|
|
|
|
-- do nothing.
|
|
|
|
-- @tparam number index The widget index to change
|
|
|
|
-- @tparam number increment An floating point value between -1 and 1 where the
|
|
|
|
-- end result is within 0 and 1
|
|
|
|
function ratio:inc_ratio(index, increment)
|
2016-05-27 01:41:58 +02:00
|
|
|
if #self._private.widgets == 1 or (not index) or (not self._private.ratios[index])
|
2016-01-10 08:39:14 +01:00
|
|
|
or increment < -1 or increment > 1 then
|
|
|
|
return
|
|
|
|
end
|
|
|
|
|
2016-05-27 01:41:58 +02:00
|
|
|
assert(self._private.ratios[index])
|
2016-01-10 08:39:14 +01:00
|
|
|
|
2016-05-27 01:41:58 +02:00
|
|
|
self:set_ratio(index, self._private.ratios[index] + increment)
|
2016-01-10 08:39:14 +01:00
|
|
|
end
|
|
|
|
|
|
|
|
--- Increment the ratio of the first instance of `widget`
|
|
|
|
-- If the increment produce an invalid ratio (not between 0 and 1), the method
|
|
|
|
-- do nothing.
|
|
|
|
-- @param widget The widget to ajust
|
|
|
|
-- @tparam number increment An floating point value between -1 and 1 where the
|
|
|
|
-- end result is within 0 and 1
|
|
|
|
function ratio:inc_widget_ratio(widget, increment)
|
|
|
|
if not widget or not increment then return end
|
|
|
|
|
|
|
|
local index = self:index(widget)
|
|
|
|
|
|
|
|
self:inc_ratio(index, increment)
|
|
|
|
end
|
|
|
|
|
|
|
|
--- Set the ratio of the widget at position `index`
|
|
|
|
-- @tparam number index The index of the widget to change
|
|
|
|
-- @tparam number percent An floating point value between 0 and 1
|
|
|
|
function ratio:set_ratio(index, percent)
|
2016-05-27 01:41:58 +02:00
|
|
|
if not percent or #self._private.widgets == 1 or not index or not self._private.widgets[index]
|
2016-01-10 08:39:14 +01:00
|
|
|
or percent < 0 or percent > 1 then
|
|
|
|
return
|
|
|
|
end
|
|
|
|
|
2016-05-27 01:41:58 +02:00
|
|
|
local old = self._private.ratios[index]
|
2016-01-10 08:39:14 +01:00
|
|
|
|
|
|
|
-- Remove what has to be cleared from all widget
|
2016-05-27 01:41:58 +02:00
|
|
|
local delta = ( (percent-old) / (#self._private.widgets-1) )
|
2016-01-10 08:39:14 +01:00
|
|
|
|
2016-05-27 01:41:58 +02:00
|
|
|
for k in pairs(self._private.widgets) do
|
|
|
|
self._private.ratios[k] = self._private.ratios[k] - delta
|
2016-01-10 08:39:14 +01:00
|
|
|
end
|
|
|
|
|
|
|
|
-- Set the new ratio
|
2016-05-27 01:41:58 +02:00
|
|
|
self._private.ratios[index] = percent
|
2016-01-10 08:39:14 +01:00
|
|
|
|
|
|
|
-- As some widgets may now have a slightly negative ratio, normalize again
|
|
|
|
normalize(self)
|
|
|
|
|
|
|
|
self:emit_signal("widget::layout_changed")
|
|
|
|
end
|
|
|
|
|
2016-03-06 14:46:13 +01:00
|
|
|
--- Get the ratio at `index`.
|
2016-03-04 06:24:38 +01:00
|
|
|
-- @tparam number index The widget index to query
|
|
|
|
-- @treturn number The index (between 0 and 1)
|
|
|
|
function ratio:get_ratio(index)
|
|
|
|
if not index then return end
|
2016-05-27 01:41:58 +02:00
|
|
|
return self._private.ratios[index]
|
2016-03-04 06:24:38 +01:00
|
|
|
end
|
|
|
|
|
2016-03-06 14:46:13 +01:00
|
|
|
--- Set the ratio of `widget` to `percent`.
|
|
|
|
-- @tparam widget widget The widget to ajust.
|
|
|
|
-- @tparam number percent A floating point value between 0 and 1.
|
2016-01-10 08:39:14 +01:00
|
|
|
function ratio:set_widget_ratio(widget, percent)
|
|
|
|
local index = self:index(widget)
|
|
|
|
|
|
|
|
self:set_ratio(index, percent)
|
|
|
|
end
|
|
|
|
|
|
|
|
--- Update all widgets to match a set of a ratio.
|
|
|
|
-- The sum of before, itself and after must be 1 or nothing will be done
|
|
|
|
-- @tparam number index The index of the widget to change
|
|
|
|
-- @tparam number before The sum of the ratio before the widget
|
|
|
|
-- @tparam number itself The ratio for "widget"
|
|
|
|
-- @tparam number after The sum of the ratio after the widget
|
|
|
|
function ratio:ajust_ratio(index, before, itself, after)
|
2016-05-27 01:41:58 +02:00
|
|
|
if not self._private.widgets[index] or not before or not itself or not after then
|
2016-01-10 08:39:14 +01:00
|
|
|
return
|
|
|
|
end
|
|
|
|
|
|
|
|
local sum = before + itself + after
|
|
|
|
|
|
|
|
-- As documented, it is the caller job to come up with valid numbers
|
|
|
|
if math.min(before, itself, after) < 0 then return end
|
|
|
|
if sum > 1.01 or sum < -0.99 then return end
|
|
|
|
|
|
|
|
-- Compute the before and after offset to be applied to each widgets
|
2016-05-27 01:41:58 +02:00
|
|
|
local before_count, after_count = index-1, #self._private.widgets - index
|
2016-01-10 08:39:14 +01:00
|
|
|
|
|
|
|
local b, a = gen_sum(self, 1, index-1), gen_sum(self, index+1)
|
|
|
|
|
|
|
|
local db, da = (before - b)/before_count, (after - a)/after_count
|
|
|
|
|
|
|
|
-- Apply the new ratio
|
2016-05-27 01:41:58 +02:00
|
|
|
self._private.ratios[index] = itself
|
2016-01-10 08:39:14 +01:00
|
|
|
|
|
|
|
-- Equality split the delta among widgets before and after
|
|
|
|
for i = 1, index -1 do
|
2016-05-27 01:41:58 +02:00
|
|
|
self._private.ratios[i] = self._private.ratios[i] + db
|
2016-01-10 08:39:14 +01:00
|
|
|
end
|
2016-05-27 01:41:58 +02:00
|
|
|
for i = index+1, #self._private.widgets do
|
|
|
|
self._private.ratios[i] = self._private.ratios[i] + da
|
2016-01-10 08:39:14 +01:00
|
|
|
end
|
|
|
|
|
|
|
|
-- Remove potential negative ratio
|
|
|
|
normalize(self)
|
|
|
|
|
|
|
|
self:emit_signal("widget::layout_changed")
|
|
|
|
end
|
|
|
|
|
|
|
|
--- Update all widgets to match a set of a ratio
|
|
|
|
-- @param widget The widget to ajust
|
|
|
|
-- @tparam number before The sum of the ratio before the widget
|
|
|
|
-- @tparam number itself The ratio for "widget"
|
|
|
|
-- @tparam number after The sum of the ratio after the widget
|
|
|
|
function ratio:ajust_widget_ratio(widget, before, itself, after)
|
|
|
|
local index = self:index(widget)
|
|
|
|
self:ajust_ratio(index, before, itself, after)
|
|
|
|
end
|
|
|
|
|
|
|
|
--- Add some widgets to the given fixed layout
|
2016-08-08 08:39:43 +02:00
|
|
|
-- **Signal:** widget::added The argument are the widgets
|
2016-01-10 08:39:14 +01:00
|
|
|
-- @tparam widget ... Widgets that should be added (must at least be one)
|
|
|
|
function ratio:add(...)
|
|
|
|
-- No table.pack in Lua 5.1 :-(
|
|
|
|
local args = { n=select('#', ...), ... }
|
|
|
|
assert(args.n > 0, "need at least one widget to add")
|
|
|
|
for i=1, args.n do
|
|
|
|
base.check_widget(args[i])
|
2016-05-27 01:41:58 +02:00
|
|
|
table.insert(self._private.widgets, args[i])
|
2016-01-10 08:39:14 +01:00
|
|
|
end
|
|
|
|
|
|
|
|
normalize(self)
|
|
|
|
self:emit_signal("widget::layout_changed")
|
2016-08-08 08:39:43 +02:00
|
|
|
self:emit_signal("widget::added", ...)
|
2016-01-10 08:39:14 +01:00
|
|
|
end
|
|
|
|
|
|
|
|
--- Remove a widget from the layout
|
2016-08-08 08:39:43 +02:00
|
|
|
-- **Signal:** widget::removed The arguments are the widget and the index
|
2016-01-10 08:39:14 +01:00
|
|
|
-- @tparam number index The widget index to remove
|
|
|
|
-- @treturn boolean index If the operation is successful
|
|
|
|
function ratio:remove(index)
|
2016-05-27 01:41:58 +02:00
|
|
|
if not index or not self._private.widgets[index] then return false end
|
2016-01-10 08:39:14 +01:00
|
|
|
|
2016-08-08 08:39:43 +02:00
|
|
|
local w = self._private.widgets[index]
|
|
|
|
|
2016-05-27 01:41:58 +02:00
|
|
|
table.remove(self._private.ratios, index)
|
|
|
|
table.remove(self._private.widgets, index)
|
2016-01-10 08:39:14 +01:00
|
|
|
|
|
|
|
normalize(self)
|
|
|
|
|
|
|
|
self:emit_signal("widget::layout_changed")
|
2016-08-08 08:39:43 +02:00
|
|
|
self:emit_signal("widget::removed", w, index)
|
2016-01-10 08:39:14 +01:00
|
|
|
|
|
|
|
return true
|
|
|
|
end
|
|
|
|
|
|
|
|
--- Insert a new widget in the layout at position `index`
|
2016-08-08 08:39:43 +02:00
|
|
|
-- **Signal:** widget::inserted The arguments are the widget and the index
|
2016-01-10 08:39:14 +01:00
|
|
|
-- @tparam number index The position
|
|
|
|
-- @param widget The widget
|
|
|
|
function ratio:insert(index, widget)
|
2016-05-27 01:41:58 +02:00
|
|
|
if not index or index < 1 or index > #self._private.widgets + 1 then return false end
|
2016-01-10 08:39:14 +01:00
|
|
|
|
|
|
|
base.check_widget(widget)
|
|
|
|
|
2016-05-27 01:41:58 +02:00
|
|
|
table.insert(self._private.widgets, index, widget)
|
2016-01-10 08:39:14 +01:00
|
|
|
|
|
|
|
normalize(self)
|
|
|
|
|
|
|
|
self:emit_signal("widget::layout_changed")
|
2016-08-08 08:39:43 +02:00
|
|
|
self:emit_signal("widget::inserted", widget, #self._private.widgets)
|
2016-01-10 08:39:14 +01:00
|
|
|
end
|
|
|
|
|
|
|
|
local function get_layout(dir, widget1, ...)
|
|
|
|
local ret = flex[dir](widget1, ...)
|
|
|
|
|
2016-05-27 01:41:58 +02:00
|
|
|
util.table.crush(ret, ratio, true)
|
2016-01-10 08:39:14 +01:00
|
|
|
|
2016-05-27 01:41:58 +02:00
|
|
|
ret._private.fill_space = nil
|
2016-01-10 08:39:14 +01:00
|
|
|
|
2016-05-27 01:41:58 +02:00
|
|
|
ret._private.ratios = {}
|
2016-01-10 08:39:14 +01:00
|
|
|
|
|
|
|
return ret
|
|
|
|
end
|
|
|
|
|
|
|
|
--- Returns a new horizontal ratio layout. A ratio layout shares the available space
|
|
|
|
-- equally among all widgets. Widgets can be added via :add(widget).
|
|
|
|
-- @tparam widget ... Widgets that should be added to the layout.
|
|
|
|
function ratio.horizontal(...)
|
|
|
|
return get_layout("horizontal", ...)
|
|
|
|
end
|
|
|
|
|
|
|
|
--- Returns a new vertical ratio layout. A ratio layout shares the available space
|
|
|
|
-- equally among all widgets. Widgets can be added via :add(widget).
|
|
|
|
-- @tparam widget ... Widgets that should be added to the layout.
|
|
|
|
function ratio.vertical(...)
|
|
|
|
return get_layout("vertical", ...)
|
|
|
|
end
|
|
|
|
|
2016-05-27 01:41:58 +02:00
|
|
|
--@DOC_widget_COMMON@
|
|
|
|
|
|
|
|
--@DOC_object_COMMON@
|
|
|
|
|
2016-01-10 08:39:14 +01:00
|
|
|
return ratio
|
|
|
|
|
|
|
|
-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
|