mirror of
https://github.com/swaywm/sway.git
synced 2024-11-26 18:01:29 +00:00
Fix titles and detect edges for hide_edge_borders
This commit is contained in:
parent
0c96d757d0
commit
6ff7c52736
|
@ -51,6 +51,10 @@ struct sway_view {
|
||||||
char *title_format;
|
char *title_format;
|
||||||
enum sway_container_border border;
|
enum sway_container_border border;
|
||||||
int border_thickness;
|
int border_thickness;
|
||||||
|
bool border_top;
|
||||||
|
bool border_bottom;
|
||||||
|
bool border_left;
|
||||||
|
bool border_right;
|
||||||
|
|
||||||
union {
|
union {
|
||||||
struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6;
|
struct wlr_xdg_surface_v6 *wlr_xdg_surface_v6;
|
||||||
|
|
|
@ -322,15 +322,7 @@ static void render_container_simple_border_normal(struct sway_output *output,
|
||||||
struct wlr_box box;
|
struct wlr_box box;
|
||||||
float color[4];
|
float color[4];
|
||||||
|
|
||||||
int other_views = 1;
|
if (con->sway_view->border_left) {
|
||||||
if (config->hide_edge_borders == E_SMART) {
|
|
||||||
struct sway_container *ws = container_parent(con, C_WORKSPACE);
|
|
||||||
other_views = container_count_descendants_of_type(ws, C_VIEW) - 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (config->hide_edge_borders != E_VERTICAL
|
|
||||||
&& config->hide_edge_borders != E_BOTH
|
|
||||||
&& (config->hide_edge_borders != E_SMART || other_views)) {
|
|
||||||
// Child border - left edge
|
// Child border - left edge
|
||||||
memcpy(&color, colors->child_border, sizeof(float) * 4);
|
memcpy(&color, colors->child_border, sizeof(float) * 4);
|
||||||
color[3] *= con->alpha;
|
color[3] *= con->alpha;
|
||||||
|
@ -339,7 +331,9 @@ static void render_container_simple_border_normal(struct sway_output *output,
|
||||||
box.width = con->sway_view->border_thickness;
|
box.width = con->sway_view->border_thickness;
|
||||||
box.height = con->height - 1;
|
box.height = con->height - 1;
|
||||||
render_rect(output->wlr_output, output_damage, &box, color);
|
render_rect(output->wlr_output, output_damage, &box, color);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (con->sway_view->border_right) {
|
||||||
// Child border - right edge
|
// Child border - right edge
|
||||||
if (con->parent->children->length == 1
|
if (con->parent->children->length == 1
|
||||||
&& con->parent->layout == L_HORIZ) {
|
&& con->parent->layout == L_HORIZ) {
|
||||||
|
@ -355,9 +349,7 @@ static void render_container_simple_border_normal(struct sway_output *output,
|
||||||
render_rect(output->wlr_output, output_damage, &box, color);
|
render_rect(output->wlr_output, output_damage, &box, color);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (config->hide_edge_borders != E_HORIZONTAL
|
if (con->sway_view->border_bottom) {
|
||||||
&& config->hide_edge_borders != E_BOTH
|
|
||||||
&& (config->hide_edge_borders != E_SMART || other_views)) {
|
|
||||||
// Child border - bottom edge
|
// Child border - bottom edge
|
||||||
if (con->parent->children->length == 1
|
if (con->parent->children->length == 1
|
||||||
&& con->parent->layout == L_VERT) {
|
&& con->parent->layout == L_VERT) {
|
||||||
|
@ -371,7 +363,9 @@ static void render_container_simple_border_normal(struct sway_output *output,
|
||||||
box.width = con->width;
|
box.width = con->width;
|
||||||
box.height = con->sway_view->border_thickness;
|
box.height = con->sway_view->border_thickness;
|
||||||
render_rect(output->wlr_output, output_damage, &box, color);
|
render_rect(output->wlr_output, output_damage, &box, color);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (con->sway_view->border_top) {
|
||||||
// Single pixel bar above title
|
// Single pixel bar above title
|
||||||
memcpy(&color, colors->border, sizeof(float) * 4);
|
memcpy(&color, colors->border, sizeof(float) * 4);
|
||||||
color[3] *= con->alpha;
|
color[3] *= con->alpha;
|
||||||
|
@ -380,8 +374,11 @@ static void render_container_simple_border_normal(struct sway_output *output,
|
||||||
box.width = con->width;
|
box.width = con->width;
|
||||||
box.height = 1;
|
box.height = 1;
|
||||||
render_rect(output->wlr_output, output_damage, &box, color);
|
render_rect(output->wlr_output, output_damage, &box, color);
|
||||||
|
}
|
||||||
|
|
||||||
// Single pixel bar below title
|
// Single pixel bar below title
|
||||||
|
memcpy(&color, colors->border, sizeof(float) * 4);
|
||||||
|
color[3] *= con->alpha;
|
||||||
box.x = con->x + con->sway_view->border_thickness;
|
box.x = con->x + con->sway_view->border_thickness;
|
||||||
box.y = con->sway_view->y - 1;
|
box.y = con->sway_view->y - 1;
|
||||||
box.width = con->width - con->sway_view->border_thickness * 2;
|
box.width = con->width - con->sway_view->border_thickness * 2;
|
||||||
|
@ -391,10 +388,13 @@ static void render_container_simple_border_normal(struct sway_output *output,
|
||||||
// Title background
|
// Title background
|
||||||
memcpy(&color, colors->background, sizeof(float) * 4);
|
memcpy(&color, colors->background, sizeof(float) * 4);
|
||||||
color[3] *= con->alpha;
|
color[3] *= con->alpha;
|
||||||
box.x = con->x + con->sway_view->border_thickness;
|
box.x = con->x
|
||||||
box.y = con->y + 1;
|
+ con->sway_view->border_thickness * con->sway_view->border_left;
|
||||||
box.width = con->width - con->sway_view->border_thickness * 2;
|
box.y = con->y + con->sway_view->border_top;
|
||||||
box.height = con->sway_view->y - con->y - 2;
|
box.width = con->width
|
||||||
|
- con->sway_view->border_thickness * con->sway_view->border_left
|
||||||
|
- con->sway_view->border_thickness * con->sway_view->border_right;
|
||||||
|
box.height = con->sway_view->y - con->y - (con->sway_view->border_top + 1);
|
||||||
render_rect(output->wlr_output, output_damage, &box, color);
|
render_rect(output->wlr_output, output_damage, &box, color);
|
||||||
|
|
||||||
// Title text
|
// Title text
|
||||||
|
@ -415,7 +415,6 @@ static void render_container_simple_border_normal(struct sway_output *output,
|
||||||
render_texture(output->wlr_output, output_damage, title_texture,
|
render_texture(output->wlr_output, output_damage, title_texture,
|
||||||
&texture_box, matrix, 1.0);
|
&texture_box, matrix, 1.0);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -427,15 +426,7 @@ static void render_container_simple_border_pixel(struct sway_output *output,
|
||||||
struct wlr_box box;
|
struct wlr_box box;
|
||||||
float color[4];
|
float color[4];
|
||||||
|
|
||||||
int other_views = 1;
|
if (con->sway_view->border_left) {
|
||||||
if (config->hide_edge_borders == E_SMART) {
|
|
||||||
struct sway_container *ws = container_parent(con, C_WORKSPACE);
|
|
||||||
other_views = container_count_descendants_of_type(ws, C_VIEW) - 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (config->hide_edge_borders != E_VERTICAL
|
|
||||||
&& config->hide_edge_borders != E_BOTH
|
|
||||||
&& (config->hide_edge_borders != E_SMART || other_views)) {
|
|
||||||
// Child border - left edge
|
// Child border - left edge
|
||||||
memcpy(&color, colors->child_border, sizeof(float) * 4);
|
memcpy(&color, colors->child_border, sizeof(float) * 4);
|
||||||
color[3] *= con->alpha;
|
color[3] *= con->alpha;
|
||||||
|
@ -444,7 +435,9 @@ static void render_container_simple_border_pixel(struct sway_output *output,
|
||||||
box.width = con->sway_view->border_thickness;
|
box.width = con->sway_view->border_thickness;
|
||||||
box.height = con->height;
|
box.height = con->height;
|
||||||
render_rect(output->wlr_output, output_damage, &box, color);
|
render_rect(output->wlr_output, output_damage, &box, color);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (con->sway_view->border_right) {
|
||||||
// Child border - right edge
|
// Child border - right edge
|
||||||
if (con->parent->children->length == 1
|
if (con->parent->children->length == 1
|
||||||
&& con->parent->layout == L_HORIZ) {
|
&& con->parent->layout == L_HORIZ) {
|
||||||
|
@ -460,16 +453,18 @@ static void render_container_simple_border_pixel(struct sway_output *output,
|
||||||
render_rect(output->wlr_output, output_damage, &box, color);
|
render_rect(output->wlr_output, output_damage, &box, color);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (config->hide_edge_borders != E_HORIZONTAL
|
if (con->sway_view->border_top) {
|
||||||
&& config->hide_edge_borders != E_BOTH
|
|
||||||
&& (config->hide_edge_borders != E_SMART || other_views)) {
|
|
||||||
// Child border - top edge
|
// Child border - top edge
|
||||||
|
memcpy(&color, colors->child_border, sizeof(float) * 4);
|
||||||
|
color[3] *= con->alpha;
|
||||||
box.x = con->x;
|
box.x = con->x;
|
||||||
box.y = con->y;
|
box.y = con->y;
|
||||||
box.width = con->width;
|
box.width = con->width;
|
||||||
box.height = con->sway_view->border_thickness;
|
box.height = con->sway_view->border_thickness;
|
||||||
render_rect(output->wlr_output, output_damage, &box, color);
|
render_rect(output->wlr_output, output_damage, &box, color);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (con->sway_view->border_bottom) {
|
||||||
// Child border - bottom edge
|
// Child border - bottom edge
|
||||||
if (con->parent->children->length == 1
|
if (con->parent->children->length == 1
|
||||||
&& con->parent->layout == L_VERT) {
|
&& con->parent->layout == L_VERT) {
|
||||||
|
|
|
@ -93,8 +93,9 @@ void view_autoconfigure(struct sway_view *view) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (view->is_fullscreen) {
|
|
||||||
struct sway_container *output = container_parent(view->swayc, C_OUTPUT);
|
struct sway_container *output = container_parent(view->swayc, C_OUTPUT);
|
||||||
|
|
||||||
|
if (view->is_fullscreen) {
|
||||||
view_configure(view, 0, 0, output->width, output->height);
|
view_configure(view, 0, 0, output->width, output->height);
|
||||||
view->x = view->y = 0;
|
view->x = view->y = 0;
|
||||||
return;
|
return;
|
||||||
|
@ -106,6 +107,25 @@ void view_autoconfigure(struct sway_view *view) {
|
||||||
other_views = container_count_descendants_of_type(ws, C_VIEW) - 1;
|
other_views = container_count_descendants_of_type(ws, C_VIEW) - 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
view->border_top = view->border_bottom = true;
|
||||||
|
view->border_left = view->border_right = true;
|
||||||
|
if (view->swayc->layout != L_FLOATING) {
|
||||||
|
if (config->hide_edge_borders == E_BOTH
|
||||||
|
|| config->hide_edge_borders == E_VERTICAL
|
||||||
|
|| (config->hide_edge_borders == E_SMART && !other_views)) {
|
||||||
|
view->border_left = view->swayc->x != 0;
|
||||||
|
int right_x = view->swayc->x + view->swayc->width;
|
||||||
|
view->border_right = right_x != output->width;
|
||||||
|
}
|
||||||
|
if (config->hide_edge_borders == E_BOTH
|
||||||
|
|| config->hide_edge_borders == E_HORIZONTAL
|
||||||
|
|| (config->hide_edge_borders == E_SMART && !other_views)) {
|
||||||
|
view->border_top = view->swayc->y != 0;
|
||||||
|
int bottom_y = view->swayc->y + view->swayc->height;
|
||||||
|
view->border_bottom = bottom_y != output->height;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
double x, y, width, height;
|
double x, y, width, height;
|
||||||
x = y = width = height = 0;
|
x = y = width = height = 0;
|
||||||
switch (view->border) {
|
switch (view->border) {
|
||||||
|
@ -116,51 +136,26 @@ void view_autoconfigure(struct sway_view *view) {
|
||||||
height = view->swayc->height;
|
height = view->swayc->height;
|
||||||
break;
|
break;
|
||||||
case B_PIXEL:
|
case B_PIXEL:
|
||||||
if (view->swayc->layout > L_VERT
|
x = view->swayc->x + view->border_thickness * view->border_left;
|
||||||
|| config->hide_edge_borders == E_NONE
|
y = view->swayc->y + view->border_thickness * view->border_top;
|
||||||
|| config->hide_edge_borders == E_HORIZONTAL
|
width = view->swayc->width
|
||||||
|| (config->hide_edge_borders == E_SMART && other_views)) {
|
- view->border_thickness * view->border_left
|
||||||
x = view->swayc->x + view->border_thickness;
|
- view->border_thickness * view->border_right;
|
||||||
width = view->swayc->width - view->border_thickness * 2;
|
height = view->swayc->height
|
||||||
} else {
|
- view->border_thickness * view->border_top
|
||||||
x = view->swayc->x;
|
- view->border_thickness * view->border_bottom;
|
||||||
width = view->swayc->width;
|
|
||||||
}
|
|
||||||
if (view->swayc->layout > L_VERT
|
|
||||||
|| config->hide_edge_borders == E_NONE
|
|
||||||
|| config->hide_edge_borders == E_VERTICAL
|
|
||||||
|| (config->hide_edge_borders == E_SMART && other_views)) {
|
|
||||||
y = view->swayc->y + view->border_thickness;
|
|
||||||
height = view->swayc->height - view->border_thickness * 2;
|
|
||||||
} else {
|
|
||||||
y = view->swayc->y;
|
|
||||||
height = view->swayc->height;
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case B_NORMAL:
|
case B_NORMAL:
|
||||||
if (view->swayc->layout > L_VERT
|
|
||||||
|| config->hide_edge_borders == E_NONE
|
|
||||||
|| config->hide_edge_borders == E_HORIZONTAL
|
|
||||||
|| (config->hide_edge_borders == E_SMART && other_views)) {
|
|
||||||
x = view->swayc->x + view->border_thickness;
|
|
||||||
width = view->swayc->width - view->border_thickness * 2;
|
|
||||||
} else {
|
|
||||||
x = view->swayc->x;
|
|
||||||
width = view->swayc->width;
|
|
||||||
}
|
|
||||||
if (view->swayc->layout > L_VERT
|
|
||||||
|| config->hide_edge_borders == E_NONE
|
|
||||||
|| config->hide_edge_borders == E_VERTICAL
|
|
||||||
|| (config->hide_edge_borders == E_SMART && other_views)) {
|
|
||||||
// Height is: border + title height + border + view height + border
|
// Height is: border + title height + border + view height + border
|
||||||
|
x = view->swayc->x + view->border_thickness * view->border_left;
|
||||||
y = view->swayc->y + config->font_height
|
y = view->swayc->y + config->font_height
|
||||||
+ view->border_thickness * 2;
|
+ view->border_thickness * (view->border_top + 1);
|
||||||
|
width = view->swayc->width
|
||||||
|
- view->border_thickness * view->border_left
|
||||||
|
- view->border_thickness * view->border_right;
|
||||||
height = view->swayc->height - config->font_height
|
height = view->swayc->height - config->font_height
|
||||||
- view->border_thickness * 3;
|
- view->border_thickness * (view->border_top + 1)
|
||||||
} else {
|
- view->border_thickness * view->border_bottom;
|
||||||
y = view->swayc->y;
|
|
||||||
height = view->swayc->height;
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue