enable scrolling activation only for expandable

--systrays/internal containments are blocked from
this
pull/14/head
Michail Vourlakos 5 years ago
parent 6fafa83b15
commit 8b41314b2f

@ -488,7 +488,7 @@ void ContainmentInterface::toggleAppletExpanded(const int id)
}
for (const auto applet : m_view->containment()->applets()) {
if (applet->id() == (uint)id) {
if (applet->id() == (uint)id && !m_view->layout()->isInternalContainment(applet)/*block for internal containments*/) {
PlasmaQuick::AppletQuickItem *ai = applet->property("_plasma_graphicObject").value<PlasmaQuick::AppletQuickItem *>();
if (ai) {

@ -663,7 +663,7 @@ Item {
}
onWheelScrolled: {
if (!root.mouseWheelActions || viewSignalsConnector.blockWheel
if (!appletItem.applet || !root.mouseWheelActions || viewSignalsConnector.blockWheel
|| (root.latteViewIsHidden || root.inSlidingIn || root.inSlidingOut)) {
return;
}
@ -671,7 +671,7 @@ Item {
blockWheel = true;
scrollDelayer.start();
if (appletItem.containsPos(pos) /*&& root.latteView.extendedInterface.appletIsExpandable(applet.id)*/) {
if (appletItem.containsPos(pos) && root.latteView.extendedInterface.appletIsExpandable(applet.id)) {
var angle = angleDelta.y / 8;
var expanded = root.latteView.extendedInterface.appletIsExpanded(applet.id);

Loading…
Cancel
Save