From c805963327b33490e906a200c9dcf6283c12bba0 Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Sun, 24 Feb 2019 16:04:33 +0200
Subject: [PATCH] prepare for new latte separators

---
 .../package/contents/ui/applet/AppletItem.qml |  3 +-
 containment/package/contents/ui/main.qml      | 32 ++++++++++++-------
 plasmoid/package/contents/ui/MouseHandler.qml |  6 ++--
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/containment/package/contents/ui/applet/AppletItem.qml b/containment/package/contents/ui/applet/AppletItem.qml
index 3430a2df7..6bcad2ca6 100644
--- a/containment/package/contents/ui/applet/AppletItem.qml
+++ b/containment/package/contents/ui/applet/AppletItem.qml
@@ -75,7 +75,8 @@ Item {
     property bool isInternalViewSplitter: (internalSplitterId > 0)
     property bool isLattePlasmoid: latteApplet !== null
     property bool isZoomed: false
-    property bool isSeparator: applet && applet.pluginName === "audoban.applet.separator"
+    property bool isSeparator: applet && (applet.pluginName === "audoban.applet.separator"
+                                          || applet.pluginName === "org.kde.latte.separator")
     property bool isSpacer: latteSpacer !== null
     property bool isSystray: applet && (applet.pluginName === "org.kde.plasma.systemtray" || applet.pluginName === "org.nomad.systemtray" )
 
diff --git a/containment/package/contents/ui/main.qml b/containment/package/contents/ui/main.qml
index 730314f66..1669047e1 100644
--- a/containment/package/contents/ui/main.qml
+++ b/containment/package/contents/ui/main.qml
@@ -599,12 +599,16 @@ DragDrop.DropArea {
                 if (root.addLaunchersInTaskManager) {
                     return;
                 }
-            } else if (latteView.mimeContainsPlasmoid(event.mimeData, "audoban.applet.separator")
-                       && root.latteAppletContainer.containsPos(event)) {
-                confirmedDragEntered = true
-                dndSpacer.opacity = 0;
-                dndSpacer.parent = root;
-                return;
+            } else {
+                var isSeparator = ( latteView.mimeContainsPlasmoid(event.mimeData, "audoban.applet.separator")
+                                    || latteView.mimeContainsPlasmoid(event.mimeData, "org.kde.latte.separator") );
+
+                if (isSeparator && root.latteAppletContainer.containsPos(event)) {
+                    confirmedDragEntered = true
+                    dndSpacer.opacity = 0;
+                    dndSpacer.parent = root;
+                    return;
+                }
             }
         }
 
@@ -631,12 +635,16 @@ DragDrop.DropArea {
                 if (root.addLaunchersInTaskManager) {
                     return;
                 }
-            } else if (latteView.mimeContainsPlasmoid(event.mimeData, "audoban.applet.separator")
-                       && root.latteAppletContainer.containsPos(event)) {
-                confirmedDragEntered = true
-                dndSpacer.opacity = 0;
-                dndSpacer.parent = root;
-                return;
+            } else {
+                var isSeparator = ( latteView.mimeContainsPlasmoid(event.mimeData, "audoban.applet.separator")
+                                    || latteView.mimeContainsPlasmoid(event.mimeData, "org.kde.latte.separator") );
+
+                if (isSeparator && root.latteAppletContainer.containsPos(event)) {
+                    confirmedDragEntered = true
+                    dndSpacer.opacity = 0;
+                    dndSpacer.parent = root;
+                    return;
+                }
             }
         }
 
diff --git a/plasmoid/package/contents/ui/MouseHandler.qml b/plasmoid/package/contents/ui/MouseHandler.qml
index 79607b1fb..399b8e7c8 100644
--- a/plasmoid/package/contents/ui/MouseHandler.qml
+++ b/plasmoid/package/contents/ui/MouseHandler.qml
@@ -77,8 +77,10 @@ Item {
         property Item hoveredItem
 
         function isDroppingSeparator(event) {
-            return ((event.mimeData.formats.indexOf("text/x-plasmoidservicename") === 0)
-                    && (String(event.mimeData.getDataAsByteArray("text/x-plasmoidservicename")) === "audoban.applet.separator"));
+            var appletName = String(event.mimeData.getDataAsByteArray("text/x-plasmoidservicename"));
+            var isSeparator = (appletName === "audoban.applet.separator" || appletName === "org.kde.latte.separator");
+
+            return ((event.mimeData.formats.indexOf("text/x-plasmoidservicename") === 0) && isSeparator);
         }
 
         onDragEnter:{