add beautiful margins

3 files changed, 14 insertions, 16 deletions

diff --git a/bar.lua b/bar.lua
index e08c799..baaf60e 100644
--- a/bar.lua
+++ b/bar.lua
@@ -15,17 +15,15 @@ local tasklist           = require("widgets.tasklist")
 local widget_volume = volume_control.textbox
 
 -- store widgets here
-local spacing = 8
-
 local widgets = {
 	temperature_file = nil;
-	spacing = spacing, -- constant
+	spacing = beautiful.margin_leftright, -- constant
 	layoutlist = wibox.widget {
 		layout = wibox.layout.fixed.horizontal,
 		buttons = layout_buttons,
 		wibox.container.margin(
 			classiclayoutbox(s),
-			spacing, spacing, 0, 0
+			beautiful.margin_leftright, beautiful.margin_leftright, 0, 0
 		),
 	},
 	taglist = function(s) return awful.widget.taglist {
@@ -34,8 +32,7 @@ local widgets = {
 		buttons = taglist_buttons,
 	} end,
 	tasklist = tasklist,
-	textclock = {
-		widget = wibox.widget.textclock,
+	textclock = wibox.widget.textclock {
 		format = "%A, %B %-e, %-I:%M %p",
 		font = beautiful.textclock_font,
 	},
@@ -69,7 +66,7 @@ local widgets = {
 -- left widget group func
 function widgets.left_widgets(s) return wibox.widget {
 	layout = wibox.layout.fixed.horizontal,
-	spacing = spacing,
+	spacing = beautiful.margin_leftright,
 	{
 		layout = wibox.layout.fixed.horizontal,
 		widgets.layoutlist,
@@ -89,7 +86,7 @@ function widgets.right_widgets(s) return wibox.widget {
 	layout = wibox.layout.fixed.horizontal,
 	{
 		layout = wibox.layout.fixed.horizontal,
-		spacing = spacing * 2,
+		spacing = beautiful.margin_leftright * 2,
 		{
 			layout = wibox.layout.fixed.horizontal,
 			widgets.cpu,
@@ -102,7 +99,7 @@ function widgets.right_widgets(s) return wibox.widget {
 	{
 		widget = wibox.widget.separator,
 		opacity = 0,
-		forced_width = spacing
+		forced_width = beautiful.margin_leftright
 	},
 	--mylauncher,
 } end
@@ -119,11 +116,11 @@ awful.screen.connect_for_each_screen(function (s)
 	s.mywibox:setup {
 		layout = wibox.layout.align.horizontal,
 		expand = "none",
-		spacing = spacing,
+		spacing = beautiful.margin_leftright,
 		widgets.left_widgets(s),
 		wibox.container.margin(
 			widgets.middle_widgets(s),
-			spacing, spacing, 0, 0
+			beautiful.margin_leftright, beautiful.margin_leftright, 0, 0
 		),
 		widgets.right_widgets(s),
 	}
diff --git a/lib/wiboxtooltip.lua b/lib/wiboxtooltip.lua
index c101f92..be56a1f 100644
--- a/lib/wiboxtooltip.lua
+++ b/lib/wiboxtooltip.lua
@@ -3,9 +3,6 @@ local wibox = require("wibox")
 local beautiful = require("beautiful")
 local gears = require("gears")
 
-local margin_leftright = beautiful.xresources.apply_dpi(5)
-local margin_topbottom = beautiful.xresources.apply_dpi(3)
-
 -- TODO more args
 -- TODO use tooltip theme vars
 function create_wibox_tooltip(parent, widget)
@@ -14,8 +11,8 @@ function create_wibox_tooltip(parent, widget)
 		popup = awful.popup {
 			widget = wibox.container.margin (
 				widget,
-				margin_leftright, margin_leftright,
-				margin_topbottom, margin_topbottom
+				beautiful.margin_leftright, beautiful.margin_leftright,
+				beautiful.margin_topbottom, beautiful.margin_topbottom
 			),
 			ontop = true,
 			visible = false,
diff --git a/theme.lua b/theme.lua
index d5d8c81..5b07b17 100644
--- a/theme.lua
+++ b/theme.lua
@@ -53,6 +53,10 @@ beautiful.slider_handle_border_width = 1
 -- progressbar
 beautiful.progressbar_fg = beautiful.border_focus
 
+-- margins
+beautiful.margin_leftright = beautiful.xresources.apply_dpi(5)
+beautiful.margin_topbottom = beautiful.xresources.apply_dpi(3)
+
 -- set border on clients
 client.connect_signal("focus",   function(c) c.border_color = beautiful.border_focus  end)
 client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)