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

don't minimize dialog boxes that have a managed parent.

Browse source 
Unify operation menu enabled settings with visible decorations.

svn path=/trunk/kdebase/kwin/; revision=67486
This commit is contained in:
Matthias Ettrich 2000-10-13 15:37:07 +00:00
parent 2542107149
commit a0b6bdb956
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
client.cpp
View file

@ -623,12 +623,12 @@ bool Client::manage( bool isMapped, bool doNotShow, bool isInitial )
else if ( info->state() & NET::MaxHoriz ) else if ( info->state() & NET::MaxHoriz )
maximize( Client::MaximizeHorizontal ); maximize( Client::MaximizeHorizontal );
if ( isMaximizable() && !isMaximized() if ( isMaximizable() && !isMaximized()
&& ( width() >= area.width() || height() >= area.height() ) ) { && ( width() >= area.width() || height() >= area.height() ) ) {
// window is too large for the screen, maximize in the // window is too large for the screen, maximize in the
// directions necessary and generate a suitable restore // directions necessary and generate a suitable restore
// geometry. // geometry.
QSize s = adjustedSize( QSize( width()*2/3, height()*2/3 ) ); QSize s = adjustedSize( QSize( width()*2/3, height()*2/3 ) );
if ( width() >= area.width() && height() >= area.height() ) { if ( width() >= area.width() && height() >= area.height() ) {
maximize( Client::MaximizeFull ); maximize( Client::MaximizeFull );
geom_restore.setSize( s ); geom_restore.setSize( s );
@ -695,7 +695,7 @@ void Client::fetchName()
if ( XGetTextProperty( qt_xdisplay(), win, &tp, XA_WM_NAME) != 0 && tp.value != NULL ) { if ( XGetTextProperty( qt_xdisplay(), win, &tp, XA_WM_NAME) != 0 && tp.value != NULL ) {
if ( tp.encoding == XA_STRING ) if ( tp.encoding == XA_STRING )
s = QString::fromLocal8Bit( (const char*) tp.value ); s = QString::fromLocal8Bit( (const char*) tp.value );
else if ( XmbTextPropertyToTextList( qt_xdisplay(), &tp, &text, &count) == Success && else if ( XmbTextPropertyToTextList( qt_xdisplay(), &tp, &text, &count) == Success &&
text != NULL && count > 0 ) { text != NULL && count > 0 ) {
s = QString::fromLocal8Bit( text[0] ); s = QString::fromLocal8Bit( text[0] );
XFreeStringList( text ); XFreeStringList( text );
@ -972,10 +972,10 @@ bool Client::configureRequest( XConfigureRequestEvent& e )
QSize ns = sizeForWindowSize( QSize( nw, nh ) ); QSize ns = sizeForWindowSize( QSize( nw, nh ) );
QRect area = workspace()->clientArea(); QRect area = workspace()->clientArea();
if ( isMaximizable() && !isMaximized() if ( isMaximizable() && !isMaximized()
&& ( ns.width() >= area.width() || ns.height() >= area.height() ) ) { && ( ns.width() >= area.width() || ns.height() >= area.height() ) ) {
// window is too large for the screen, maximize in the // window is too large for the screen, maximize in the
// directions necessary // directions necessary
if ( ns.width() >= area.width() && ns.height() >= area.height() ) { if ( ns.width() >= area.width() && ns.height() >= area.height() ) {
maximize( Client::MaximizeFull ); maximize( Client::MaximizeFull );
} else if ( ns.width() >= area.width() ) { } else if ( ns.width() >= area.width() ) {
@ -1224,7 +1224,8 @@ bool Client::isMaximizable() const
*/ */
bool Client::isMinimizable() const bool Client::isMinimizable() const
{ {
return wantsTabFocus(); return ( !isTransient() || !workspace()->findClient( transientFor() ) )
&& wantsTabFocus();
} }

4
workspace.cpp
View file

@ -440,7 +440,7 @@ bool Workspace::workspaceEvent( XEvent * e )
if ( c ) if ( c )
(void) c->windowEvent( e ); (void) c->windowEvent( e );
return TRUE; return TRUE;
} }
return ( e->xmap.event != e->xmap.window ); // hide wm typical event from Qt return ( e->xmap.event != e->xmap.window ); // hide wm typical event from Qt
@ -2291,7 +2291,7 @@ void Workspace::clientPopupAboutToShow()
popup->setItemChecked( Options::MaximizeOp, popup_client->isMaximized() ); popup->setItemChecked( Options::MaximizeOp, popup_client->isMaximized() );
popup->setItemChecked( Options::ShadeOp, popup_client->isShade() ); popup->setItemChecked( Options::ShadeOp, popup_client->isShade() );
popup->setItemChecked( Options::StaysOnTopOp, popup_client->staysOnTop() ); popup->setItemChecked( Options::StaysOnTopOp, popup_client->staysOnTop() );
popup->setItemEnabled( Options::IconifyOp, !popup_client->isTransient() ); popup->setItemEnabled( Options::IconifyOp, popup_client->isMinimizable() );
} }