mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-23 00:11:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #588 from mikkeloscar/clang-warnings

Browse source 
Remove clang warnings (-Wsign-compare)
This commit is contained in:
Drew DeVault 2016-04-16 14:10:59 -04:00
parent 837283098e 60731ffba1
commit 09efe0ce75
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
sway/layout.c
View file

@ -374,7 +374,7 @@ void move_workspace_to(swayc_t* workspace, swayc_t* destination) {
update_visibility(src_op); update_visibility(src_op);
} }
static void adjust_border_geometry(swayc_t *c, struct wlc_geometry *g, static void adjust_border_geometry(swayc_t *c, struct wlc_geometry *g,
const struct wlc_size *res, int left, int right, int top, int bottom) { const struct wlc_size *res, int left, int right, int top, int bottom) {
g->size.w += left + right; g->size.w += left + right;
@ -384,7 +384,7 @@ static void adjust_border_geometry(swayc_t *c, struct wlc_geometry *g,
else if (g->origin.x + g->size.w - right > res->w) { else if (g->origin.x + g->size.w - right > res->w) {
g->size.w = res->w - g->origin.x + right; g->size.w = res->w - g->origin.x + right;
} }
g->size.h += top + bottom; g->size.h += top + bottom;
if (g->origin.y - top < 0) { if (g->origin.y - top < 0) {
g->size.h += g->origin.y - top; g->size.h += g->origin.y - top;
@ -393,15 +393,15 @@ static void adjust_border_geometry(swayc_t *c, struct wlc_geometry *g,
g->size.h = res->h - g->origin.y + top; g->size.h = res->h - g->origin.y + top;
} }
g->origin.x = MIN(MAX( g->origin.x - left, 0), res->w); g->origin.x = MIN((uint32_t)MAX(g->origin.x - left, 0), res->w);
g->origin.y = MIN(MAX( g->origin.y - top, 0), res->h); g->origin.y = MIN((uint32_t)MAX(g->origin.y - top, 0), res->h);
} }
static void update_border_geometry_floating(swayc_t *c, struct wlc_geometry *geometry) { static void update_border_geometry_floating(swayc_t *c, struct wlc_geometry *geometry) {
struct wlc_geometry g = *geometry; struct wlc_geometry g = *geometry;
c->actual_geometry = g; c->actual_geometry = g;
swayc_t *output = swayc_parent_by_type(c, C_OUTPUT); swayc_t *output = swayc_parent_by_type(c, C_OUTPUT);
const struct wlc_size *res = wlc_output_get_resolution(output->handle); const struct wlc_size *res = wlc_output_get_resolution(output->handle);
@ -409,14 +409,14 @@ static void update_border_geometry_floating(swayc_t *c, struct wlc_geometry *geo
case B_NONE: case B_NONE:
break; break;
case B_PIXEL: case B_PIXEL:
adjust_border_geometry(c, &g, res, c->border_thickness, adjust_border_geometry(c, &g, res, c->border_thickness,
c->border_thickness, c->border_thickness, c->border_thickness); c->border_thickness, c->border_thickness, c->border_thickness);
break; break;
case B_NORMAL: case B_NORMAL:
{ {
int title_bar_height = config->font_height + 4; // borders + padding int title_bar_height = config->font_height + 4; // borders + padding
adjust_border_geometry(c, &g, res, c->border_thickness, adjust_border_geometry(c, &g, res, c->border_thickness,
c->border_thickness, title_bar_height, c->border_thickness); c->border_thickness, title_bar_height, c->border_thickness);
struct wlc_geometry title_bar = { struct wlc_geometry title_bar = {