block par.effect for applet popups

pull/15/head
Michail Vourlakos 5 years ago
parent b264854a98
commit fe4704e355

@ -36,12 +36,6 @@ public:
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
QHash<int, QByteArray> roleNames() const override; QHash<int, QByteArray> roleNames() const override;
/*void appendSample(Sample * sample)
{
beginInsertRows(QModelIndex(), rowCount(), rowCount());
mSamples << sample;
endInsertRows();
}*/
void addTask(QObject *plasmoid); void addTask(QObject *plasmoid);
void removeTask(QObject *plasmoid); void removeTask(QObject *plasmoid);

@ -29,5 +29,7 @@ import "./privates" as Ability
Ability.ParabolicEffectPrivate { Ability.ParabolicEffectPrivate {
factor.zoom: LatteCore.WindowSystem.compositingActive && animations.active ? ( 1 + (plasmoid.configuration.zoomLevel / 20) ) : 1 factor.zoom: LatteCore.WindowSystem.compositingActive && animations.active ? ( 1 + (plasmoid.configuration.zoomLevel / 20) ) : 1
factor.maxZoom: Math.max(factor.zoom, applets.require.maxInnerZoomFactor) factor.maxZoom: Math.max(factor.zoom, applets.require.maxInnerZoomFactor)
restoreZoomIsBlocked: (view && view.contextMenuIsShown) || (applets.parabolic.restoreZoomIsBlocked) restoreZoomIsBlocked: (view && view.contextMenuIsShown)
|| (view && view.extendedInterface.hasExpandedApplet)
|| (applets.parabolic.restoreZoomIsBlocked)
} }

@ -596,7 +596,7 @@ Item{
} }
function calculateScales( currentMousePosition ){ function calculateScales( currentMousePosition ){
if (parabolic.factor.zoom===1) { if (parabolic.factor.zoom===1 || parabolic.restoreZoomIsBlocked) {
return; return;
} }

@ -37,7 +37,7 @@ AbilityGridPrivate {
if (appletItem if (appletItem
&& appletItem.communicator && appletItem.communicator
&& appletItem.communicator.parabolicEffectIsSupported && appletItem.communicator.parabolicEffectIsSupported
&& appletItem.communicator.bridge.parabolic.client.restoreZoomIsBlocked) { && appletItem.communicator.bridge.parabolic.client.local.restoreZoomIsBlocked) {
return true; return true;
} }
} }

@ -962,7 +962,7 @@ Item {
Ability.ParabolicEffect { Ability.ParabolicEffect {
id: _parabolic id: _parabolic
bridge: latteBridge bridge: latteBridge
restoreZoomIsBlocked: root.contextMenu || windowsPreviewDlg.visible local.restoreZoomIsBlocked: root.contextMenu || windowsPreviewDlg.visible
} }
AppletAbility.Requirements{ AppletAbility.Requirements{

@ -157,7 +157,7 @@ Item{
} }
function calculateScales( currentMousePosition ){ function calculateScales( currentMousePosition ){
if (taskItem.parabolic.factor.zoom===1) { if (taskItem.parabolic.factor.zoom===1 || parabolic.restoreZoomIsBlocked) {
return; return;
} }

Loading…
Cancel
Save