summaryrefslogtreecommitdiff
path: root/decorations
diff options
authorMarco Trevisan (Treviño) <mail@3v1n0.net>2016-03-08 01:09:32 +0100
committerMarco Trevisan (Treviño) <mail@3v1n0.net>2016-03-08 01:09:32 +0100
commitfb7c7936f60764bac5d1a8199bf23ef38853aac7 (patch)
treea0bf6a1bf9f9536a05dbdf2e6c3a34d17820d542 /decorations
parentafde6bb3b2b11d4d24487d4563c5f6b4f92109f4 (diff)
DecoratedWindow: don't try to create a frame if the window has not a parent yet
We can do it when we get the CompWindowNotifyReparent event (bzr r3983.15.7)
Diffstat (limited to 'decorations')
-rw-r--r--decorations/DecoratedWindow.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/decorations/DecoratedWindow.cpp b/decorations/DecoratedWindow.cpp
index a84926808..0cadcfbee 100644
--- a/decorations/DecoratedWindow.cpp
+++ b/decorations/DecoratedWindow.cpp
@@ -157,7 +157,6 @@ void Window::Impl::UnsetExtents()
void Window::Impl::SetupExtents()
{
- // FIXME: EDGE not being set on startup on client_decorated
if (win_->hasUnmapReference())
return;
@@ -215,10 +214,10 @@ void Window::Impl::UpdateFrame()
if (win_->shaded())
frame_geo.height = input.top + input.bottom;
- if (!frame_)
+ if (!frame_ && win_->frame())
CreateFrame(frame_geo);
- if (frame_geo_ != frame_geo)
+ if (frame_ && frame_geo_ != frame_geo)
UpdateFrameGeo(frame_geo);
}