Attachment #181272 for bug #304184

View | Details | Raw Unified | Return to bug 304184
Collapse All | Expand All





    updateShadow ();

    mDecorNormal = new KWD::Window (mCompositeWindow->winId (), qt_xrootwin (),
				    0, Window::Default);
    mDecorActive = new KWD::Window (mCompositeWindow->winId (), qt_xrootwin (),
				    0, Window::DefaultActive);

    connect (mKWinModule, SIGNAL (windowAdded (WId)),

    {
	if (!mClients.contains (id))
	{
	    client = new KWD::Window (mCompositeWindow->winId (),
				      id, frame, type,
				      x, y,
				      width + border * 2,
				      height + border * 2);

    {
	if (!mClients.contains (id))
	{
	    client = new KWD::Window (mCompositeWindow->winId (), id, 0, type,
				      x, y,
				      width + border * 2,
				      height + border * 2);

Lines 54-67 Link Here

(-)a/kde/window-decorator/window.cpp (-13 / +10 lines)
54	#include <qcursor.h>	54	#include <qcursor.h>
55	#include <qpopupmenu.h>	55	#include <qpopupmenu.h>
56		56
57	KWD::Window::Window (QWidget *parent,	57	KWD::Window::Window (WId parentId,
58	WId clientId,	58	WId clientId,
59	WId frame,	59	WId frame,
60	Type type,	60	Type type,
61	int x,	61	int x,
62	int y,	62	int y,
63	int w,	63	int w,
64	int h): QWidget (parent, 0),	64	int h): QWidget (0, 0),
65	mType (type),	65	mType (type),
66	mFrame (0),	66	mFrame (0),
67	mClientId (clientId),	67	mClientId (clientId),
Lines 122-127 KWD::Window::Window (QWidget *parent, Link Here
122	mGeometry = QRect (50, 50, 30, 1);	122	mGeometry = QRect (50, 50, 30, 1);
123	}	123	}
124		124
		125	XReparentWindow (qt_xdisplay (), winId (), parentId, 0, 0);
		126
125	setGeometry (QRect (mGeometry.x () + ROOT_OFF_X,	127	setGeometry (QRect (mGeometry.x () + ROOT_OFF_X,
126	mGeometry.y () + ROOT_OFF_Y,	128	mGeometry.y () + ROOT_OFF_Y,
127	mGeometry.width (), mGeometry.height ()));	129	mGeometry.width (), mGeometry.height ()));
Lines 1159-1169 KWD::Window::resizeDecoration (bool force) Link Here
1159		1161
1160	mMapped = true;	1162	mMapped = true;
1161		1163
1162	/* XXX: is there a more appropriate way to achieve this?
1163	add WType_TopLevel flag so that visualRect isn't clipped
1164	to parent. */
1165	setWFlags (getWFlags () \| WType_TopLevel);
1166
1167	if (mDamageId != winId ())	1164	if (mDamageId != winId ())
1168	{	1165	{
1169	mDamageId = winId ();	1166	mDamageId = winId ();

Lines 54-60 class Window:public QWidget, public KDecorationBridge { Link Here

(-)a/kde/window-decorator/window.h (-1 / +1 lines)
54	};	54	};
55		55
56	public:	56	public:
57	Window (QWidget *parent, WId clientId, WId frame, Type type,	57	Window (WId parentId, WId clientId, WId frame, Type type,
58	int x = 0, int y = 0, int w = 1, int h = 1);	58	int x = 0, int y = 0, int w = 1, int h = 1);
59	~Window (void);	59	~Window (void);
60		60

Return to bug 304184

Lines 299-307 KWD::Decorator::enableDecorations (Time timestamp, Link Here

(-)a/kde/window-decorator/decorator.cpp (-4 / +5 lines)
299		299
300	updateShadow ();	300	updateShadow ();
301		301
302	mDecorNormal = new KWD::Window (mCompositeWindow, qt_xrootwin (),	302	mDecorNormal = new KWD::Window (mCompositeWindow->winId (), qt_xrootwin (),
303	0, Window::Default);	303	0, Window::Default);
304	mDecorActive = new KWD::Window (mCompositeWindow, qt_xrootwin (),	304	mDecorActive = new KWD::Window (mCompositeWindow->winId (), qt_xrootwin (),
305	0, Window::DefaultActive);	305	0, Window::DefaultActive);
306		306
307	connect (mKWinModule, SIGNAL (windowAdded (WId)),	307	connect (mKWinModule, SIGNAL (windowAdded (WId)),
Lines 918-924 KWD::Decorator::handleWindowAdded (WId id) Link Here
918	{	918	{
919	if (!mClients.contains (id))	919	if (!mClients.contains (id))
920	{	920	{
921	client = new KWD::Window (mCompositeWindow, id, frame, type,	921	client = new KWD::Window (mCompositeWindow->winId (),
		922	id, frame, type,
922	x, y,	923	x, y,
923	width + border * 2,	924	width + border * 2,
924	height + border * 2);	925	height + border * 2);
Lines 940-946 KWD::Decorator::handleWindowAdded (WId id) Link Here
940	{	941	{
941	if (!mClients.contains (id))	942	if (!mClients.contains (id))
942	{	943	{
943	client = new KWD::Window (mCompositeWindow, id, 0, type,	944	client = new KWD::Window (mCompositeWindow->winId (), id, 0, type,
944	x, y,	945	x, y,
945	width + border * 2,	946	width + border * 2,
946	height + border * 2);	947	height + border * 2);