github-forks
/
latte-dock
mirror of https://github.com/KDE/latte-dock.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

improve variable name for ParabolicItem

Browse Source
work/spdx
Michail Vourlakos 4 years ago
parent 433abd05cd
commit f68f2646f7
8 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File

20
plasmoid/package/contents/ui/task/ParabolicItem.qml
Unescape Escape View File

@ -44,16 +44,14 @@ Item{
//scales which are used mainly for activating InLauncher //scales which are used mainly for activating InLauncher
////Scalers/////// ////Scalers///////
property bool inTempScaling: ((tempScaleLength !== 1.0) || (tempScaleThickness !== 1.0) ) property bool inTempScaling: ((zoomLength !== 1.0) || (zoomThickness !== 1.0) )
property real zoom: 1.0 property real zoom: 1.0
property real tempScaleWidth: 1.0 property real zoomLength: 1.0
property real tempScaleHeight: 1.0 property real zoomThickness: 1.0
property real tempScaleLength: abilityItem.isHorizontal ? tempScaleWidth : tempScaleHeight
property real tempScaleThickness: abilityItem.isHorizontal ? tempScaleHeight : tempScaleWidth
property real scaleLength: inTempScaling ? tempScaleLength : zoom property real scaleLength: inTempScaling ? zoomLength : zoom
property real scaleThickness: inTempScaling ? tempScaleThickness : zoom property real scaleThickness: inTempScaling ? zoomThickness : zoom
property real cleanScalingLength: abilityItem.abilities.metrics.totals.length * zoom property real cleanScalingLength: abilityItem.abilities.metrics.totals.length * zoom
property real cleanScalingThickness: abilityItem.abilities.metrics.totals.thickness * zoom property real cleanScalingThickness: abilityItem.abilities.metrics.totals.thickness * zoom
@ -126,12 +124,12 @@ Item{
target: plasmoid target: plasmoid
onFormFactorChanged:{ onFormFactorChanged:{
parabolicItem.zoom = 1.01; parabolicItem.zoom = 1.01;
parabolicItem.tempScaleWidth = 1.01; parabolicItem.zoomLength = 1.01;
parabolicItem.tempScaleHeight = 1.01; parabolicItem.zoomThickness = 1.01;
parabolicItem.zoom = 1; parabolicItem.zoom = 1;
parabolicItem.tempScaleWidth = 1; parabolicItem.zoomLength = 1;
parabolicItem.tempScaleHeight = 1; parabolicItem.zoomThickness = 1;
} }
} }

4
plasmoid/package/contents/ui/task/animations/FastRestoreAnimation.qml
Unescape Escape View File

