summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorportix <portix@gmx.net>2012-02-29 17:03:21 +0100
committerportix <portix@gmx.net>2012-02-29 17:03:21 +0100
commitbe7e89e4b9870924114c90885e9225466fa485c8 (patch)
treef168991d32a6b6b5b503dffba0356a8805933fc8
parent3fd39f3f891953ade2e5a0e5c03e1c9b2d4d2616 (diff)
downloaddwb-be7e89e4b9870924114c90885e9225466fa485c8.zip
Rename setting font-inactive -> font-nofocus
-rw-r--r--doc/dwb.14
-rw-r--r--src/config.h4
-rw-r--r--src/dwb.c2
-rw-r--r--util/settings.in1
4 files changed, 5 insertions, 6 deletions
diff --git a/doc/dwb.1 b/doc/dwb.1
index 0d15c565..6e7d53c0 100644
--- a/doc/dwb.1
+++ b/doc/dwb.1
@@ -1623,8 +1623,8 @@ The font used for the address bar. Possible values: a font description
string,
default value:
.TP
-.BR font-inactive
-The font used for inactive tabs. Possible values: a font description
+.BR font-nofocus
+The font used for tablabels without focus and completion items without focus. Possible values: a font description
string,
default value:
.TP
diff --git a/src/config.h b/src/config.h
index 22dac321..a0685766 100644
--- a/src/config.h
+++ b/src/config.h
@@ -948,12 +948,12 @@ static WebSettings DWB_SETTINGS[] = {
{ { "font", "Default font used for the ui", },
SETTING_GLOBAL, CHAR, { .p = "monospace 8" }, (S_Func) dwb_reload_layout, },
- { { "font-inactive", "Font of views without focus", },
- SETTING_GLOBAL, CHAR, { .p = NULL }, (S_Func) dwb_reload_layout, },
{ { "font-entry", "Font of the addressbar", },
SETTING_GLOBAL, CHAR, { .p = NULL }, (S_Func) dwb_reload_layout, },
{ { "font-completion", "Font for tab-completion", },
SETTING_GLOBAL, CHAR, { .p = NULL }, (S_Func) dwb_reload_layout, },
+ { { "font-nofocus", "Font of tabs/completion items without focus", },
+ SETTING_GLOBAL, CHAR, { .p = NULL }, (S_Func) dwb_reload_layout, },
{ { "hint-letter-seq", "Letter sequence for letter hints", },
SETTING_PER_VIEW, CHAR, { .p = "FDSARTGBVECWXQYIOPMNHZULKJ" }, (S_Func) dwb_reload_scripts, },
diff --git a/src/dwb.c b/src/dwb.c
index 47e643ba..9ba2de77 100644
--- a/src/dwb.c
+++ b/src/dwb.c
@@ -3049,7 +3049,7 @@ dwb_init_style() {
var = dwb.font.fd_active; \
} while(0)
- SET_FONT(dwb.font.fd_inactive, "font-inactive");
+ SET_FONT(dwb.font.fd_inactive, "font-nofocus");
SET_FONT(dwb.font.fd_entry, "font-entry");
SET_FONT(dwb.font.fd_completion, "font-completion");
#undef SET_FONT
diff --git a/util/settings.in b/util/settings.in
index 7ef65150..5b413843 100644
--- a/util/settings.in
+++ b/util/settings.in
@@ -34,7 +34,6 @@ fantasy-font-family text Fantasy font family used to display text
font text Default font used for the ui
font-completion text Font for tab-completion
font-entry text Font for the addressbar
-font-inactive text Font for views without focus
minimum-font-size text Minimum font size used to display text
minimum-logical-font-size text Minimum logical font size used to display text
monospace-font-family text Monospace font family used to display text