From 0b2078316405af6b96a174628004f828f8fb8092 Mon Sep 17 00:00:00 2001 From: N-R-K <79544946+N-R-K@users.noreply.github.com> Date: Thu, 16 Sep 2021 17:11:26 +0600 Subject: [PATCH] change .font to .bar.font for consistency (#48) --- CHANGELOG.md | 1 + nsxiv.1 | 2 +- window.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a9c2498..0d4aff1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ nsxiv Changes: * Re-release under the name nsxiv * Sxiv.foreground and Sxiv.background changed to Nsxiv.window.foreground and Nsxiv.window.background + * `Sxiv.font` changed to `Nsxiv.bar.font` * Rework the build system (#19). Now by default we'll build with only optional dependencies that are already installed Added: * Fill scale mode (#2) diff --git a/nsxiv.1 b/nsxiv.1 index 5d25099..ca5727d 100644 --- a/nsxiv.1 +++ b/nsxiv.1 @@ -408,7 +408,7 @@ Color of the bar background. Defaults to window.foreground .B bar.foreground Color of the bar foreground. Defaults to window.background .TP -.B font +.B bar.font Name of Xft bar font .TP Please see xrdb(1) on how to change them. diff --git a/window.c b/window.c index 3cd6c4a..d05bef7 100644 --- a/window.c +++ b/window.c @@ -130,7 +130,7 @@ void win_init(win_t *win) res_man = XResourceManagerString(e->dpy); db = res_man != NULL ? XrmGetStringDatabase(res_man) : None; - f = win_res(db, RES_CLASS ".font", "monospace-8"); + f = win_res(db, RES_CLASS ".bar.font", "monospace-8"); win_init_font(e, f); win_bg = win_res(db, RES_CLASS ".window.background", "white");