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

do not change window placement on style changes

Browse source 
svn path=/trunk/kdebase/kwin/; revision=44451
This commit is contained in:
Matthias Ettrich 2000-03-24 09:42:23 +00:00
parent a637bea8e4
commit 12f591923c
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
workspace.cpp
View file

@ -48,7 +48,7 @@ int Shape::shapeEvent()
} }
/*! /*!
Updates kwin_time by receiving a current timestamp from the server. Updates kwin_time by receiving a current timestamp from the server.
*/ */
static void updateTime() static void updateTime()
@ -897,16 +897,16 @@ QPopupMenu* Workspace::clientPopup( Client* c )
if ( !popup ) { if ( !popup ) {
popup = new QPopupMenu; popup = new QPopupMenu;
popup->setCheckable( TRUE ); popup->setCheckable( TRUE );
popup->setFont(KGlobal::menuFont()); popup->setFont(KGlobal::menuFont());
connect( popup, SIGNAL( aboutToShow() ), this, SLOT( clientPopupAboutToShow() ) ); connect( popup, SIGNAL( aboutToShow() ), this, SLOT( clientPopupAboutToShow() ) );
connect( popup, SIGNAL( activated(int) ), this, SLOT( clientPopupActivated(int) ) ); connect( popup, SIGNAL( activated(int) ), this, SLOT( clientPopupActivated(int) ) );
PluginMenu *deco = new PluginMenu(&mgr, popup); PluginMenu *deco = new PluginMenu(&mgr, popup);
deco->setFont(KGlobal::menuFont()); deco->setFont(KGlobal::menuFont());
desk_popup = new QPopupMenu( popup ); desk_popup = new QPopupMenu( popup );
desk_popup->setCheckable( TRUE ); desk_popup->setCheckable( TRUE );
desk_popup->setFont(KGlobal::menuFont()); desk_popup->setFont(KGlobal::menuFont());
connect( desk_popup, SIGNAL( activated(int) ), this, SLOT( sendToDesktop(int) ) ); connect( desk_popup, SIGNAL( activated(int) ), this, SLOT( sendToDesktop(int) ) );
connect( desk_popup, SIGNAL( aboutToShow() ), this, SLOT( desktopPopupAboutToShow() ) ); connect( desk_popup, SIGNAL( aboutToShow() ), this, SLOT( desktopPopupAboutToShow() ) );
@ -1978,22 +1978,17 @@ void Workspace::slotResetAllClients()
{ {
for (ClientList::Iterator it = clients.begin(); it != clients.end(); ++it) { for (ClientList::Iterator it = clients.begin(); it != clients.end(); ++it) {
Client *oldClient = (*it); Client *oldClient = (*it);
WId w = oldClient->window(); WId w = oldClient->window();
bool mapped = oldClient->isVisible();
oldClient->hide(); oldClient->hide();
oldClient->releaseWindow(); oldClient->releaseWindow();
// Replace oldClient with newClient in all lists // Replace oldClient with newClient in all lists
Client *newClient = clientFactory (this, w); Client *newClient = clientFactory (this, w);
(*it) = newClient; (*it) = newClient;
ClientList::Iterator jt = stacking_order.find (oldClient); ClientList::Iterator jt = stacking_order.find (oldClient);
//assert (jt != stacking_order.end());
(*jt) = newClient; (*jt) = newClient;
jt = focus_chain.find (oldClient); jt = focus_chain.find (oldClient);
//assert (jt != focus_chain.end());
(*jt) = newClient; (*jt) = newClient;
// Delete the old, display the new
delete oldClient; delete oldClient;
newClient->manage (mapped); newClient->manage( TRUE );
} }
} }