kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-01-12 01:17:55 +03:00
Code Issues Projects Releases Wiki Activity

block par.effect for applet popups

Browse Source
This commit is contained in:
Michail Vourlakos 2020-05-18 16:06:46 +03:00
parent b264854a98
commit fe4704e355
6 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/view/tasksmodel.h
View File

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

4
containment/package/contents/ui/abilities/ParabolicEffect.qml
View File

@ -29,5 +29,7 @@ import "./privates" as Ability
Ability.ParabolicEffectPrivate {
factor.zoom: LatteCore.WindowSystem.compositingActive && animations.active ? ( 1 + (plasmoid.configuration.zoomLevel / 20) ) : 1
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)
}

2
containment/package/contents/ui/applet/ItemWrapper.qml
View File

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

2
containment/package/contents/ui/layouts/abilities/AbilityGrid.qml
View File

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

2
plasmoid/package/contents/ui/main.qml
View File

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

2
plasmoid/package/contents/ui/task/Wrapper.qml
View File

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