kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-27 14:50:21 +03:00
Code Issues Projects Releases Wiki Activity

update elastic edge calculations

Browse Source
This commit is contained in:
Michail Vourlakos 2022-01-28 19:40:43 +02:00
parent 5050b24431
commit feb9261aeb
5 changed files with 24 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,7 @@ Item{
return 0;
}
return (nScale > 0) ? (appletItem.spacersMaxSize * nScale) + separatorSpace : separatorSpace
return separatorSpace;
}
property bool isRightSpacer: false

8
containment/package/contents/ui/applet/ParabolicArea.qml
View File

@ -110,14 +110,6 @@ Item {
return;
}
if (wrapper.zoomScale === 1 && (appletItem.firstAppletInContainer || appletItem.lastAppletInContainer)) {
//! first hover of first or last items in container
//! this way we make sure that neighbour items will increase their zoom faster
var substep = length/4;
var center = length/2;
currentMousePosition = Math.min(Math.max(currentMousePosition, center-substep), center+substep);
}
//use the new parabolic effect manager in order to handle all parabolic effect messages
var scales = parabolic.applyParabolicEffect(index, currentMousePosition, length);

47
containment/package/contents/ui/layouts/AppletsParabolicableContainer.qml
View File

@ -9,19 +9,15 @@ import org.kde.latte.core 0.2 as LatteCore
AppletsContainer {
id: parabolicContainer
property real parabolicOffset: root.myView.alignment === LatteCore.Types.Center ? tailOffsetLength - headOffsetLength : 0
property real tailFactor: 0
property real headFactor: 0
property real parabolicOffset: root.myView.alignment === LatteCore.Types.Center ? (tailOffsetLength - headOffsetLength) / 2 : 0
property real tailOffsetLength: 0
property real headOffsetLength: 0
readonly property int hiddenItemsCount: (parabolic.spread - 1)/2
readonly property int animationTime: animations.speedFactor.normal * (1.2*animations.duration.small)
readonly property real normalHiddenLength: hiddenItemsCount * metrics.totals.length
readonly property real tailOffsetLength: (tailFactor * normalHiddenLength) / 2
readonly property real headOffsetLength: (headFactor * normalHiddenLength) / 2
Behavior on tailFactor {
id: animatedTailFactorBehavior
Behavior on tailOffsetLength {
id: animatedTailLengthBehavior
enabled: !parabolic.directRenderingEnabled || restoreAnimation.running
NumberAnimation {
duration: 3 * parabolicContainer.animationTime
@ -29,13 +25,13 @@ AppletsContainer {
}
}
Behavior on tailFactor {
enabled: !animatedTailFactorBehavior.enabled
Behavior on tailOffsetLength {
enabled: !animatedTailLengthBehavior.enabled
NumberAnimation { duration: 0 }
}
Behavior on headFactor {
id: animatedHeadFactorBehavior
Behavior on headOffsetLength {
id: animatedHeadLengthBehavior
enabled: !parabolic.directRenderingEnabled || restoreAnimation.running
NumberAnimation {
duration: 3 * parabolicContainer.animationTime
@ -43,8 +39,8 @@ AppletsContainer {
}
}
Behavior on headFactor {
enabled: !animatedHeadFactorBehavior.enabled
Behavior on headOffsetLength {
enabled: !animatedHeadLengthBehavior.enabled
NumberAnimation { duration: 0 }
}
@ -53,34 +49,35 @@ AppletsContainer {
PropertyAnimation {
target: parabolicContainer
property: "tailFactor"
property: "tailOffsetLength"
to: 0
duration: 3 * parabolicContainer.animationTime
duration: 4 * parabolicContainer.animationTime
easing.type: Easing.InCubic
}
PropertyAnimation {
target: parabolicContainer
property: "headFactor"
property: "headOffsetLength"
to: 0
duration: 3 * parabolicContainer.animationTime
duration: 4 * parabolicContainer.animationTime
easing.type: Easing.InCubic
}
}
function updateFactor(istail, newScales) {
function updateLength(istail, newScales) {
var nextFactor = 0;
var nextLength = 0;
for (var i=0; i<hiddenItemsCount; ++i) {
if (i<newScales.length) {
nextFactor += ((newScales[i] - 1) / hiddenItemsCount);
nextLength += (newScales[i] - 1) * metrics.totals.length;
}
}
if (istail) {
tailFactor = nextFactor;
tailOffsetLength = nextLength + 1; //1px. added because it was missing from calculations for some reason
} else {
headFactor = nextFactor;
headOffsetLength = nextLength + 1; //1px. added because it was missing from calculations for some reason
}
}
@ -90,7 +87,7 @@ AppletsContainer {
}
var istail = true;
updateFactor(true, newScales);
updateLength(true, newScales);
}
function sltUpdateHigherItemScale(delegateIndex, newScales) {
@ -99,7 +96,7 @@ AppletsContainer {
}
var ishead = false;
updateFactor(ishead, newScales);
updateLength(ishead, newScales);
}
function sltClearZoom(){

2
declarativeimports/abilities/items/basicitem/HiddenSpacer.qml
View File

@ -38,7 +38,7 @@ Item{
if (abilityItem.isHidden) {
return 0;
} else if (!abilityItem.parabolicItem.isUpdatingOnlySpacers) {
return (nScale > 0) ? (maxSize * nScale) + separatorSpace : separatorSpace;
return separatorSpace;
} else {
return (nScale > 0) ? (abilityItem.abilities.metrics.iconSize * nScale) + separatorSpace : separatorSpace;
}

8
declarativeimports/abilities/items/basicitem/ParabolicEventsArea.qml
View File

@ -130,14 +130,6 @@ Item {
return;
}
if (abilityItem.parabolicItem.zoom === 1 && (abilityItem.isFirstItemInContainer || abilityItem.isLastItemInContainer)) {
//! first hover of first or last items in container
//! this way we make sure that neighbour items will increase their zoom faster
var substep = length/4;
var center = length/2;
currentMousePosition = Math.min(Math.max(currentMousePosition, center-substep), center+substep);
}
//use the new parabolic ability in order to handle all parabolic effect messages
var scales = abilityItem.abilities.parabolic.applyParabolicEffect(index, currentMousePosition, length);