mirror of
https://github.com/elenapan/dotfiles.git
synced 2026-01-26 01:57:14 +08:00
Remove anti-aliasing code from ephemeral decoration theme
There are now better solutions for anti-aliasing window corners. https://github.com/ibhagwan/picom
This commit is contained in:
elenapan
parent
ad9958e673
commit
83442642f7
2 changed files with 29 additions and 203 deletions
|
|
@ -1,222 +1,48 @@
|
|||
local awful = require("awful")
|
||||
local gears = require("gears")
|
||||
local beautiful = require("beautiful")
|
||||
local awful = require("awful")
|
||||
local wibox = require("wibox")
|
||||
local keys = require("keys")
|
||||
local beautiful = require("beautiful")
|
||||
local helpers = require("helpers")
|
||||
local keys = require("keys")
|
||||
local decorations = require("decorations")
|
||||
|
||||
-- >> Anti-aliasing <<
|
||||
-- ------------------
|
||||
-- Requires a compositor to be running.
|
||||
-- ------------------
|
||||
-- The top titlebar corners are antialiased and a small titlebar is also
|
||||
-- added at the bottom in order to round the bottom corners.
|
||||
-- ------------------
|
||||
-- This setting only affects clients, but you can "manually" apply
|
||||
-- anti-aliasing to other wiboxes. Check out the notification
|
||||
-- widget_template in ~/.config/awesome/notifications/themes/ephemeral.lua for
|
||||
-- an example.
|
||||
-- ------------------
|
||||
-- This decoration theme will round clients according to your theme's
|
||||
-- border_radius value
|
||||
-- Disable this if using `picom` to round your corners
|
||||
-- decorations.enable_rounding()
|
||||
|
||||
-- TODO Need to add toggled appearance to sticky, floating, ontop, maximized
|
||||
-- Helper function that generates clickable buttons for windows
|
||||
-- Useful for creating simple shaped buttons
|
||||
-- Button configuration
|
||||
local gen_button_size = dpi(8)
|
||||
local gen_button_margin = dpi(8)
|
||||
local gen_button_color_unfocused = x.color8
|
||||
local gen_button_shape = gears.shape.circle
|
||||
|
||||
-- For anti aliasing
|
||||
-- Save the original beautiful values
|
||||
local titlebar_bg = beautiful.titlebar_bg
|
||||
local titlebar_bg_focus = beautiful.titlebar_bg_focus
|
||||
local titlebar_bg_normal = beautiful.titlebar_bg_normal
|
||||
-- Modify beautiful values to create an anti-aliased appearance.
|
||||
beautiful.titlebar_bg = "#00000000"
|
||||
if beautiful.titlebar_bg_focus and beautiful.titlebar_bg_normal then
|
||||
beautiful.titlebar_bg_focus = "#00000000"
|
||||
beautiful.titlebar_bg_normal = "#00000000"
|
||||
end
|
||||
|
||||
local anti_aliasing_padding_size = beautiful.border_radius * 2
|
||||
local anti_aliasing_padding_color = x.background
|
||||
|
||||
local anti_aliasing_padding_titlebar = function(c, position)
|
||||
awful.titlebar(c, {font = beautiful.titlebar_font, position = position, size = anti_aliasing_padding_size, bg = "#00000000"}) : setup {
|
||||
buttons = keys.titlebar_buttons,
|
||||
bg = anti_aliasing_padding_color,
|
||||
widget = wibox.container.background()
|
||||
}
|
||||
end
|
||||
|
||||
-- Function that returns true or false depending on whether the
|
||||
-- anti-aliasing titlebars should be added on all sides of a client or not.
|
||||
-- Padding is added under the top titlebar, and also titlebars are added to
|
||||
-- the left and right of the client in order to have equal padding on
|
||||
-- all sides. However they are not necessary for the anti aliasing itself
|
||||
-- and can be enabled or disabled per client in this function.
|
||||
-- ------------------
|
||||
local wants_equal_padding = function(c)
|
||||
local class = c.class
|
||||
if class == "URxvt" or
|
||||
class == "kitty" or
|
||||
class == "Alacritty" or
|
||||
c.role == "GtkFileChooserDialog" or
|
||||
class == "editor" or
|
||||
class == "Nemo" or
|
||||
class == "music" or
|
||||
class == "email" or
|
||||
class == "htop" or
|
||||
class == "sensors" or
|
||||
class == "battop" or
|
||||
class == "mpvtube" or
|
||||
class == "scratchpad" or
|
||||
class == "Emacs" then
|
||||
return true
|
||||
else
|
||||
return false
|
||||
end
|
||||
end
|
||||
|
||||
-- titlebar_container_shape = function(radius, tl, tr, br, bl)
|
||||
-- Function that returns a rounded shape according to a titlebar position
|
||||
local titlebar_container_shape = function(radius, position)
|
||||
if position == "bottom" then
|
||||
return function(cr, width, height)
|
||||
gears.shape.partially_rounded_rect(cr, width, height, false, false, true, true, radius)
|
||||
end
|
||||
elseif position == "left" then
|
||||
return function(cr, width, height)
|
||||
gears.shape.partially_rounded_rect(cr, width, height, true, false, false, true, radius)
|
||||
end
|
||||
elseif position == "right" then
|
||||
return function(cr, width, height)
|
||||
gears.shape.partially_rounded_rect(cr, width, height, false, true, true, false, radius)
|
||||
end
|
||||
else
|
||||
return function(cr, width, height)
|
||||
gears.shape.partially_rounded_rect(cr, width, height, true, true, false, false, radius)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
-- Add a titlebar
|
||||
client.connect_signal("request::titlebars", function(c)
|
||||
local title_widget
|
||||
if beautiful.titlebar_title_enabled then
|
||||
title_widget = awful.titlebar.widget.titlewidget(c)
|
||||
title_widget.font = beautiful.titlebar_font
|
||||
title_widget:set_align(beautiful.titlebar_title_align)
|
||||
else
|
||||
title_widget = wibox.widget.textbox("")
|
||||
end
|
||||
|
||||
-- Save these here in order to avoid re-evaluating them multiple times
|
||||
local equal_padding = wants_equal_padding(c)
|
||||
|
||||
-- Top titlebar
|
||||
local titlebar_container = wibox.widget {
|
||||
shape = titlebar_container_shape(beautiful.border_radius, "top"),
|
||||
bg = titlebar_bg,
|
||||
widget = wibox.container.background
|
||||
}
|
||||
|
||||
awful.titlebar(c, {font = beautiful.titlebar_font, position = beautiful.titlebar_position, size = equal_padding and beautiful.titlebar_size + anti_aliasing_padding_size or beautiful.titlebar_size}) : setup {
|
||||
awful.titlebar(c, {font = beautiful.titlebar_font, position = beautiful.titlebar_position, size = beautiful.titlebar_size}) : setup {
|
||||
nil,
|
||||
{
|
||||
{
|
||||
nil,
|
||||
{
|
||||
buttons = keys.titlebar_buttons,
|
||||
widget = title_widget
|
||||
},
|
||||
{
|
||||
-- AwesomeWM native buttons (images loaded from theme)
|
||||
-- awful.titlebar.widget.minimizebutton(c),
|
||||
-- awful.titlebar.widget.maximizedbutton(c),
|
||||
-- awful.titlebar.widget.closebutton(c),
|
||||
|
||||
-- Generated buttons
|
||||
decorations.button(c, gen_button_shape, x.color3, gen_button_color_unfocused, x.color11, gen_button_size, gen_button_margin, "minimize"),
|
||||
decorations.button(c, gen_button_shape, x.color2, gen_button_color_unfocused, x.color10, gen_button_size, gen_button_margin, "maximize"),
|
||||
decorations.text_button(c, "", "Material Icons 9", x.color1, gen_button_color_unfocused, x.color9, gen_button_size, gen_button_margin, "close"),
|
||||
|
||||
-- Create equal spacing at the edge
|
||||
helpers.horizontal_pad(gen_button_margin / 2),
|
||||
|
||||
layout = wibox.layout.fixed.horizontal
|
||||
},
|
||||
forced_height = beautiful.titlebar_size,
|
||||
layout = wibox.layout.align.horizontal
|
||||
},
|
||||
-- Padding
|
||||
-- Only visible when equal padding is desired for the client
|
||||
{
|
||||
visible = equal_padding,
|
||||
buttons = keys.titlebar_buttons,
|
||||
bg = anti_aliasing_padding_color,
|
||||
forced_height = anti_aliasing_padding_size,
|
||||
widget = wibox.container.background
|
||||
},
|
||||
layout = wibox.layout.fixed.vertical
|
||||
buttons = keys.titlebar_buttons,
|
||||
font = beautiful.titlebar_font,
|
||||
align = beautiful.titlebar_title_align or "center",
|
||||
widget = beautiful.titlebar_title_enabled and awful.titlebar.widget.titlewidget(c) or wibox.widget.textbox("")
|
||||
},
|
||||
widget = titlebar_container
|
||||
}
|
||||
{
|
||||
-- AwesomeWM native buttons (images loaded from theme)
|
||||
-- awful.titlebar.widget.minimizebutton(c),
|
||||
-- awful.titlebar.widget.maximizedbutton(c),
|
||||
-- awful.titlebar.widget.closebutton(c),
|
||||
|
||||
local bottom_titlebar_container = wibox.widget {
|
||||
buttons = keys.titlebar_buttons,
|
||||
shape = titlebar_container_shape(beautiful.border_radius, "bottom"),
|
||||
bg = titlebar_bg,
|
||||
widget = wibox.container.background
|
||||
}
|
||||
-- Generated buttons
|
||||
decorations.button(c, gen_button_shape, x.color3, gen_button_color_unfocused, x.color11, gen_button_size, gen_button_margin, "minimize"),
|
||||
decorations.button(c, gen_button_shape, x.color2, gen_button_color_unfocused, x.color10, gen_button_size, gen_button_margin, "maximize"),
|
||||
decorations.text_button(c, "", "Material Icons 9", x.color1, gen_button_color_unfocused, x.color9, gen_button_size, gen_button_margin, "close"),
|
||||
|
||||
-- Add padding left and right if needed
|
||||
if equal_padding then
|
||||
anti_aliasing_padding_titlebar(c, "right")
|
||||
anti_aliasing_padding_titlebar(c, "left")
|
||||
-- Change the color of the bottom titlebar
|
||||
bottom_titlebar_container.bg = anti_aliasing_padding_color
|
||||
else
|
||||
-- Change the titlebar color depending on focus
|
||||
if beautiful.titlebar_bg_focus and beautiful.titlebar_bg_normal then
|
||||
c:connect_signal("focus", function ()
|
||||
titlebar_container.bg = titlebar_bg_focus
|
||||
bottom_titlebar_container.bg = titlebar_bg_focus
|
||||
end)
|
||||
c:connect_signal("unfocus", function ()
|
||||
titlebar_container.bg = titlebar_bg_normal
|
||||
bottom_titlebar_container.bg = titlebar_bg_normal
|
||||
end)
|
||||
end
|
||||
end
|
||||
-- Create some extra padding at the edge
|
||||
helpers.horizontal_pad(gen_button_margin / 2),
|
||||
|
||||
-- Create an anti-aliased bottom titlebar in order to round the bottom corners
|
||||
awful.titlebar(c, {font = beautiful.titlebar_font, position = "bottom", size = anti_aliasing_padding_size}) : setup {
|
||||
widget = bottom_titlebar_container
|
||||
layout = wibox.layout.fixed.horizontal
|
||||
},
|
||||
layout = wibox.layout.align.horizontal
|
||||
}
|
||||
end)
|
||||
|
||||
decorations.show = function(c)
|
||||
if wants_equal_padding(c) then
|
||||
awful.titlebar.show(c, "left")
|
||||
awful.titlebar.show(c, "right")
|
||||
end
|
||||
awful.titlebar.show(c, "top")
|
||||
awful.titlebar.show(c, "bottom")
|
||||
end
|
||||
decorations.hide = function(c)
|
||||
if wants_equal_padding(c) then
|
||||
awful.titlebar.hide(c, "left")
|
||||
awful.titlebar.hide(c, "right")
|
||||
end
|
||||
awful.titlebar.hide(c, "top")
|
||||
awful.titlebar.hide(c, "bottom")
|
||||
end
|
||||
decorations.cycle = function(c)
|
||||
if wants_equal_padding(c) then
|
||||
awful.titlebar.toggle(c, "left")
|
||||
awful.titlebar.toggle(c, "right")
|
||||
end
|
||||
awful.titlebar.toggle(c, "top")
|
||||
awful.titlebar.toggle(c, "bottom")
|
||||
end
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ local theme = themes[5]
|
|||
local decoration_themes = {
|
||||
"lovelace", -- 1 -- Standard titlebar with 3 buttons (close, max, min)
|
||||
"skyfall", -- 2 -- No buttons, only title
|
||||
"ephemeral", -- 3 -- Anti-aliased, with text-generated titlebar buttons
|
||||
"ephemeral", -- 3 -- Text-generated titlebar buttons
|
||||
"amarena", -- 4 -- Text-generated titlebar buttons
|
||||
}
|
||||
local decoration_theme = decoration_themes[4]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue