[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/ksplashml/themeengine
From:       Ravikiran Rajagopal <ravi () kde ! org>
Date:       2003-12-15 20:50:03
[Download RAW message or body]

CVS commit by ravi: 

Apparently NET::Splash centers the widget in Kwin and does not allow it to move. But \
our widgets need to move, and require more sophisticated handling. This fixes bugs \
70321 and 70331. For some reason, KWin segfaults (even before this fix), but it works \
with Metacity and with no WM. I haven't touched this code since before the KWin3 \
merge.

CCMAIL: l.lunak@kde.org


  M +1 -2      themeengine.cpp   1.11
  M +2 -2      standard/themestandard.cpp   1.10
  M +2 -3      standard/wndicon.cpp   1.8
  M +2 -2      standard/wndstatus.cpp   1.9


--- kdebase/ksplashml/themeengine/standard/themestandard.cpp  #1.9:1.10
@@ -144,6 +144,6 @@ void ThemeStandard::_readSettings()
   cfg->setGroup( QString("KSplash Theme: %1").arg(mTheme->theme()) );
 
-  QString sbpos = cfg->readEntry( "Statusbar Position", "Bottom" );
-  mSbAtTop = ( sbpos == "Top" || sbpos == "top" || sbpos == "TOP" );
+  QString sbpos = cfg->readEntry( "Statusbar Position", "Bottom" ).upper();
+  mSbAtTop = ( sbpos == "TOP" );
   mSbVisible = cfg->readBoolEntry( "Statusbar Visible", true);
   mSbPbVisible = cfg->readBoolEntry( "Progress Visible", true);

--- kdebase/ksplashml/themeengine/standard/wndicon.cpp  #1.7:1.8
@@ -50,6 +50,5 @@ WndIcon::WndIcon(
      mStopJump(false), mIconJumping(iconsJumping)
 {
-  KWin::setState( winId(), NET::Modal | NET::StaysOnTop | NET::SkipTaskbar | \
                NET::SkipPager );
-  KWin::setType( winId(), NET::Splash );
+  KWin::setState( winId(), NET::StaysOnTop | NET::SkipTaskbar | NET::SkipPager );
   KWin::setOnDesktop( winId(), NET::OnAllDesktops );
   setFrameStyle( QFrame::NoFrame );

--- kdebase/ksplashml/themeengine/standard/wndstatus.cpp  #1.8:1.9
@@ -13,4 +13,5 @@
 #include <kapplication.h>
 #include <kcursor.h>
+#include <kdebug.h>
 #include <kglobalsettings.h>
 #include <kiconloader.h>
@@ -40,6 +41,5 @@ WndStatus::WndStatus( QPalette pal,
 {
 
-  KWin::setState( winId(), NET::Modal | NET::StaysOnTop | NET::SkipTaskbar | \
                NET::SkipPager );
-  KWin::setType( winId(), NET::Splash );
+  KWin::setState( winId(), NET::StaysOnTop | NET::SkipTaskbar | NET::SkipPager );
   KWin::setOnDesktop( winId(), NET::OnAllDesktops );
 

--- kdebase/ksplashml/themeengine/themeengine.cpp  #1.10:1.11
@@ -43,6 +43,5 @@ ThemeEngine::ThemeEngine( QWidget *, con
   mTheme->loadCmdLineArgs( KCmdLineArgs::parsedArgs() );
 
-  KWin::setState( winId(), NET::Modal | NET::StaysOnTop | NET::SkipTaskbar | \
                NET::SkipPager );
-  KWin::setType( winId(), NET::Splash );
+  KWin::setState( winId(), NET::StaysOnTop | NET::SkipTaskbar | NET::SkipPager );
   KWin::setOnDesktop( winId(), NET::OnAllDesktops );
 


[prev in list] [next in list] [prev in thread] [next in thread]