alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2255 from emersion/xwayland-floating-borders

Browse source 
Don't disable borders for xwayland floating views
This commit is contained in:
Ryan Dwyer 2018-07-13 08:28:34 +10:00 committed by GitHub
parent da8149c066 53133fdefb
commit 683a307151
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -35,6 +35,7 @@ struct sway_view_impl {
void (*set_tiled)(struct sway_view *view, bool tiled); void (*set_tiled)(struct sway_view *view, bool tiled);
void (*set_fullscreen)(struct sway_view *view, bool fullscreen); void (*set_fullscreen)(struct sway_view *view, bool fullscreen);
bool (*wants_floating)(struct sway_view *view); bool (*wants_floating)(struct sway_view *view);
bool (*has_client_side_decorations)(struct sway_view *view);
void (*for_each_surface)(struct sway_view *view, void (*for_each_surface)(struct sway_view *view,
wlr_surface_iterator_func_t iterator, void *user_data); wlr_surface_iterator_func_t iterator, void *user_data);
void (*close)(struct sway_view *view); void (*close)(struct sway_view *view);

9
sway/desktop/xwayland.c
View file

@ -246,6 +246,14 @@ static bool wants_floating(struct sway_view *view) {
return false; return false;
} }
static bool has_client_side_decorations(struct sway_view *view) {
if (xwayland_view_from_view(view) == NULL) {
return false;
}
struct wlr_xwayland_surface *surface = view->wlr_xwayland_surface;
return surface->decorations != WLR_XWAYLAND_SURFACE_DECORATIONS_ALL;
}
static void _close(struct sway_view *view) { static void _close(struct sway_view *view) {
if (xwayland_view_from_view(view) == NULL) { if (xwayland_view_from_view(view) == NULL) {
return; return;
@ -269,6 +277,7 @@ static const struct sway_view_impl view_impl = {
.set_tiled = set_tiled, .set_tiled = set_tiled,
.set_fullscreen = set_fullscreen, .set_fullscreen = set_fullscreen,
.wants_floating = wants_floating, .wants_floating = wants_floating,
.has_client_side_decorations = has_client_side_decorations,
.close = _close, .close = _close,
.destroy = destroy, .destroy = destroy,
}; };

6
sway/tree/view.c
View file

@ -315,7 +315,11 @@ void view_set_activated(struct sway_view *view, bool activated) {
} }
void view_set_tiled(struct sway_view *view, bool tiled) { void view_set_tiled(struct sway_view *view, bool tiled) {
view->border = tiled ? config->border : B_NONE; bool csd = true;
if (view->impl->has_client_side_decorations) {
csd = view->impl->has_client_side_decorations(view);
}
view->border = tiled || !csd ? config->border : B_NONE;
if (view->impl->set_tiled) { if (view->impl->set_tiled) {
view->impl->set_tiled(view, tiled); view->impl->set_tiled(view, tiled);
} }