spaces instead of tabs
This commit is contained in:
parent
29bef03c5c
commit
2a8eb7286c
38
bar.c
38
bar.c
|
@ -602,7 +602,7 @@ monitor_new (int x, int y, int width, int height)
|
||||||
ret->cr = cairo_create(ret->surface);
|
ret->cr = cairo_create(ret->surface);
|
||||||
|
|
||||||
cairo_select_font_face (ret->cr, mfont? mfont: "fixed", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
|
cairo_select_font_face (ret->cr, mfont? mfont: "fixed", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
|
||||||
cairo_set_font_size(ret->cr, mfont_size);
|
cairo_set_font_size(ret->cr, mfont_size);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -1022,26 +1022,26 @@ parse_font_list (char *str)
|
||||||
|
|
||||||
tok = strtok(str, ",");
|
tok = strtok(str, ",");
|
||||||
if (tok) {
|
if (tok) {
|
||||||
mfont = tok; // font face
|
mfont = tok; // font face
|
||||||
|
|
||||||
// if a colon is found
|
// if a colon is found
|
||||||
tok = strtok(mfont, ":");
|
tok = strtok(mfont, ":");
|
||||||
if(tok) {
|
if(tok) {
|
||||||
// treat the string before the colon as the font face
|
// treat the string before the colon as the font face
|
||||||
mfont = tok; // font face
|
mfont = tok; // font face
|
||||||
|
|
||||||
// if characters exist after the colon
|
// if characters exist after the colon
|
||||||
tok = strtok(NULL, ":");
|
tok = strtok(NULL, ":");
|
||||||
if(tok) {
|
if(tok) {
|
||||||
double candidate_size;
|
double candidate_size;
|
||||||
candidate_size = atof(tok);
|
candidate_size = atof(tok);
|
||||||
// and the size is non-zero
|
// and the size is non-zero
|
||||||
if(candidate_size != 0) {
|
if(candidate_size != 0) {
|
||||||
// treat the rest of the string as the font size
|
// treat the rest of the string as the font size
|
||||||
mfont_size = candidate_size; // font size
|
mfont_size = candidate_size; // font size
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user