From a30d1ee6ad70cc27ec780d68a43f139056f2f9d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Mon, 17 Dec 2007 16:30:36 +0000 Subject: [PATCH] Call updateShape() unconditionally, it checks itself for shape presence and also handles input shape, about which shape() call doesn't say anything. BUG: 152809 svn path=/trunk/KDE/kdebase/workspace/; revision=749695 --- geometry.cpp | 3 +-- manage.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/geometry.cpp b/geometry.cpp index 4b689d77ba..b0002f1c09 100644 --- a/geometry.cpp +++ b/geometry.cpp @@ -1719,8 +1719,7 @@ void Client::setGeometry( int x, int y, int w, int h, ForceGeometry_t force ) cs.width(), cs.height()); XMoveResizeWindow( display(), window(), 0, 0, cs.width(), cs.height()); } - if( shape()) - updateShape(); + updateShape(); } else XMoveWindow( display(), frameId(), x, y ); diff --git a/manage.cpp b/manage.cpp index 7b3347e760..0051de248d 100644 --- a/manage.cpp +++ b/manage.cpp @@ -331,8 +331,7 @@ bool Client::manage( Window w, bool isMapped ) if(( !isSpecialWindow() || isToolbar()) && isMovable()) keepInArea( area, partial_keep_in_area ); - if( shape()) - updateShape(); + updateShape(); //CT extra check for stupid jdk 1.3.1. But should make sense in general // if client has initial state set to Iconic and is transient with a parent