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

Move docblock and fix indenting of switch/case.

Browse source
This commit is contained in:
Ryan Dwyer 2018-05-01 17:36:12 +10:00 committed by Drew DeVault
parent 630ba30e3c
commit fa5de2876e
2 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/sway/tree/view.h
View file

@ -167,6 +167,10 @@ const char *view_get_instance(struct sway_view *view);
void view_configure(struct sway_view *view, double ox, double oy, int width, void view_configure(struct sway_view *view, double ox, double oy, int width,
int height); int height);
/**
* Configure the view's position and size based on the swayc's position and
* size, taking borders into consideration.
*/
void view_autoconfigure(struct sway_view *view); void view_autoconfigure(struct sway_view *view);
void view_set_activated(struct sway_view *view, bool activated); void view_set_activated(struct sway_view *view, bool activated);

42
sway/tree/view.c
View file

@ -74,10 +74,6 @@ void view_configure(struct sway_view *view, double ox, double oy, int width,
} }
} }
/**
* Configure the view's position and size based on the swayc's position and
* size, taking borders into consideration.
*/
void view_autoconfigure(struct sway_view *view) { void view_autoconfigure(struct sway_view *view) {
if (!sway_assert(view->swayc, if (!sway_assert(view->swayc,
"Called view_autoconfigure() on a view without a swayc")) { "Called view_autoconfigure() on a view without a swayc")) {
@ -93,25 +89,25 @@ void view_autoconfigure(struct sway_view *view) {
double x, y, width, height; double x, y, width, height;
switch (view->border) { switch (view->border) {
case B_NONE: case B_NONE:
x = view->swayc->x; x = view->swayc->x;
y = view->swayc->y; y = view->swayc->y;
width = view->swayc->width; width = view->swayc->width;
height = view->swayc->height; height = view->swayc->height;
break; break;
case B_PIXEL: case B_PIXEL:
x = view->swayc->x + view->border_thickness; x = view->swayc->x + view->border_thickness;
y = view->swayc->y + view->border_thickness; y = view->swayc->y + view->border_thickness;
width = view->swayc->width - view->border_thickness * 2; width = view->swayc->width - view->border_thickness * 2;
height = view->swayc->height - view->border_thickness * 2; height = view->swayc->height - view->border_thickness * 2;
break; break;
case B_NORMAL: case B_NORMAL:
// TODO: Size the title bar by checking the font // TODO: Size the title bar by checking the font
x = view->swayc->x + view->border_thickness; x = view->swayc->x + view->border_thickness;
y = view->swayc->y + 20; y = view->swayc->y + 20;
width = view->swayc->width - view->border_thickness * 2; width = view->swayc->width - view->border_thickness * 2;
height = view->swayc->height - view->border_thickness - 20; height = view->swayc->height - view->border_thickness - 20;
break; break;
} }
view->x = x; view->x = x;