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

Made KWin compile when QT_NO_COMPAT is defined.

Browse source 
svn path=/trunk/kdebase/kwin/; revision=115985
This commit is contained in:
Fredrik Höglund 2001-09-30 21:22:20 +00:00
parent 372afd2293
commit 7497342101
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
client.cpp
View file

@ -2206,24 +2206,24 @@ void Client::setShade( bool s, int hus )
QSize s( sizeForWindowSize( QSize( windowWrapper()->width(), 0), TRUE ) ); QSize s( sizeForWindowSize( QSize( windowWrapper()->width(), 0), TRUE ) );
windowWrapper()->hide(); windowWrapper()->hide();
repaint( FALSE ); repaint( FALSE );
bool wasNorthWest = testWFlags( WNorthWestGravity ); bool wasStaticContents = testWFlags( WStaticContents );
setWFlags( WNorthWestGravity ); setWFlags( WStaticContents );
int step = QMAX( 4, QABS( h - s.height() ) / as )+1; int step = QMAX( 4, QABS( h - s.height() ) / as )+1;
do { do {
h -= step; h -= step;
resize ( s.width(), h ); resize ( s.width(), h );
QApplication::syncX(); QApplication::syncX();
} while ( h > s.height() + step ); } while ( h > s.height() + step );
if ( !wasNorthWest ) if ( !wasStaticContents )
clearWFlags( WNorthWestGravity ); clearWFlags( WStaticContents );
resize (s ); resize (s );
if (hus) if (hus)
workspace()->requestFocus( NULL ); workspace()->requestFocus( NULL );
} else { } else {
int h = height(); int h = height();
QSize s( sizeForWindowSize( windowWrapper()->size(), TRUE ) ); QSize s( sizeForWindowSize( windowWrapper()->size(), TRUE ) );
bool wasNorthWest = testWFlags( WNorthWestGravity ); bool wasStaticContents = testWFlags( WStaticContents );
setWFlags( WNorthWestGravity ); setWFlags( WStaticContents );
int step = QMAX( 4, QABS( h - s.height() ) / as )+1; int step = QMAX( 4, QABS( h - s.height() ) / as )+1;
do { do {
h += step; h += step;
@ -2233,8 +2233,8 @@ void Client::setShade( bool s, int hus )
repaint( 0, h - step-5, width(), step+5, TRUE); repaint( 0, h - step-5, width(), step+5, TRUE);
QApplication::syncX(); QApplication::syncX();
} while ( h < s.height() - step ); } while ( h < s.height() - step );
if ( !wasNorthWest ) if ( !wasStaticContents )
clearWFlags( WNorthWestGravity ); clearWFlags( WStaticContents );
resize ( s ); resize ( s );
if (hus) if (hus)
setActive( TRUE ); setActive( TRUE );

8
options.cpp
View file

@ -81,7 +81,7 @@ const QColorGroup& Options::colorGroup(ColorType type, bool active)
return(*cg[idx]); return(*cg[idx]);
cg[idx] = new QColorGroup(Qt::black, colors[idx], colors[idx].light(150), cg[idx] = new QColorGroup(Qt::black, colors[idx], colors[idx].light(150),
colors[idx].dark(), colors[idx].dark(120), colors[idx].dark(), colors[idx].dark(120),
Qt::black, QApplication::palette().normal(). Qt::black, QApplication::palette().active().
base()); base());
return(*cg[idx]); return(*cg[idx]);
} }
@ -93,7 +93,7 @@ void Options::reload()
config->setGroup("WM"); config->setGroup("WM");
// normal colors // normal colors
colors[Frame] = pal.normal().background(); colors[Frame] = pal.active().background();
colors[Frame] = config->readColorEntry("frame", &colors[Frame]); colors[Frame] = config->readColorEntry("frame", &colors[Frame]);
colors[Handle] = colors[Frame]; colors[Handle] = colors[Frame];
colors[Handle] = config->readColorEntry("handle", &colors[Handle]); colors[Handle] = config->readColorEntry("handle", &colors[Handle]);
@ -105,7 +105,7 @@ void Options::reload()
colors[ButtonBg] = colors[Frame]; colors[ButtonBg] = colors[Frame];
colors[ButtonBg] = config->readColorEntry("activeTitleBtnBg", colors[ButtonBg] = config->readColorEntry("activeTitleBtnBg",
&colors[Frame]); &colors[Frame]);
colors[TitleBar] = pal.normal().highlight(); colors[TitleBar] = pal.active().highlight();
colors[TitleBar] = config->readColorEntry("activeBackground", colors[TitleBar] = config->readColorEntry("activeBackground",
&colors[TitleBar]); &colors[TitleBar]);
if(QPixmap::defaultDepth() > 8) if(QPixmap::defaultDepth() > 8)
@ -115,7 +115,7 @@ void Options::reload()
colors[TitleBlend] = config->readColorEntry("activeBlend", colors[TitleBlend] = config->readColorEntry("activeBlend",
&colors[TitleBlend]); &colors[TitleBlend]);
colors[Font] = pal.normal().highlightedText(); colors[Font] = pal.active().highlightedText();
colors[Font] = config->readColorEntry("activeForeground", &colors[Font]); colors[Font] = config->readColorEntry("activeForeground", &colors[Font]);
// inactive // inactive

2
workspace.cpp
View file

@ -2001,7 +2001,7 @@ bool Workspace::isNotManaged( const QString& title )
{ {
for ( QStringList::Iterator it = doNotManageList.begin(); it != doNotManageList.end(); ++it ) { for ( QStringList::Iterator it = doNotManageList.begin(); it != doNotManageList.end(); ++it ) {
QRegExp r( (*it) ); QRegExp r( (*it) );
if (r.match(title) != -1) { if (r.search(title) != -1) {
doNotManageList.remove( it ); doNotManageList.remove( it );
return TRUE; return TRUE;
} }