mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-29 05:40:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

view: constrain window size to that of usable area

Browse source 
...on first map (when application is started).

Fixes #1399
This commit is contained in:
Johan Malm 2024-01-06 21:36:12 +00:00 • committed by Johan Malm
parent bce0c6ce56
commit c646c7bd1b
4 changed files with 24 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/view.h
View file

@ -407,6 +407,7 @@ void view_center(struct view *view, const struct wlr_box *ref);
* @view: view to be placed
*/
void view_place_initial(struct view *view);
void view_constrain_size_to_that_of_usable_area(struct view *view);
void view_restore_to(struct view *view, struct wlr_box geometry);
void view_set_untiled(struct view *view);

19
src/view.c
View file

@ -731,6 +731,25 @@ view_place_initial(struct view *view)
view_center(view, NULL);
}
void
view_constrain_size_to_that_of_usable_area(struct view *view)
{
if (!view || !view->output) {
return;
}
struct wlr_box *usable_area = &view->output->usable_area;
struct border margin = ssd_get_margin(view->ssd);
struct wlr_box box = {
.x = view->pending.x,
.y = view->pending.y,
.width = MIN(usable_area->width - margin.left - margin.right,
view->pending.width),
.height = MIN(usable_area->height - margin.top - margin.bottom,
view->pending.height),
};
view_move_resize(view, box);
}
static void
view_apply_natural_geometry(struct view *view)
{

2
src/xdg.c
View file

@ -420,6 +420,8 @@ position_xdg_toplevel_view(struct view *view)
struct wlr_xdg_toplevel *parent_xdg_toplevel =
xdg_toplevel_from_view(view)->parent;
view_constrain_size_to_that_of_usable_area(view);
if (parent_xdg_toplevel) {
/* Child views are center-aligned relative to their parents */
struct view *parent = lookup_view_by_xdg_toplevel(

2
src/xwayland.c
View file

@ -505,6 +505,8 @@ set_initial_position(struct view *view,
XCB_ICCCM_SIZE_HINT_US_POSITION |
XCB_ICCCM_SIZE_HINT_P_POSITION));
view_constrain_size_to_that_of_usable_area(view);
if (has_position) {
/*
* Make sure a floating view is onscreen. For a