awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #408 from psychon/strict-fit 

Strict fit

Closes https://github.com/awesomeWM/awesome/pull/408.
This commit is contained in:
Daniel Hahler 2015-09-02 22:12:09 +02:00
parent 62622f7935 bcc1751fca
commit f957d1f96b
7 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/wibox/layout/align.lua
View File

@ -31,6 +31,9 @@ function align:draw(context, cr, width, height)
local size_first = 0
-- start with all the space given by the parent, subtract as we go along
local size_remains = self.dir == "y" and height or width
-- This is only set & used if expand ~= "inside" and we have second width.
-- It contains the size allocated to the second widget.
local size_second
-- we will prioritize the middle widget unless the expand mode is "inside"
-- if it is, we prioritize the first widget by not doing this block also,
@ -38,7 +41,7 @@ function align:draw(context, cr, width, height)
-- instead
if self._expand ~= "inside" and self.second then
local w, h = base.fit_widget(context, self.second, width, height)
local size_second = self.dir == "y" and h or w
size_second = self.dir == "y" and h or w
-- if all the space is taken, skip the rest, and draw just the middle
-- widget
if size_second >= size_remains then
@ -123,10 +126,10 @@ function align:draw(context, cr, width, height)
end
else
if self.dir == "y" then
_, h = base.fit_widget(context, self.second, width, size_remains)
_, h = base.fit_widget(context, self.second, width, size_second)
y = floor( (height - h)/2 )
else
w, _ = base.fit_widget(context, self.second, width, size_remains)
w, _ = base.fit_widget(context, self.second, size_second, height)
x = floor( (width -w)/2 )
end
end

7
lib/wibox/layout/base.lua
View File

@ -26,7 +26,12 @@ function base.fit_widget(context, widget, width, height)
local width = math.max(0, width)
local height = math.max(0, height)
return widget._fit_geometry_cache:get(context, width, height)
local w, h = widget._fit_geometry_cache:get(context, width, height)
-- Also sanitize the output.
w = math.max(0, math.min(w, width))
h = math.max(0, math.min(h, height))
return w, h
end
--- Draw a widget via a cairo context

4
lib/wibox/layout/flex.lua
View File

@ -80,8 +80,8 @@ function flex:fit(context, orig_width, orig_height)
local used_in_other = 0
-- Figure out the maximum size we can give out to sub-widgets
local sub_height = self.dir == "x" and orig_height or floor(orig_height / #self.widgets)
local sub_width = self.dir == "y" and orig_width or floor(orig_width / #self.widgets)
local sub_height = self.dir == "x" and orig_height or orig_height / #self.widgets
local sub_width = self.dir == "y" and orig_width or orig_width / #self.widgets
for k, v in pairs(self.widgets) do
local w, h = base.fit_widget(context, v, sub_width, sub_height)

23
spec/wibox/layout/align_spec.lua
View File

@ -56,8 +56,7 @@ describe("wibox.layout.flex", function()
describe("without enough height", function()
it("fit", function()
-- XXX: Is this really what should happen?
assert.widget_fit(layout, { 5, 100 }, { 15, 35 })
assert.widget_fit(layout, { 5, 100 }, { 5, 35 })
end)
it("draw", function()
@ -72,16 +71,14 @@ describe("wibox.layout.flex", function()
describe("without enough width", function()
it("fit", function()
-- XXX: Is this really what should happen?
assert.widget_fit(layout, { 100, 20 }, { 15, 35 })
assert.widget_fit(layout, { 100, 20 }, { 15, 20 })
end)
it("draw", function()
layout:draw("wibox", "cr", 100, 20)
--- XXX: Shouldn't this also draw part of the second widget?
utils.check_widgets_drawn({
{ first, 0, 0, 100, 10 },
{ third, 0, 10, 100, 10 },
{ first, 0, 0, 100, 2 },
{ third, 0, 18, 100, 2 },
{ second, 0, 2, 100, 15 },
})
end)
@ -135,8 +132,7 @@ describe("wibox.layout.flex", function()
describe("without enough height", function()
it("fit", function()
-- XXX: Is this really what should happen?
assert.widget_fit(layout, { 5, 100 }, { 15, 35 })
assert.widget_fit(layout, { 5, 100 }, { 5, 35 })
end)
it("draw", function()
@ -151,8 +147,7 @@ describe("wibox.layout.flex", function()
describe("without enough width", function()
it("fit", function()
-- XXX: Is this really what should happen?
assert.widget_fit(layout, { 100, 20 }, { 15, 35 })
assert.widget_fit(layout, { 100, 20 }, { 15, 20 })
end)
it("draw", function()
@ -213,8 +208,7 @@ describe("wibox.layout.flex", function()
describe("without enough height", function()
it("fit", function()
-- XXX: Is this really what should happen?
assert.widget_fit(layout, { 5, 100 }, { 15, 35 })
assert.widget_fit(layout, { 5, 100 }, { 5, 35 })
end)
it("draw", function()
@ -229,8 +223,7 @@ describe("wibox.layout.flex", function()
describe("without enough width", function()
it("fit", function()
-- XXX: Is this really what should happen?
assert.widget_fit(layout, { 100, 20 }, { 15, 35 })
assert.widget_fit(layout, { 100, 20 }, { 15, 20 })
end)
it("draw", function()

6
spec/wibox/layout/fixed_spec.lua
View File

@ -54,8 +54,7 @@ describe("wibox.layout.fixed", function()
describe("without enough height", function()
it("fit", function()
-- XXX: Is this really what should happen?
assert.widget_fit(layout, { 5, 100 }, { 15, 35 })
assert.widget_fit(layout, { 5, 100 }, { 5, 35 })
end)
it("draw", function()
@ -76,9 +75,10 @@ describe("wibox.layout.fixed", function()
it("draw", function()
layout:draw("wibox", "cr", 100, 20)
--- XXX: Shouldn't this also draw part of the second widget?
utils.check_widgets_drawn({
{ first, 0, 0, 100, 10 },
{ second, 0, 10, 100, 10 },
{ third, 0, 20, 100, 0 },
})
end)
end)

6
spec/wibox/layout/flex_spec.lua
View File

@ -54,8 +54,7 @@ describe("wibox.layout.flex", function()
describe("without enough height", function()
it("fit", function()
-- XXX: Is this really what should happen?
assert.widget_fit(layout, { 5, 100 }, { 15, 35 })
assert.widget_fit(layout, { 5, 100 }, { 5, 35 })
end)
it("draw", function()
@ -70,8 +69,7 @@ describe("wibox.layout.flex", function()
describe("without enough width", function()
it("fit", function()
-- XXX: Is this really what should happen?
assert.widget_fit(layout, { 100, 20 }, { 15, 35 })
assert.widget_fit(layout, { 100, 20 }, { 15, 20 })
end)
it("draw", function()

2
spec/wibox/test_utils.lua
View File

@ -35,7 +35,7 @@ local function widget_fit(state, arguments)
local widget = arguments[1]
local given = arguments[2]
local expected = arguments[3]
local w, h = widget:fit({ "fake context" }, given[1], given[2])
local w, h = lbase.fit_widget({ "fake context" }, widget, given[1], given[2])
local fits = expected[1] == w and expected[2] == h
if state.mod == fits then