run clang-format (3.5.0)
Not quite sure why there are so many differences. Perhaps we’ve gotten out of the habit of running clang-format after every change. I guess it’d be best to have a travis hook that runs clang-format for us and reports any problems on pull requests.
This commit is contained in:
12
src/con.c
12
src/con.c
@ -1149,12 +1149,12 @@ Rect con_border_style_rect(Con *con) {
|
||||
/* Shortcut to avoid calling con_adjacent_borders() on dock containers. */
|
||||
int border_style = con_border_style(con);
|
||||
if (border_style == BS_NONE)
|
||||
return (Rect) {0, 0, 0, 0};
|
||||
return (Rect){0, 0, 0, 0};
|
||||
borders_to_hide = con_adjacent_borders(con) & config.hide_edge_borders;
|
||||
if (border_style == BS_NORMAL) {
|
||||
result = (Rect) {border_width, 0, -(2 * border_width), -(border_width)};
|
||||
result = (Rect){border_width, 0, -(2 * border_width), -(border_width)};
|
||||
} else {
|
||||
result = (Rect) {border_width, border_width, -(2 * border_width), -(2 * border_width)};
|
||||
result = (Rect){border_width, border_width, -(2 * border_width), -(2 * border_width)};
|
||||
}
|
||||
|
||||
/* Floating windows are never adjacent to any other window, so
|
||||
@ -1473,7 +1473,7 @@ Rect con_minimum_size(Con *con) {
|
||||
|
||||
if (con_is_leaf(con)) {
|
||||
DLOG("leaf node, returning 75x50\n");
|
||||
return (Rect) {0, 0, 75, 50};
|
||||
return (Rect){0, 0, 75, 50};
|
||||
}
|
||||
|
||||
if (con->type == CT_FLOATING_CON) {
|
||||
@ -1493,7 +1493,7 @@ Rect con_minimum_size(Con *con) {
|
||||
}
|
||||
DLOG("stacked/tabbed now, returning %d x %d + deco_rect = %d\n",
|
||||
max_width, max_height, deco_height);
|
||||
return (Rect) {0, 0, max_width, max_height + deco_height};
|
||||
return (Rect){0, 0, max_width, max_height + deco_height};
|
||||
}
|
||||
|
||||
/* For horizontal/vertical split containers we sum up the width (h-split)
|
||||
@ -1513,7 +1513,7 @@ Rect con_minimum_size(Con *con) {
|
||||
}
|
||||
}
|
||||
DLOG("split container, returning width = %d x height = %d\n", width, height);
|
||||
return (Rect) {0, 0, width, height};
|
||||
return (Rect){0, 0, width, height};
|
||||
}
|
||||
|
||||
ELOG("Unhandled case, type = %d, layout = %d, split = %d\n",
|
||||
|
Reference in New Issue
Block a user