hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-25 11:25:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/main' into pin-fullscreen

Browse source
This commit is contained in:
littleblack111 2024-11-20 11:56:29 +08:00
commit 2503265966
No known key found for this signature in database
GPG key ID: 736753424BA3940C
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/protocols/XDGShell.cpp
View file

@ -324,11 +324,21 @@ void CXDGToplevelResource::close() {
} }
Vector2D CXDGToplevelResource::layoutMinSize() { Vector2D CXDGToplevelResource::layoutMinSize() {
return owner ? current.minSize + owner->current.geometry.pos() : current.minSize; Vector2D minSize;
if (current.minSize.x > 1)
minSize.x = owner ? current.minSize.x + owner->current.geometry.pos().x : current.minSize.x;
if (current.minSize.y > 1)
minSize.y = owner ? current.minSize.y + owner->current.geometry.pos().y : current.minSize.y;
return minSize;
} }
Vector2D CXDGToplevelResource::layoutMaxSize() { Vector2D CXDGToplevelResource::layoutMaxSize() {
return owner ? current.maxSize + owner->current.geometry.pos() : current.maxSize; Vector2D maxSize;
if (current.maxSize.x > 1)
maxSize.x = owner ? current.maxSize.x + owner->current.geometry.pos().x : current.maxSize.x;
if (current.maxSize.y > 1)
maxSize.y = owner ? current.maxSize.y + owner->current.geometry.pos().y : current.maxSize.y;
return maxSize;
} }
CXDGSurfaceResource::CXDGSurfaceResource(SP<CXdgSurface> resource_, SP<CXDGWMBase> owner_, SP<CWLSurfaceResource> surface_) : CXDGSurfaceResource::CXDGSurfaceResource(SP<CXdgSurface> resource_, SP<CXDGWMBase> owner_, SP<CWLSurfaceResource> surface_) :