Call setShade() after maximize() when restoring windows ( maximize() calls
setShade( false ) ). Fixes #38700 and #36995 . svn path=/trunk/kdebase/kwin/; revision=138771icc-effect-5.14.5
parent
31be7dd834
commit
64901d9315
|
@ -65,9 +65,6 @@ public:
|
||||||
|
|
||||||
state &= mask; // for safety, clear all other bits
|
state &= mask; // for safety, clear all other bits
|
||||||
|
|
||||||
if ( mask & NET::Shaded )
|
|
||||||
m_client->setShade( state & NET::Shaded );
|
|
||||||
|
|
||||||
if ( (mask & NET::Max) == NET::Max ) {
|
if ( (mask & NET::Max) == NET::Max ) {
|
||||||
m_client->maximizeRaw( state & NET::MaxVert, state & NET::MaxHoriz );
|
m_client->maximizeRaw( state & NET::MaxVert, state & NET::MaxHoriz );
|
||||||
} else if ( mask & NET::MaxVert ) {
|
} else if ( mask & NET::MaxVert ) {
|
||||||
|
@ -75,6 +72,8 @@ public:
|
||||||
} else if ( mask & NET::MaxHoriz ) {
|
} else if ( mask & NET::MaxHoriz ) {
|
||||||
m_client->maximizeRaw( m_client->maximizeMode() & KWinInternal::Client::MaximizeVertical, state & NET::MaxHoriz );
|
m_client->maximizeRaw( m_client->maximizeMode() & KWinInternal::Client::MaximizeVertical, state & NET::MaxHoriz );
|
||||||
}
|
}
|
||||||
|
if ( mask & NET::Shaded )
|
||||||
|
m_client->setShade( state & NET::Shaded );
|
||||||
if ( mask & NET::StaysOnTop) {
|
if ( mask & NET::StaysOnTop) {
|
||||||
m_client->setStaysOnTop( (state & NET::StaysOnTop) != 0 );
|
m_client->setStaysOnTop( (state & NET::StaysOnTop) != 0 );
|
||||||
if ( m_client->staysOnTop() )
|
if ( m_client->staysOnTop() )
|
||||||
|
@ -776,11 +775,11 @@ bool Client::manage( bool isMapped, bool doNotShow, bool isInitial )
|
||||||
// other settings from the previous session
|
// other settings from the previous session
|
||||||
if ( session ) {
|
if ( session ) {
|
||||||
setSticky( session->sticky );
|
setSticky( session->sticky );
|
||||||
setShade( session->shaded );
|
|
||||||
setStaysOnTop( session->staysOnTop );
|
setStaysOnTop( session->staysOnTop );
|
||||||
setSkipTaskbar( session->skipTaskbar );
|
setSkipTaskbar( session->skipTaskbar );
|
||||||
setSkipPager( session->skipPager );
|
setSkipPager( session->skipPager );
|
||||||
maximize( (MaximizeMode) session->maximize );
|
maximize( (MaximizeMode) session->maximize );
|
||||||
|
setShade( session->shaded );
|
||||||
geom_restore = session->restore;
|
geom_restore = session->restore;
|
||||||
} else if ( !is_fullscreen ){
|
} else if ( !is_fullscreen ){
|
||||||
// window may want to be maximized
|
// window may want to be maximized
|
||||||
|
|
Loading…
Reference in New Issue