Tabbar fixes
changed modern theme size changed tabbar bg, as focused doesnt really matter
This commit is contained in:
parent
a8e60891c1
commit
429fcd26fe
|
@ -8,9 +8,7 @@ In the function themselves, the same object is refered to as "tabobj" which is w
|
||||||
you will often see something like: "local tabobj = some_client.bling_tabbed" at the beginning
|
you will often see something like: "local tabobj = some_client.bling_tabbed" at the beginning
|
||||||
of a function.
|
of a function.
|
||||||
|
|
||||||
--]]
|
--]] local awful = require("awful")
|
||||||
|
|
||||||
local awful = require("awful")
|
|
||||||
local wibox = require("wibox")
|
local wibox = require("wibox")
|
||||||
local gears = require("gears")
|
local gears = require("gears")
|
||||||
local beautiful = require("beautiful")
|
local beautiful = require("beautiful")
|
||||||
|
@ -18,16 +16,12 @@ local beautiful = require("beautiful")
|
||||||
local helpers = require(tostring(...):match(".*bling.module") .. ".helpers")
|
local helpers = require(tostring(...):match(".*bling.module") .. ".helpers")
|
||||||
|
|
||||||
local bar_style = beautiful.tabbar_style or "default"
|
local bar_style = beautiful.tabbar_style or "default"
|
||||||
local bar = require(tostring(...):match(".*bling") .. ".widget.tabbar." .. bar_style)
|
local bar = require(tostring(...):match(".*bling") .. ".widget.tabbar." ..
|
||||||
|
bar_style)
|
||||||
|
|
||||||
local function copy_size(c, parent_client)
|
local function copy_size(c, parent_client)
|
||||||
if not c or not parent_client then
|
if not c or not parent_client then return end
|
||||||
return
|
if not c.valid or not parent_client.valid then return end
|
||||||
end
|
|
||||||
if not c.valid or not parent_client.valid then
|
|
||||||
return
|
|
||||||
end
|
|
||||||
c.floating = parent_client.floating
|
c.floating = parent_client.floating
|
||||||
c.x = parent_client.x
|
c.x = parent_client.x
|
||||||
c.y = parent_client.y
|
c.y = parent_client.y
|
||||||
|
@ -43,9 +37,7 @@ tabbed.iter = function(idx)
|
||||||
if not client.focus.bling_tabbed then return end
|
if not client.focus.bling_tabbed then return end
|
||||||
local tabobj = client.focus.bling_tabbed
|
local tabobj = client.focus.bling_tabbed
|
||||||
local new_idx = (tabobj.focused_idx + idx) % #tabobj.clients
|
local new_idx = (tabobj.focused_idx + idx) % #tabobj.clients
|
||||||
if new_idx == 0 then
|
if new_idx == 0 then new_idx = #tabobj.clients end
|
||||||
new_idx = #tabobj.clients
|
|
||||||
end
|
|
||||||
tabbed.switch_to(tabobj, new_idx)
|
tabbed.switch_to(tabobj, new_idx)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -90,9 +82,7 @@ tabbed.pick = function()
|
||||||
handle:close()
|
handle:close()
|
||||||
-- search the client that was picked
|
-- search the client that was picked
|
||||||
for _, c in ipairs(client.get()) do
|
for _, c in ipairs(client.get()) do
|
||||||
if tonumber(c.pid) == tonumber(output) then
|
if tonumber(c.pid) == tonumber(output) then tabbed.add(c, tabobj) end
|
||||||
tabbed.add(c, tabobj)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -149,7 +139,8 @@ tabbed.update_tabbar = function(tabobj)
|
||||||
local flexlist = bar.layout()
|
local flexlist = bar.layout()
|
||||||
-- itearte over all tabbed clients to create the widget tabbed list
|
-- itearte over all tabbed clients to create the widget tabbed list
|
||||||
for idx, c in ipairs(tabobj.clients) do
|
for idx, c in ipairs(tabobj.clients) do
|
||||||
local buttons = gears.table.join(awful.button({}, 1, function()
|
local buttons = gears.table.join(
|
||||||
|
awful.button({}, 1, function()
|
||||||
tabbed.switch_to(tabobj, idx)
|
tabbed.switch_to(tabobj, idx)
|
||||||
end))
|
end))
|
||||||
wid_temp = bar.create(c, (idx == tabobj.focused_idx), buttons)
|
wid_temp = bar.create(c, (idx == tabobj.focused_idx), buttons)
|
||||||
|
@ -158,15 +149,11 @@ tabbed.update_tabbar = function(tabobj)
|
||||||
-- add tabbar to each tabbed client (clients will be hided anyway)
|
-- add tabbar to each tabbed client (clients will be hided anyway)
|
||||||
for _, c in ipairs(tabobj.clients) do
|
for _, c in ipairs(tabobj.clients) do
|
||||||
local titlebar = awful.titlebar(c, {
|
local titlebar = awful.titlebar(c, {
|
||||||
bg_normal = bar.bg_normal,
|
bg = bar.bg_normal,
|
||||||
bg_focus = bar.bg_focus,
|
|
||||||
size = bar.size,
|
size = bar.size,
|
||||||
position = bar.position
|
position = bar.position
|
||||||
})
|
})
|
||||||
titlebar:setup {
|
titlebar:setup{layout = wibox.layout.flex.horizontal, flexlist}
|
||||||
layout = wibox.layout.flex.horizontal,
|
|
||||||
flexlist,
|
|
||||||
}
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ local fg_normal = beautiful.tabbar_fg_normal or beautiful.fg_normal or "#000000"
|
||||||
local bg_focus = beautiful.tabbar_bg_focus or beautiful.bg_focus or "#000000"
|
local bg_focus = beautiful.tabbar_bg_focus or beautiful.bg_focus or "#000000"
|
||||||
local fg_focus = beautiful.tabbar_fg_focus or beautiful.fg_focus or "#ffffff"
|
local fg_focus = beautiful.tabbar_fg_focus or beautiful.fg_focus or "#ffffff"
|
||||||
local font = beautiful.tabbar_font or beautiful.font or "Hack 15"
|
local font = beautiful.tabbar_font or beautiful.font or "Hack 15"
|
||||||
local size = beautiful.tabbar_size or dpi(20)
|
local size = beautiful.tabbar_size or dpi(40)
|
||||||
local border_radius =
|
local border_radius =
|
||||||
beautiful.mstab_border_radius or beautiful.border_radius or 6
|
beautiful.mstab_border_radius or beautiful.border_radius or 6
|
||||||
local position = beautiful.tabbar_orientation or "top"
|
local position = beautiful.tabbar_orientation or "top"
|
||||||
|
|
Loading…
Reference in New Issue