yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re-enabled sizeGrip in preview mode, with correct handling of parent windowID

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=1037767
This commit is contained in:
Hugo Pereira Da Costa 2009-10-19 22:51:31 +00:00
parent 393b37e211
commit d3f6aca4ee
2 changed files with 30 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clients/oxygen/oxygenclient.cpp
View file

@ -838,7 +838,7 @@ namespace Oxygen
if( configuration_.drawSizeGrip() )
{
if( !( hasSizeGrip() || isPreview() ) ) createSizeGrip();
if( !hasSizeGrip() ) createSizeGrip();
} else if( hasSizeGrip() ) deleteSizeGrip();

44
clients/oxygen/oxygensizegrip.cpp
View file

@ -43,7 +43,7 @@ namespace Oxygen
//_____________________________________________
OxygenSizeGrip::OxygenSizeGrip( OxygenClient* client ):
QWidget( 0 ),
QWidget(0),
client_( client )
{
@ -76,6 +76,7 @@ namespace Oxygen
show();
}
//_____________________________________________
OxygenSizeGrip::~OxygenSizeGrip( void )
{}
@ -89,22 +90,34 @@ namespace Oxygen
{
WId window_id = client().windowId();
assert( window_id );
if( client().isPreview() ) {
kDebug(1212) << "Using kcommondecoration::widget()" << endl;
setParent( client().widget() );
} else if( window_id ) {
kDebug(1212) << "Using Window ID" << endl;
WId current = window_id;
while( true )
{
WId root, parent = 0;
WId *children = 0L;
uint child_count = 0;
XQueryTree(QX11Info::display(), current, &root, &parent, &children, &child_count);
if( parent && parent != root && parent != current ) current = parent;
else break;
}
// reparent
XReparentWindow( QX11Info::display(), winId(), current, 0, 0 );
} else {
kDebug(1212) << "Unable to find valid parent. Hiding" << endl;
hide();
WId current = window_id;
while( true )
{
WId root, parent = 0;
WId *children = 0L;
uint child_count = 0;
XQueryTree(QX11Info::display(), current, &root, &parent, &children, &child_count);
if( parent && parent != root && parent != current ) current = parent;
else break;
}
// reparent
XReparentWindow( QX11Info::display(), winId(), current, 0, 0 );
}
//_____________________________________________
@ -181,7 +194,8 @@ namespace Oxygen
// check client window id
if( !client().windowId() ) break;
client().widget()->setFocus();
client().decoration()->performWindowOperation( KDecorationDefines::ResizeOp );
if( client().decoration() )
{ client().decoration()->performWindowOperation( KDecorationDefines::ResizeOp ); }
}
break;