Make also secondary key in the shortcut work properly with the tabbox.
CCMAIL: 82103-done@bugs.kde.org svn path=/trunk/kdebase/kwin/; revision=340983
This commit is contained in:
parent
79d5c97345
commit
ddf5c4261c
1 changed files with 16 additions and 4 deletions
20
tabbox.cpp
20
tabbox.cpp
|
@ -640,13 +640,13 @@ bool areKeySymXsDepressed( bool bAll, int nKeySyms, ... )
|
||||||
return bAll;
|
return bAll;
|
||||||
}
|
}
|
||||||
|
|
||||||
static
|
static bool areModKeysDepressed( const KKeySequence& seq )
|
||||||
bool areModKeysDepressed( const KShortcut& cut )
|
|
||||||
{
|
{
|
||||||
|
|
||||||
uint rgKeySyms[10];
|
uint rgKeySyms[10];
|
||||||
int nKeySyms = 0;
|
int nKeySyms = 0;
|
||||||
int mod = cut.seq(0).key(0).modFlags();
|
if( seq.isNull())
|
||||||
|
return false;
|
||||||
|
int mod = seq.key(seq.count()-1).modFlags();
|
||||||
|
|
||||||
if ( mod & KKey::SHIFT )
|
if ( mod & KKey::SHIFT )
|
||||||
{
|
{
|
||||||
|
@ -679,6 +679,18 @@ bool areModKeysDepressed( const KShortcut& cut )
|
||||||
rgKeySyms[4], rgKeySyms[5], rgKeySyms[6], rgKeySyms[7] );
|
rgKeySyms[4], rgKeySyms[5], rgKeySyms[6], rgKeySyms[7] );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool areModKeysDepressed( const KShortcut& cut )
|
||||||
|
{
|
||||||
|
for( int i = 0;
|
||||||
|
i < cut.count();
|
||||||
|
++i )
|
||||||
|
{
|
||||||
|
if( areModKeysDepressed( cut.seq( i )))
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
void Workspace::slotWalkThroughWindows()
|
void Workspace::slotWalkThroughWindows()
|
||||||
{
|
{
|
||||||
if ( root != qt_xrootwin() )
|
if ( root != qt_xrootwin() )
|
||||||
|
|
Loading…
Reference in a new issue