@ -46,7 +46,7 @@ SequentialAnimation{
PropertyAnimation { PropertyAnimation {
target: taskItem.parabolicItem target: taskItem.parabolicItem
property: "tempScaleWidth" property: "zoomLength"
to: 1 to: 1
duration: fastRestoreAnimation.speed duration: fastRestoreAnimation.speed
easing.type: Easing.InCubic easing.type: Easing.InCubic
@ -54,7 +54,7 @@ SequentialAnimation{
PropertyAnimation { PropertyAnimation {
target: taskItem.parabolicItem target: taskItem.parabolicItem
property: "tempScaleHeight" property: "zoomThickness"
to: 1 to: 1
duration: fastRestoreAnimation.speed duration: fastRestoreAnimation.speed
easing.type: Easing.InCubic easing.type: Easing.InCubic

4
plasmoid/package/contents/ui/task/animations/LauncherAnimation.qml
Unescape Escape View File

@ -90,8 +90,8 @@ Item{
} }
} }
taskItem.parabolicItem.tempScaleWidth = taskItem.parabolicItem.zoom; taskItem.parabolicItem.zoomLength = taskItem.parabolicItem.zoom;
taskItem.parabolicItem.tempScaleHeight = taskItem.parabolicItem.zoom; taskItem.parabolicItem.zoomThickness = taskItem.parabolicItem.zoom;
} }
function startLauncherAnimation(){ function startLauncherAnimation(){

8
plasmoid/package/contents/ui/task/animations/NewWindowAnimation.qml
Unescape Escape View File

@ -53,8 +53,8 @@ Item{
newWindowAnimationLoader.item.loops = 1; newWindowAnimationLoader.item.loops = 1;
newWindowAnimationLoader.item.stop(); newWindowAnimationLoader.item.stop();
taskItem.parabolicItem.tempScaleWidth = 1; taskItem.parabolicItem.zoomLength = 1.0;
taskItem.parabolicItem.tempScaleHeight = 1; taskItem.parabolicItem.zoomThickness = 1.0;
taskItem.setBlockingAnimation(false); taskItem.setBlockingAnimation(false);
taskItem.inAttentionAnimation = false; taskItem.inAttentionAnimation = false;
@ -83,8 +83,8 @@ Item{
taskItem.setBlockingAnimation(true); taskItem.setBlockingAnimation(true);
taskItem.inNewWindowAnimation = true; taskItem.inNewWindowAnimation = true;
taskItem.parabolicItem.tempScaleWidth = taskItem.parabolicItem.zoom; taskItem.parabolicItem.zoomLength = taskItem.parabolicItem.zoom;
taskItem.parabolicItem.tempScaleHeight = taskItem.parabolicItem.zoom; taskItem.parabolicItem.zoomThickness = taskItem.parabolicItem.zoom;
if(!isDemandingAttention) if(!isDemandingAttention)
newWindowAnimationLoader.item.loops = 1; newWindowAnimationLoader.item.loops = 1;

4
plasmoid/package/contents/ui/task/animations/RealRemovalAnimation.qml
Unescape Escape View File

@ -163,7 +163,7 @@ SequentialAnimation {
PropertyAnimation { PropertyAnimation {
target: taskItem.parabolicItem target: taskItem.parabolicItem
property: (icList.orientation === Qt.Vertical) ? "tempScaleWidth" : "tempScaleHeight" property: "zoomThickness"
to: 0 to: 0
duration: taskRealRemovalAnimation.enabledAnimation ? 1.35*showWindowAnimation.speed : 0 duration: taskRealRemovalAnimation.enabledAnimation ? 1.35*showWindowAnimation.speed : 0
easing.type: Easing.InQuad easing.type: Easing.InQuad
@ -173,7 +173,7 @@ SequentialAnimation {
//smooth move into place the surrounding tasks //smooth move into place the surrounding tasks
PropertyAnimation { PropertyAnimation {
target: taskItem.parabolicItem target: taskItem.parabolicItem
property: (icList.orientation === Qt.Vertical) ? "tempScaleHeight" : "tempScaleWidth" property: "zoomLength"
to: 0 to: 0
duration: taskRealRemovalAnimation.enabledAnimation ? 1.35*showWindowAnimation.speed : 0 duration: taskRealRemovalAnimation.enabledAnimation ? 1.35*showWindowAnimation.speed : 0
easing.type: Easing.InQuad easing.type: Easing.InQuad

20
plasmoid/package/contents/ui/task/animations/ShowWindowAnimation.qml
Unescape Escape View File

@ -54,7 +54,7 @@ SequentialAnimation{
PropertyAnimation { PropertyAnimation {
target: taskItem.parabolicItem target: taskItem.parabolicItem
property: (icList.orientation == Qt.Vertical) ? "tempScaleHeight" : "tempScaleWidth" property: "zoomLength"
to: 1 to: 1
duration: showWindowAnimation.speed duration: showWindowAnimation.speed
easing.type: Easing.OutQuad easing.type: Easing.OutQuad
@ -64,7 +64,7 @@ SequentialAnimation{
PropertyAnimation { PropertyAnimation {
target: taskItem.parabolicItem target: taskItem.parabolicItem
property: (icList.orientation == Qt.Vertical) ? "tempScaleWidth" : "tempScaleHeight" property: "zoomThickness"
to: 1 to: 1
duration: showWindowAnimation.speed duration: showWindowAnimation.speed
easing.type: Easing.OutQuad easing.type: Easing.OutQuad
@ -153,16 +153,16 @@ SequentialAnimation{
if (hideWindow) { if (hideWindow) {
isForcedHidden = true; isForcedHidden = true;
taskItem.visible = false; taskItem.visible = false;
taskItem.parabolicItem.tempScaleWidth = 0; taskItem.parabolicItem.zoomLength = 0.0;
taskItem.parabolicItem.tempScaleHeight = 0; taskItem.parabolicItem.zoomThickness = 0.0;
taskItem.parabolicItem.opacity = 0; taskItem.parabolicItem.opacity = 0;
taskItem.inAnimation = false; taskItem.inAnimation = false;
} else if (!LatteCore.WindowSystem.compositingActive || root.inDraggingPhase } else if (!LatteCore.WindowSystem.compositingActive || root.inDraggingPhase
|| taskItem.isSeparator) { || taskItem.isSeparator) {
isForcedHidden = false; isForcedHidden = false;
taskItem.visible = true; taskItem.visible = true;
taskItem.parabolicItem.tempScaleWidth = 1; taskItem.parabolicItem.zoomLength = 1.0;
taskItem.parabolicItem.tempScaleHeight = 1; taskItem.parabolicItem.zoomThickness = 1.0;
taskItem.parabolicItem.zoom = 1; taskItem.parabolicItem.zoom = 1;
taskItem.parabolicItem.opacity = 1; taskItem.parabolicItem.opacity = 1;
taskItem.inAnimation = false; taskItem.inAnimation = false;
@ -170,8 +170,8 @@ SequentialAnimation{
&& (taskItem.abilities.animations.speedFactor.current !== 0) && !launcherIsAlreadyShown){ && (taskItem.abilities.animations.speedFactor.current !== 0) && !launcherIsAlreadyShown){
isForcedHidden = false; isForcedHidden = false;
taskItem.visible = true; taskItem.visible = true;
taskItem.parabolicItem.tempScaleWidth = 0; taskItem.parabolicItem.zoomLength = 0.0;
taskItem.parabolicItem.tempScaleHeight = 0; taskItem.parabolicItem.zoomThickness = 0.0;
start(); start();
} else { } else {
isForcedHidden = false; isForcedHidden = false;
@ -181,8 +181,8 @@ SequentialAnimation{
taskItem.parabolicItem.zoom = frozenTask.zoom; taskItem.parabolicItem.zoom = frozenTask.zoom;
tasksExtendedManager.removeFrozenTask(taskItem.launcherUrl); tasksExtendedManager.removeFrozenTask(taskItem.launcherUrl);
} else { } else {
taskItem.parabolicItem.tempScaleWidth = 1; taskItem.parabolicItem.zoomLength = 1.0;
taskItem.parabolicItem.tempScaleHeight = 1; taskItem.parabolicItem.zoomThickness = 1.0;
} }
//! by enabling it we break the bouncing animation //! by enabling it we break the bouncing animation

8
plasmoid/package/contents/ui/task/animations/launcher/BounceAnimation.qml
Unescape Escape View File

@ -35,7 +35,7 @@ SequentialAnimation{
ParallelAnimation{ ParallelAnimation{
PropertyAnimation { PropertyAnimation {
target: taskItem.parabolicItem target: taskItem.parabolicItem
property: (icList.orientation == Qt.Vertical) ? "tempScaleWidth" : "tempScaleHeight" property: "zoomThickness"
to: taskItem.containsMouse ? 1+2*(taskItem.abilities.parabolic.factor.maxZoom-1) : 1 + (1.5 * (taskItem.abilities.parabolic.factor.maxZoom-1)) to: taskItem.containsMouse ? 1+2*(taskItem.abilities.parabolic.factor.maxZoom-1) : 1 + (1.5 * (taskItem.abilities.parabolic.factor.maxZoom-1))
duration: launcherAnimation.speed duration: launcherAnimation.speed
easing.type: Easing.OutQuad easing.type: Easing.OutQuad
@ -43,7 +43,7 @@ SequentialAnimation{
PropertyAnimation { PropertyAnimation {
target: taskItem.parabolicItem target: taskItem.parabolicItem
property: (icList.orientation == Qt.Horizontal) ? "tempScaleWidth" : "tempScaleHeight" property: "zoomLength"
to: 1 to: 1
duration: launcherAnimation.speed duration: launcherAnimation.speed
easing.type: Easing.OutQuad easing.type: Easing.OutQuad
@ -52,7 +52,7 @@ SequentialAnimation{
PropertyAnimation { PropertyAnimation {
target: taskItem.parabolicItem target: taskItem.parabolicItem
property: (icList.orientation === Qt.Vertical) ? "tempScaleWidth" : "tempScaleHeight" property: "zoomThickness"
to: 1 to: 1
duration: 4*launcherAnimation.speed duration: 4*launcherAnimation.speed
easing.type: Easing.OutBounce easing.type: Easing.OutBounce
@ -61,7 +61,7 @@ SequentialAnimation{
ParallelAnimation{ ParallelAnimation{
PropertyAnimation { PropertyAnimation {
target: taskItem.parabolicItem target: taskItem.parabolicItem
property: (icList.orientation === Qt.Vertical) ? "tempScaleHeight" : "tempScaleWidth" property: "zoomLength"
to: 1 to: 1
duration: taskItem.abilities.animations.speedFactor.current*launcherAnimation.speed duration: taskItem.abilities.animations.speedFactor.current*launcherAnimation.speed
easing.type: Easing.OutBounce easing.type: Easing.OutBounce

6
plasmoid/package/contents/ui/task/animations/newwindow/BounceAnimation.qml
Unescape Escape View File

@ -27,7 +27,7 @@ SequentialAnimation{
ParallelAnimation{ ParallelAnimation{
PropertyAnimation { PropertyAnimation {
target: taskItem.parabolicItem target: taskItem.parabolicItem
property: (icList.orientation == Qt.Vertical) ? "tempScaleWidth" : "tempScaleHeight" property: "zoomThickness"
to: 1 + (thickPercentage * 2 * (taskItem.abilities.animations.requirements.zoomFactor-1)) to: 1 + (thickPercentage * 2 * (taskItem.abilities.animations.requirements.zoomFactor-1))
duration: newWindowAnimation.speed duration: newWindowAnimation.speed
easing.type: Easing.OutQuad easing.type: Easing.OutQuad
@ -37,7 +37,7 @@ SequentialAnimation{
PropertyAnimation { PropertyAnimation {
target: taskItem.parabolicItem target: taskItem.parabolicItem
property: (icList.orientation == Qt.Horizontal) ? "tempScaleWidth" : "tempScaleHeight" property: "zoomLength"
to: 1 to: 1
duration: newWindowAnimation.speed duration: newWindowAnimation.speed
easing.type: Easing.OutQuad easing.type: Easing.OutQuad
@ -46,7 +46,7 @@ SequentialAnimation{
PropertyAnimation { PropertyAnimation {
target: taskItem.parabolicItem target: taskItem.parabolicItem
property: (icList.orientation == Qt.Vertical) ? "tempScaleWidth" : "tempScaleHeight" property: "zoomThickness"
to: 1 to: 1
duration: 4.4*newWindowAnimation.speed duration: 4.4*newWindowAnimation.speed
easing.type: Easing.OutBounce easing.type: Easing.OutBounce

Write Preview
Loading…
Cancel
Save