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

List:       kde-commits
Subject:    kdebase/kcontrol/background
From:       Waldo Bastian <bastian () kde ! org>
Date:       2005-03-30 21:41:39
Message-ID: 20050330214139.A51AB4A6 () office ! kde ! org
[Download RAW message or body]

CVS commit by waba: 

Try to keep the current wallpaper when making small changes to the pictures
in the slide show
BUG: 71962


  M +8 -1      bgsettings.cpp   1.23


--- kdebase/kcontrol/background/bgsettings.cpp  #1.22:1.23
@@ -667,4 +667,9 @@ void KBackgroundSettings::setWallpaperLi
     if (m_WallpaperList == list)
         return;
+
+    QString currentWallpaper;
+    if ((m_MultiMode == InOrder) && (m_CurrentWallpaper < (int) m_WallpaperFiles.count()))
+        currentWallpaper = m_WallpaperFiles[m_CurrentWallpaper];
+
     dirty = hashdirty = true;
     m_WallpaperList.clear();
@@ -675,5 +680,7 @@ void KBackgroundSettings::setWallpaperLi
     }
     updateWallpaperFiles();
-    changeWallpaper(true);
+    // Try to keep the current wallpaper
+    m_CurrentWallpaper = m_WallpaperFiles.findIndex(currentWallpaper) - 1;
+    changeWallpaper(m_CurrentWallpaper < 0);
 }
 


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