Hi,

Fixes?/Questions (diff attached):
1. Seems that setContainment(c) -> oldContainment->setScreen(otherScreen) -> 
resets screen to -1. If setContainment is before restore it works better but 
I'm not sure what other implications it might have?
2. Was wallpaper config save remove intentional?
3. Should confirm test be here or in KMessageBox if?

Petri

Index: view.cpp
===================================================================
--- view.cpp	(revision 850487)
+++ view.cpp	(working copy)
@@ -248,6 +248,16 @@
         // ensure that the old containments configuration is up to date
         old->save(containmentConfig);
 
+        // set our containment to the new one
+        setContainment(c);
+
+        // Save wallpaper settings for new containment
+        if (old->wallpaper()) {
+            KConfigGroup cfg = c->config();
+            KConfigGroup wallpaperCfg(&cfg, "Wallpaper");
+            old->wallpaper()->save(wallpaperCfg);
+        }
+
         // load the configuration of the old containment into the new one
         c->restore(containmentConfig);
 
@@ -259,9 +269,6 @@
             }
         }
 
-        // set our containment to the new one
-        setContainment(c);
-
         // destroy the old one
         old->destroy(false);
 
Index: containment.cpp
===================================================================
--- containment.cpp	(revision 850487)
+++ containment.cpp	(working copy)
@@ -1279,7 +1279,7 @@
         return;
     }
 
-    if (isContainment()) {
+    if (confirm && isContainment()) {
         //don't remove a desktop that's in use
         //FIXME allow removal of containments for screens that don't currently exist
         if (d->type != PanelContainment && d->type != CustomPanelContainment &&

Attachment: signature.asc
Description: This is a digitally signed message part.

_______________________________________________
Plasma-devel mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/plasma-devel

Reply via email to