diff --git a/app/dockview.cpp b/app/dockview.cpp index 4782d3a5b..17b7ab38d 100644 --- a/app/dockview.cpp +++ b/app/dockview.cpp @@ -655,12 +655,13 @@ void DockView::mouseReleaseEvent(QMouseEvent *event) void DockView::mousePressEvent(QMouseEvent *event) { + //qDebug() << "Step -1 ..."; + if (!event || !this->containment()) { return; } - qDebug() << "Step 0..."; - // PlasmaQuick::ContainmentView::mousePressEvent(event); + //qDebug() << "Step 0..."; //even if the menu is executed synchronously, other events may be processed //by the qml incubator when plasma is loading, so we need to guard there @@ -672,7 +673,7 @@ void DockView::mousePressEvent(QMouseEvent *event) return; } - qDebug() << "1 ..."; + //qDebug() << "1 ..."; const QString trigger = Plasma::ContainmentActions::eventToString(event); if (trigger == "RightButton;NoModifier") { @@ -683,7 +684,7 @@ void DockView::mousePressEvent(QMouseEvent *event) return; } - qDebug() << "2 ..."; + //qDebug() << "2 ..."; //the plugin can be a single action or a context menu //Don't have an action list? execute as single action //and set the event position as action data @@ -735,12 +736,12 @@ void DockView::mousePressEvent(QMouseEvent *event) applet = this->containment(); } - qDebug() << "3 ..."; + //qDebug() << "3 ..."; if (applet) { KPluginMetaData meta = applet->kPackage().metadata(); - qDebug() << "3.5 ..."; + //qDebug() << "3.5 ..."; if (meta.pluginId() != "org.kde.latte.plasmoid") { qDebug() << "4..."; @@ -755,14 +756,14 @@ void DockView::mousePressEvent(QMouseEvent *event) return; } - qDebug() << "5 ..."; + //qDebug() << "5 ..."; if (applet) { - qDebug() << "5.3 ..."; + //qDebug() << "5.3 ..."; emit applet->contextualActionsAboutToShow(); addAppletActions(desktopMenu, applet, event); } else { - qDebug() << "5.6 ..."; + //qDebug() << "5.6 ..."; emit this->containment()->contextualActionsAboutToShow(); addContainmentActions(desktopMenu, event); } @@ -774,7 +775,7 @@ void DockView::mousePressEvent(QMouseEvent *event) QPoint pos = event->globalPos(); if (applet) { - qDebug() << "6 ..."; + //qDebug() << "6 ..."; desktopMenu->adjustSize(); if (this->screen()) { @@ -797,10 +798,10 @@ void DockView::mousePressEvent(QMouseEvent *event) } } - qDebug() << "7..."; + //qDebug() << "7..."; if (desktopMenu->isEmpty()) { - qDebug() << "7.5 ..."; + //qDebug() << "7.5 ..."; delete desktopMenu; event->accept(); return; @@ -813,13 +814,13 @@ void DockView::mousePressEvent(QMouseEvent *event) return; } - qDebug() << "8 ..."; + //qDebug() << "8 ..."; } - qDebug() << "9 ..."; + //qDebug() << "9 ..."; } - qDebug() << "10 ..."; + //qDebug() << "10 ..."; PlasmaQuick::ContainmentView::mousePressEvent(event); } diff --git a/containment/contents/ui/VisibilityManager.qml b/containment/contents/ui/VisibilityManager.qml index 71f63b1a2..681a6681f 100644 --- a/containment/contents/ui/VisibilityManager.qml +++ b/containment/contents/ui/VisibilityManager.qml @@ -245,12 +245,6 @@ Item{ } else if (root.animationsNeedThickness > 0) { tempThickness = thicknessMidOriginal; } - - //configure the x,y position based on thickness - if(plasmoid.location === PlasmaCore.Types.RightEdge) - localX = dock.width - tempThickness; - else if(plasmoid.location === PlasmaCore.Types.BottomEdge) - localY = dock.height - tempThickness; } else{ //use all thickness space if (dock.visibility.isHidden && !slidingAnimationAutoHiddenOut.running ) { @@ -259,6 +253,12 @@ Item{ tempThickness = thicknessZoomOriginal; } } + + //configure the x,y position based on thickness + if(plasmoid.location === PlasmaCore.Types.RightEdge) + localX = dock.width - tempThickness; + else if(plasmoid.location === PlasmaCore.Types.BottomEdge) + localY = dock.height - tempThickness; } var maskArea = dock.maskArea; diff --git a/plasmoid/contents/ui/TaskDelegate.qml b/plasmoid/contents/ui/TaskDelegate.qml index c62ad3420..f72cb6cd9 100644 --- a/plasmoid/contents/ui/TaskDelegate.qml +++ b/plasmoid/contents/ui/TaskDelegate.qml @@ -621,7 +621,7 @@ MouseArea{ } onPressed: { - console.log("Pressed Task Delegate.."); + //console.log("Pressed Task Delegate.."); if (windowSystem.compositingActive) { windowsPreviewDlg.hide(2); } @@ -647,7 +647,7 @@ MouseArea{ } onReleased: { - console.log("Released Task Delegate..."); + //console.log("Released Task Delegate..."); if (draggingResistaner != null){ draggingResistaner.destroy(); draggingResistaner = null;