From 829474d355d842e3979a3610879d9862c0b74822 Mon Sep 17 00:00:00 2001 From: copycat-killer Date: Wed, 1 Feb 2017 20:16:15 +0100 Subject: [PATCH] .gitmodules updated --- .gitmodules | 2 +- lain | 2 +- themes/vertex/theme.lua | 36 ++++++++++++++++++++++++++++-------- 3 files changed, 30 insertions(+), 10 deletions(-) diff --git a/.gitmodules b/.gitmodules index cbbc150..98c4667 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,4 +4,4 @@ [submodule "freedesktop"] path = freedesktop - url = git@github.com:copycat-killer/awesome-freedesktop.git + url = git://github.com/copycat-killer/awesome-freedesktop.git diff --git a/lain b/lain index b14eff9..1555e23 160000 --- a/lain +++ b/lain @@ -1 +1 @@ -Subproject commit b14eff9b1e5558b3d3ea47d5e6ac9d6db3d265de +Subproject commit 1555e239eb42953d6d16b04f09d4d19083fa5119 diff --git a/themes/vertex/theme.lua b/themes/vertex/theme.lua index 9989af5..ff8fce6 100644 --- a/themes/vertex/theme.lua +++ b/themes/vertex/theme.lua @@ -12,6 +12,7 @@ local awful = require("awful") local wibox = require("wibox") local theme_assets = require("beautiful.theme_assets") local math, string, tonumber, os = math, string, tonumber, os +local client = client local theme = {} theme.default_dir = require("awful.util").get_themes_dir() .. "default" @@ -113,13 +114,14 @@ local markup = lain.util.markup local mytextclock = wibox.widget.textclock(markup("#FFFFFF", "%a %d %b, %H:%M")) mytextclock.font = theme.font lain.widgets.calendar({ -attach_to = { mytextclock }, -notification_preset = { - fg = "#FFFFFF", - bg = theme.bg_normal, - position = "top_middle", - font = "Monospace 10" -} + cal = "/usr/bin/cal --color=always", + attach_to = { mytextclock }, + notification_preset = { + fg = "#FFFFFF", + bg = theme.bg_normal, + position = "top_middle", + font = "Monospace 10" + } }) -- Battery @@ -326,7 +328,7 @@ function theme.at_screen_connect(s) layout = wibox.layout.fixed.horizontal, s.mypromptbox, tspace1, - wibox.container.constraint(s.mytasklist, "min", s.workarea.width/4), + wibox.container.constraint(wibox.container.constraint(s.mytasklist, "min", s.workarea.width/4), "max", s.workarea.width/4), }, { -- Middle widgets layout = wibox.layout.flex.horizontal, @@ -402,4 +404,22 @@ function theme.at_screen_connect(s) end) end +--[[ +client.connect_signal("property::width",function(c) + if c.shape ~= gears.shape.rounded_rect then + c.shape = gears.shape.rounded_rect + end +end) +client.connect_signal("property::height",function(c) + if c.shape ~= gears.shape.rounded_rect then + c.shape = gears.shape.rounded_rect + end +end) +client.connect_signal("property::width",function(c) + if c.shape ~= gears.shape.rounded_rect then + c.shape = gears.shape.rounded_rect + end +end) +--]] + return theme