aboutsummaryrefslogtreecommitdiffstats
path: root/sway/ipc-json.c
diff options
context:
space:
mode:
authorLibravatar Daniel Otero <otero.o.daniel@gmail.com>2021-03-19 18:02:46 +0100
committerLibravatar Simon Ser <contact@emersion.fr>2021-06-03 14:18:23 +0200
commitb997147284b9d5632f1f929f02a17936a77cd7ec (patch)
tree6a2e93690d0dbd3c4eb032ce3d2bbf7e9671af27 /sway/ipc-json.c
parentOnly defer seat attachment during initial startup (diff)
downloadsway-b997147284b9d5632f1f929f02a17936a77cd7ec.tar.gz
sway-b997147284b9d5632f1f929f02a17936a77cd7ec.tar.zst
sway-b997147284b9d5632f1f929f02a17936a77cd7ec.zip
config: Fix swaybar pango_markup inconsistency
Until now, swaybar did not have pango markup enabled by default, even if the sway config had it on. This patch aims to mimic the i3 behavior, but maintaining the functionality of the "pango_markup" sway config command.
Diffstat (limited to 'sway/ipc-json.c')
-rw-r--r--sway/ipc-json.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sway/ipc-json.c b/sway/ipc-json.c
index 34adfc74..6c438424 100644
--- a/sway/ipc-json.c
+++ b/sway/ipc-json.c
@@ -1127,7 +1127,9 @@ json_object *ipc_json_describe_bar_config(struct bar_config *bar) {
1127 json_object_object_add(json, "verbose", 1127 json_object_object_add(json, "verbose",
1128 json_object_new_boolean(bar->verbose)); 1128 json_object_new_boolean(bar->verbose));
1129 json_object_object_add(json, "pango_markup", 1129 json_object_object_add(json, "pango_markup",
1130 json_object_new_boolean(bar->pango_markup)); 1130 json_object_new_boolean(bar->pango_markup == PANGO_MARKUP_DEFAULT
1131 ? config->pango_markup
1132 : bar->pango_markup));
1131 1133
1132 json_object *colors = json_object_new_object(); 1134 json_object *colors = json_object_new_object();
1133 json_object_object_add(colors, "background", 1135 json_object_object_add(colors, "background",