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

Show the desktop switch popupinfo also when using mouse, and whatever.

Browse source 
BUG: 80698


svn path=/trunk/KDE/kdebase/kwin/; revision=409960
This commit is contained in:
Luboš Luňák 2005-05-06 09:24:51 +00:00
parent 8bc13480e3
commit d4c5fd676a
5 changed files with 5 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
activation.cpp
View file

@ -270,7 +270,6 @@ void Workspace::activateClient( Client* c, bool force )
++block_focus;
setCurrentDesktop( c->desktop() );
--block_focus;
// popupinfo->showInfo( desktopName(currentDesktop()) ); // AK - not sure
}
if( c->isMinimized())
c->unminimize();

1
layers.cpp
View file

@ -70,7 +70,6 @@ License. See the file "COPYING" for the exact licensing terms.
#include "client.h"
#include "workspace.h"
#include "tabbox.h"
#include "popupinfo.h"
#include "group.h"
#include "rules.h"

1
tabbox.cpp
View file

@ -1073,7 +1073,6 @@ void Workspace::tabBoxKeyRelease( const XKeyEvent& ev )
if ( tab_box->currentDesktop() != -1 )
{
setCurrentDesktop( tab_box->currentDesktop() );
// popupinfo->showInfo( desktopName(currentDesktop()) ); // AK - not sure
}
}
}

16
useractions.cpp
View file

@ -34,7 +34,6 @@ License. See the file "COPYING" for the exact licensing terms.
#include <kapplication.h>
#include <qregexp.h>
#include "popupinfo.h"
#include "killwindow.h"
#include "tabbox.h"
@ -571,7 +570,6 @@ void Workspace::slotSwitchDesktopNext()
}
}
setCurrentDesktop(d);
popupinfo->showInfo( desktopName(currentDesktop()) );
}
void Workspace::slotSwitchDesktopPrevious()
@ -585,7 +583,6 @@ void Workspace::slotSwitchDesktopPrevious()
return;
}
setCurrentDesktop(d);
popupinfo->showInfo( desktopName(currentDesktop()) );
}
void Workspace::slotSwitchDesktopRight()
@ -594,7 +591,6 @@ void Workspace::slotSwitchDesktopRight()
if( desktop == currentDesktop())
return;
setCurrentDesktop( desktop );
popupinfo->showInfo( desktopName(currentDesktop()) );
}
void Workspace::slotSwitchDesktopLeft()
@ -603,7 +599,6 @@ void Workspace::slotSwitchDesktopLeft()
if( desktop == currentDesktop())
return;
setCurrentDesktop( desktop );
popupinfo->showInfo( desktopName(currentDesktop()) );
}
void Workspace::slotSwitchDesktopUp()
@ -612,7 +607,6 @@ void Workspace::slotSwitchDesktopUp()
if( desktop == currentDesktop())
return;
setCurrentDesktop( desktop );
popupinfo->showInfo( desktopName(currentDesktop()) );
}
void Workspace::slotSwitchDesktopDown()
@ -621,13 +615,11 @@ void Workspace::slotSwitchDesktopDown()
if( desktop == currentDesktop())
return;
setCurrentDesktop( desktop );
popupinfo->showInfo( desktopName(currentDesktop()) );
}
void Workspace::slotSwitchToDesktop( int i )
{
setCurrentDesktop( i );
popupinfo->showInfo( desktopName(currentDesktop()) );
}
@ -776,7 +768,6 @@ void Workspace::slotWindowToNextDesktop()
setClientIsMoving( c );
setCurrentDesktop( d );
setClientIsMoving( NULL );
popupinfo->showInfo( desktopName(currentDesktop()) );
}
}
@ -795,7 +786,6 @@ void Workspace::slotWindowToPreviousDesktop()
setClientIsMoving( c );
setCurrentDesktop( d );
setClientIsMoving( NULL );
popupinfo->showInfo( desktopName(currentDesktop()) );
}
}
@ -811,7 +801,6 @@ void Workspace::slotWindowToDesktopRight()
setClientIsMoving( c );
setCurrentDesktop( d );
setClientIsMoving( NULL );
popupinfo->showInfo( desktopName(currentDesktop()) );
}
}
@ -827,7 +816,6 @@ void Workspace::slotWindowToDesktopLeft()
setClientIsMoving( c );
setCurrentDesktop( d );
setClientIsMoving( NULL );
popupinfo->showInfo( desktopName(currentDesktop()) );
}
}
@ -843,7 +831,6 @@ void Workspace::slotWindowToDesktopUp()
setClientIsMoving( c );
setCurrentDesktop( d );
setClientIsMoving( NULL );
popupinfo->showInfo( desktopName(currentDesktop()) );
}
}
@ -859,7 +846,6 @@ void Workspace::slotWindowToDesktopDown()
setClientIsMoving( c );
setCurrentDesktop( d );
setClientIsMoving( NULL );
popupinfo->showInfo( desktopName(currentDesktop()) );
}
}
@ -942,7 +928,7 @@ void Workspace::showWindowMenu( const QRect &pos, Client* cl )
*/
void Workspace::slotWindowClose()
{
if ( tab_box->isVisible() || popupinfo->isVisible() )
if ( tab_box->isVisible())
return;
Client* c = active_popup_client ? active_popup_client : active_client;
performWindowOperation( c, Options::CloseOp );

7
workspace.cpp
View file

@ -1070,6 +1070,7 @@ bool Workspace::setCurrentDesktop( int new_desktop )
// TODO Q_ASSERT( block_stacking_updates == 0 ); // make sure stacking_order is up to date
StackingUpdatesBlocker blocker( this );
int old_desktop = current_desktop;
if (new_desktop != current_desktop)
{
/*
@ -1080,7 +1081,6 @@ bool Workspace::setCurrentDesktop( int new_desktop )
ObscuringWindows obs_wins;
int old_desktop = current_desktop;
current_desktop = new_desktop; // change the desktop (so that Client::updateVisibility() works)
for ( ClientList::ConstIterator it = stacking_order.begin(); it != stacking_order.end(); ++it)
@ -1178,6 +1178,9 @@ bool Workspace::setCurrentDesktop( int new_desktop )
// for( uint i = 0; i < desktop_focus_chain.size(); i++ )
// s += QString::number(desktop_focus_chain[i]) + ", ";
// kdDebug(1212) << s << "}\n";
if( old_desktop != 0 ) // not for the very first time
popupinfo->showInfo( desktopName(currentDesktop()) );
return true;
}
@ -1186,7 +1189,6 @@ void Workspace::nextDesktop()
{
int desktop = currentDesktop() + 1;
setCurrentDesktop(desktop > numberOfDesktops() ? 1 : desktop);
popupinfo->showInfo( desktopName(currentDesktop()) );
}
// called only from DCOP
@ -1194,7 +1196,6 @@ void Workspace::previousDesktop()
{
int desktop = currentDesktop() - 1;
setCurrentDesktop(desktop > 0 ? desktop : numberOfDesktops());
popupinfo->showInfo( desktopName(currentDesktop()) );
}
int Workspace::desktopToRight( int desktop ) const