From e59c7f866e64073a55cfcae893c6f8222911d590 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 1 Jan 2018 07:53:13 +1100 Subject: [PATCH] reload: Fix rofi colors not changing. --- pywal/reload.py | 8 +++++--- pywal/templates/colors.Xresources | 8 -------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/pywal/reload.py b/pywal/reload.py index b493f3e..32fece3 100644 --- a/pywal/reload.py +++ b/pywal/reload.py @@ -10,12 +10,14 @@ from .settings import CACHE_DIR, HOME, MODULE_DIR, OS from . import util -def xrdb(xrdb_file=None): +def xrdb(xrdb_files=None): """Merge the colors into the X db so new terminals use them.""" - xrdb_file = xrdb_file or os.path.join(CACHE_DIR, "colors.Xresources") + xrdb_files = xrdb_files or \ + [os.path.join(CACHE_DIR, "colors.Xresources"), + os.path.join(CACHE_DIR, "colors-rofi.Xresources")] if shutil.which("xrdb") and OS != "Darwin": - subprocess.Popen(["xrdb", "-merge", xrdb_file], + subprocess.Popen(["xrdb", "-merge", *xrdb_files], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL).wait() diff --git a/pywal/templates/colors.Xresources b/pywal/templates/colors.Xresources index 0b5f691..1410f5a 100644 --- a/pywal/templates/colors.Xresources +++ b/pywal/templates/colors.Xresources @@ -60,13 +60,5 @@ XClock*hourColor: rgba:{color15.xrgba} XClock*minuteColor: rgba:{color15.xrgba} XClock*secondColor: rgba:{color15.xrgba} -! Rofi (fallback) -rofi.color-normal: {background}, {foreground}, {background}, {color10}, {background} -rofi.color-active: {background}, {foreground}, {background}, {color10}, {background} -rofi.color-urgent: {background}, {color10}, {background}, {color10}, {foreground} -rofi.color-window: {background}, {background}, {background} - ! Set depth to make transparency work. URxvt*depth: 32 - -#include "colors-rofi.Xresources"