Skip to content

Commit

Permalink
Awesome: Prepare for border below wibox
Browse files Browse the repository at this point in the history
  • Loading branch information
@alfunx
alfunx committed May 10, 2018
1 parent 4ff2c7c commit 9c20ea2
Show file tree
Hide file tree
Showing 2 changed files with 82 additions and 44 deletions.
11 changes: 11 additions & 0 deletions .config/awesome/rc.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -938,16 +938,27 @@ client.connect_signal("property::size",
-- end
-- end)

local last_focus

client.connect_signal("focus",
function(c)
c.border_color = beautiful.border_focus
last_focus = nil
end)

client.connect_signal("unfocus",
function(c)
c.border_color = beautiful.border_normal
last_focus = c
end)

client.connect_signal("unmanage", function(c)
if last_focus == c and c.transient_for then
client.focus = c.transient_for
c.transient_for:raise()
end
end)

client.connect_signal("property::fullscreen",
function(c)
if c.fullscreen then
Expand Down
115 changes: 71 additions & 44 deletions .config/awesome/themes/powerarrow-gruvbox/theme.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -914,21 +914,43 @@ function theme.at_screen_connect(s)
id = 'background_role',
widget = wibox.container.background,
},
-- layout = {
-- spacing = 10,
-- spacing_widget = {
-- {
-- shape = gears.shape.rectangle,
-- widget = wibox.widget.separator,
-- },
-- valign = 'center',
-- halign = 'center',
-- widget = wibox.container.place,
-- },
-- layout = wibox.layout.flex.horizontal,
-- },
}

-- Create the wibox
s.mywibox = awful.wibar {
position = "top",
screen = s,
-- height = dpi(21) + theme.border_width,
height = dpi(21),
bg = theme.bg_normal,
fg = theme.fg_normal,
}

local systray_widget = wibox.container.margin(wibox.widget {
wibox.widget.systray(),
layout = wibox.layout.align.horizontal,
}, dpi(12), dpi(0), dpi(3), dpi(3))
local systray_widget = wibox.widget {
{
layout = wibox.layout.align.horizontal,
wibox.widget.systray(),
},
left = dpi(12),
right = dpi(0),
top = dpi(3),
bottom = dpi(3),
widget = wibox.container.margin,
}

systray_widget:set_visible(false)

local systray_widget_timer = gears.timer {
Expand All @@ -949,53 +971,58 @@ function theme.at_screen_connect(s)

-- Add widgets to the wibox
s.mywibox:setup {
layout = wibox.layout.align.horizontal,

{ -- Left widgets
layout = wibox.layout.fixed.horizontal,

wibox.container.background(wibox.container.margin(wibox.widget {
s.mylayoutbox,
layout = wibox.layout.align.horizontal,
}, dpi(8), dpi(3), dpi(4), dpi(4)), clock_bg_normal),
wibox.container.background(wibox.container.margin(wibox.widget {
s.mytaglist,
layout = wibox.layout.align.horizontal,
}, dpi(3), dpi(8)), theme.taglist_bg_normal),
arrow_r(theme.taglist_bg_normal, theme.prompt_bg),

wibox.container.background(wibox.container.margin(wibox.widget {
s.mypromptbox,
layout = wibox.layout.align.horizontal,
}, dpi(8), dpi(4)), theme.prompt_bg),
arrow_r(theme.prompt_bg, theme.tasklist_bg_normal),
},
{
layout = wibox.layout.align.horizontal,

{ -- Left widgets
layout = wibox.layout.fixed.horizontal,

wibox.container.background(wibox.container.margin(wibox.widget {
s.mylayoutbox,
layout = wibox.layout.align.horizontal,
}, dpi(8), dpi(3), dpi(4), dpi(4)), clock_bg_normal),
wibox.container.background(wibox.container.margin(wibox.widget {
s.mytaglist,
layout = wibox.layout.align.horizontal,
}, dpi(3), dpi(8)), theme.taglist_bg_normal),
arrow_r(theme.taglist_bg_normal, theme.prompt_bg),

wibox.container.background(wibox.container.margin(wibox.widget {
s.mypromptbox,
layout = wibox.layout.align.horizontal,
}, dpi(8), dpi(4)), theme.prompt_bg),
arrow_r(theme.prompt_bg, theme.tasklist_bg_normal),
},

-- s.mytasklist, -- Middle widget
wibox.container.background(wibox.container.margin(s.mytasklist, dpi(8), dpi(0)), theme.tasklist_bg_normal),
-- s.mytasklist, -- Middle widget
wibox.container.background(wibox.container.margin(s.mytasklist, dpi(8), dpi(0)), theme.tasklist_bg_normal),

{ -- Right widgets
layout = wibox.layout.fixed.horizontal,
{ -- Right widgets
layout = wibox.layout.fixed.horizontal,

wibox.container.background(wibox.container.margin(systray_widget, dpi(0), dpi(8)), theme.tasklist_bg_normal),
wibox.container.background(wibox.container.margin(systray_widget, dpi(0), dpi(8)), theme.tasklist_bg_normal),

arrow_l(theme.tasklist_bg_normal, pacman_bg_normal),
-- wibox.container.background(wibox.container.margin(fs_widget, dpi(2), dpi(6)), fs_bg_normal),
-- wibox.container.background(wibox.container.margin(temp_widget, dpi(2), dpi(6)), temp_bg_normal),
wibox.container.background(wibox.container.margin(pacman_widget, dpi(2), dpi(6)), pacman_bg_normal),
wibox.container.background(wibox.container.margin(users_widget, dpi(2), dpi(6)), users_bg_normal),
wibox.container.background(wibox.container.margin(sysload_widget, dpi(2), dpi(6)), sysload_bg_normal),
wibox.container.background(wibox.container.margin(cpu_widget, dpi(2), dpi(6)), cpu_bg_normal),
wibox.container.background(wibox.container.margin(mem_widget, dpi(2), dpi(6)), mem_bg_normal),
wibox.container.background(wibox.container.margin(vol_widget, dpi(2), dpi(6)), vol_bg_normal),
wibox.container.background(wibox.container.margin(bat_widget, dpi(2), dpi(10)), bat_bg_normal),
arrow_l(theme.tasklist_bg_normal, pacman_bg_normal),
-- wibox.container.background(wibox.container.margin(fs_widget, dpi(2), dpi(6)), fs_bg_normal),
-- wibox.container.background(wibox.container.margin(temp_widget, dpi(2), dpi(6)), temp_bg_normal),
wibox.container.background(wibox.container.margin(pacman_widget, dpi(2), dpi(6)), pacman_bg_normal),
wibox.container.background(wibox.container.margin(users_widget, dpi(2), dpi(6)), users_bg_normal),
wibox.container.background(wibox.container.margin(sysload_widget, dpi(2), dpi(6)), sysload_bg_normal),
wibox.container.background(wibox.container.margin(cpu_widget, dpi(2), dpi(6)), cpu_bg_normal),
wibox.container.background(wibox.container.margin(mem_widget, dpi(2), dpi(6)), mem_bg_normal),
wibox.container.background(wibox.container.margin(vol_widget, dpi(2), dpi(6)), vol_bg_normal),
wibox.container.background(wibox.container.margin(bat_widget, dpi(2), dpi(10)), bat_bg_normal),

arrow_l(bat_bg_normal, net_bg_normal),
wibox.container.background(wibox.container.margin(net_widget, dpi(8), dpi(10)), net_bg_normal),
arrow_l(bat_bg_normal, net_bg_normal),
wibox.container.background(wibox.container.margin(net_widget, dpi(8), dpi(10)), net_bg_normal),

arrow_l(net_bg_normal, clock_bg_normal),
wibox.container.background(wibox.container.margin(clock_widget, dpi(8), dpi(8)), clock_bg_normal),
arrow_l(net_bg_normal, clock_bg_normal),
wibox.container.background(wibox.container.margin(clock_widget, dpi(8), dpi(8)), clock_bg_normal),
},
},
-- bottom = theme.border_width,
color = theme.border_normal,
widget = wibox.container.margin,
}
end

Expand Down

0 comments on commit 9c20ea2

Please sign in to comment.