mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-12-29 00:16:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

swaybar: if-else style fixes

Browse source
This commit is contained in:
Mikkel Oscar Lyderik 2015-12-27 13:26:37 +01:00
parent d21b15a4be
commit e7aef1e23c
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
swaybar/main.c
View file

@ -705,8 +705,7 @@ void parse_json(const char *text) {
if (color) { if (color) {
new->color = parse_color(json_object_get_string(color)); new->color = parse_color(json_object_get_string(color));
} } else {
else {
new->color = colors.statusline; new->color = colors.statusline;
} }
@ -714,8 +713,7 @@ void parse_json(const char *text) {
json_type type = json_object_get_type(min_width); json_type type = json_object_get_type(min_width);
if (type == json_type_int) { if (type == json_type_int) {
new->min_width = json_object_get_int(min_width); new->min_width = json_object_get_int(min_width);
} } else if (type == json_type_string) {
else if (type == json_type_string) {
int width, height; int width, height;
get_text_size(window, &width, &height, "%s", json_object_get_string(min_width)); get_text_size(window, &width, &height, "%s", json_object_get_string(min_width));
new->min_width = width; new->min_width = width;
@ -724,8 +722,7 @@ void parse_json(const char *text) {
if (align) { if (align) {
new->align = strdup(json_object_get_string(align)); new->align = strdup(json_object_get_string(align));
} } else {
else {
new->align = strdup("left"); new->align = strdup("left");
} }
@ -743,15 +740,13 @@ void parse_json(const char *text) {
if (separator) { if (separator) {
new->separator = json_object_get_int(separator); new->separator = json_object_get_int(separator);
} } else {
else {
new->separator = true; // i3bar spec new->separator = true; // i3bar spec
} }
if (separator_block_width) { if (separator_block_width) {
new->separator_block_width = json_object_get_int(separator_block_width); new->separator_block_width = json_object_get_int(separator_block_width);
} } else {
else {
new->separator_block_width = 9; // i3bar spec new->separator_block_width = 9; // i3bar spec
} }