mirror of
https://github.com/labwc/labwc.git
synced 2025-11-02 09:01:47 -05:00
view: Hide decorations for fullscreen views
Otherwise the decorations are visible on adjacent outputs.
This commit is contained in:
parent
d6aea3e58f
commit
9dd55f0490
2 changed files with 16 additions and 4 deletions
|
|
@ -16,7 +16,11 @@
|
||||||
struct border
|
struct border
|
||||||
ssd_thickness(struct view *view)
|
ssd_thickness(struct view *view)
|
||||||
{
|
{
|
||||||
if (!view->ssd_enabled) {
|
/*
|
||||||
|
* Check preconditions for displaying SSD. Note that this
|
||||||
|
* needs to work even before ssd_create() has been called.
|
||||||
|
*/
|
||||||
|
if (!view->ssd_enabled || view->fullscreen) {
|
||||||
return (struct border){ 0 };
|
return (struct border){ 0 };
|
||||||
}
|
}
|
||||||
struct theme *theme = view->server->theme;
|
struct theme *theme = view->server->theme;
|
||||||
|
|
|
||||||
14
src/view.c
14
src/view.c
|
|
@ -605,10 +605,15 @@ view_set_fullscreen(struct view *view, bool fullscreen,
|
||||||
if (!view->maximized && !view->tiled) {
|
if (!view->maximized && !view->tiled) {
|
||||||
view_store_natural_geometry(view);
|
view_store_natural_geometry(view);
|
||||||
}
|
}
|
||||||
|
/* Hide decorations when going fullscreen */
|
||||||
|
if (view->ssd_enabled) {
|
||||||
|
ssd_destroy(view);
|
||||||
|
}
|
||||||
view->fullscreen = wlr_output;
|
view->fullscreen = wlr_output;
|
||||||
view_apply_fullscreen_geometry(view, view->fullscreen);
|
view_apply_fullscreen_geometry(view, view->fullscreen);
|
||||||
} else {
|
} else {
|
||||||
/* restore to normal */
|
view->fullscreen = false;
|
||||||
|
/* Restore non-fullscreen geometry */
|
||||||
if (view->maximized) {
|
if (view->maximized) {
|
||||||
view_apply_maximized_geometry(view);
|
view_apply_maximized_geometry(view);
|
||||||
} else if (view->tiled) {
|
} else if (view->tiled) {
|
||||||
|
|
@ -616,7 +621,10 @@ view_set_fullscreen(struct view *view, bool fullscreen,
|
||||||
} else {
|
} else {
|
||||||
view_apply_unmaximized_geometry(view);
|
view_apply_unmaximized_geometry(view);
|
||||||
}
|
}
|
||||||
view->fullscreen = false;
|
/* Re-show decorations when no longer fullscreen */
|
||||||
|
if (view->ssd_enabled) {
|
||||||
|
ssd_create(view, view == view->server->focused_view);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Show fullscreen views above top-layer */
|
/* Show fullscreen views above top-layer */
|
||||||
|
|
@ -875,7 +883,7 @@ void
|
||||||
view_reload_ssd(struct view *view)
|
view_reload_ssd(struct view *view)
|
||||||
{
|
{
|
||||||
assert(view);
|
assert(view);
|
||||||
if (view->ssd_enabled) {
|
if (view->ssd_enabled && !view->fullscreen) {
|
||||||
ssd_destroy(view);
|
ssd_destroy(view);
|
||||||
ssd_create(view, view == view->server->focused_view);
|
ssd_create(view, view == view->server->focused_view);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue