Merge branch 'master' of github.com:copycat-killer/awesome-copycats

This commit is contained in:
copycat-killer 2017-02-01 20:19:43 +01:00
commit d4d97e5aa5
2 changed files with 29 additions and 9 deletions

2
lain

@ -1 +1 @@
Subproject commit b14eff9b1e5558b3d3ea47d5e6ac9d6db3d265de Subproject commit 1555e239eb42953d6d16b04f09d4d19083fa5119

View File

@ -12,6 +12,7 @@ local awful = require("awful")
local wibox = require("wibox") local wibox = require("wibox")
local theme_assets = require("beautiful.theme_assets") local theme_assets = require("beautiful.theme_assets")
local math, string, tonumber, os = math, string, tonumber, os local math, string, tonumber, os = math, string, tonumber, os
local client = client
local theme = {} local theme = {}
theme.default_dir = require("awful.util").get_themes_dir() .. "default" theme.default_dir = require("awful.util").get_themes_dir() .. "default"
@ -113,6 +114,7 @@ local markup = lain.util.markup
local mytextclock = wibox.widget.textclock(markup("#FFFFFF", "%a %d %b, %H:%M")) local mytextclock = wibox.widget.textclock(markup("#FFFFFF", "%a %d %b, %H:%M"))
mytextclock.font = theme.font mytextclock.font = theme.font
lain.widgets.calendar({ lain.widgets.calendar({
cal = "/usr/bin/cal --color=always",
attach_to = { mytextclock }, attach_to = { mytextclock },
notification_preset = { notification_preset = {
fg = "#FFFFFF", fg = "#FFFFFF",
@ -326,7 +328,7 @@ function theme.at_screen_connect(s)
layout = wibox.layout.fixed.horizontal, layout = wibox.layout.fixed.horizontal,
s.mypromptbox, s.mypromptbox,
tspace1, 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 { -- Middle widgets
layout = wibox.layout.flex.horizontal, layout = wibox.layout.flex.horizontal,
@ -402,4 +404,22 @@ function theme.at_screen_connect(s)
end) end)
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 return theme