-rw-r--r-- | library/qpeapplication.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index a54fb20..c8e6e74 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp @@ -898,9 +898,9 @@ void QPEApplication::setDefaultRotation( int r ) } } // exported to libpreload.so -bool opie_block_style = false; +int opie_block_style = 0; /*! \internal */ @@ -909,9 +909,9 @@ void QPEApplication::applyStyle() Config config( "qpe" ); config.setGroup( "Appearance" ); // don't block ourselves ... - opie_block_style = false; + opie_block_style = 0; static QString appname; @@ -974,8 +974,10 @@ void QPEApplication::applyStyle() // don't set a custom deco if ( nostyle & 0x04 ) dec = ""; + //qDebug ( "Setting Deco: %s -- old %s (%d)", dec.latin1(), d-> decorationName.latin1(), nostyle); + if ( dec != d->decorationName ) { qwsSetDecoration( new QPEDecoration( dec ) ); d->decorationName = dec; } @@ -992,9 +994,10 @@ void QPEApplication::applyStyle() setFont( QFont(ff, fs) ); // revert to global blocking policy ... - opie_block_style = config. readBoolEntry ( "ForceStyle", false ); + opie_block_style = config. readBoolEntry ( "ForceStyle", false ) ? 0xff : 0x00; + opie_block_style -= nostyle; } void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data ) { |