properly lock monocle windows to container

a-morales · Jun 18, 2016 · 76596be · 76596be
1 parent 136b6e2
commit 76596be
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/kwm/window.cpp b/kwm/window.cpp
@@ -1077,15 +1077,23 @@ void LockWindowToContainerSize(ax_window *Window)
 
  space_info *SpaceInfo = &WindowTree[Display->Space->Identifier];
  tree_node *Node = GetTreeNodeFromWindowID(SpaceInfo->RootNode, Window->ID);
- if(!Node)
- return;
-
- if(IsWindowFullscreen(Window))
- ResizeWindowToContainerSize(SpaceInfo->RootNode);
- else if(IsWindowParentContainer(Window))
- ResizeWindowToContainerSize(Node->Parent);
+ if(Node)
+ {
+ if(IsWindowFullscreen(Window))
+ ResizeWindowToContainerSize(SpaceInfo->RootNode);
+ else if(IsWindowParentContainer(Window))
+ ResizeWindowToContainerSize(Node->Parent);
+ else
+ ResizeWindowToContainerSize(Node);
+ }
  else
- ResizeWindowToContainerSize(Node);
+ {
+ link_node *Link = GetLinkNodeFromTree(SpaceInfo->RootNode, Window->ID);
+ if(Link)
+ {
+ ResizeWindowToContainerSize(Link);
+ }
+ }
  }
 }