diff options
| author |  crondog <crondog@gmail.com> | 2016-01-27 16:57:55 +1100 |
|---|---|---|
| committer | crondog <crondog@gmail.com> | 2016-01-27 20:53:31 +1100 |
| commit | 0ee55474067364159f84806b7b0813492ed4e546 (patch) | |
| tree | d1f5bd624cf3dccc1987ccfc1fe20130a2d4cf4a /sway/ipc-server.c | |
| parent | Remove pointer from swaylock surface (diff) | |
| download | sway-0ee55474067364159f84806b7b0813492ed4e546.tar.gz sway-0ee55474067364159f84806b7b0813492ed4e546.tar.zst sway-0ee55474067364159f84806b7b0813492ed4e546.zip | |
font: Allow adding font to the config. In prep for border titles
v2: Give default font and make bar use it if no bar font
Diffstat (limited to 'sway/ipc-server.c')
| -rw-r--r-- | sway/ipc-server.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/ipc-server.c b/sway/ipc-server.c index 58a291cd..63a6d703 100644 --- a/sway/ipc-server.c +++ b/sway/ipc-server.c | |||
| @@ -551,7 +551,7 @@ json_object *ipc_json_describe_bar_config(struct bar_config *bar) { | |||
| 551 | break; | 551 | break; |
| 552 | } | 552 | } |
| 553 | json_object_object_add(json, "status_command", json_object_new_string(bar->status_command)); | 553 | json_object_object_add(json, "status_command", json_object_new_string(bar->status_command)); |
| 554 | json_object_object_add(json, "font", json_object_new_string(bar->font)); | 554 | json_object_object_add(json, "font", json_object_new_string(bar->font ? bar->font : config->font)); |
| 555 | if (bar->separator_symbol) { | 555 | if (bar->separator_symbol) { |
| 556 | json_object_object_add(json, "separator_symbol", json_object_new_string(bar->separator_symbol)); | 556 | json_object_object_add(json, "separator_symbol", json_object_new_string(bar->separator_symbol)); |
| 557 | } | 557 | } |