kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-02-09 05:57:39 +03:00
Code Issues Projects Releases Wiki Activity

drop appletsAnimations in favour of needBothAxis

Browse Source
This commit is contained in:
Michail Vourlakos 2017-01-13 22:31:10 +02:00
parent cc1f42824c
commit 66bbf22ba6
3 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
containment/contents/ui/AppletItem.qml
View File

@ -385,13 +385,13 @@ Item {
if ((zoomScale > 1) && !container.isZoomed) {
container.isZoomed = true;
if (!root.editMode && !animationWasSent) {
root.slotAppletsAnimations(1);
root.slotAnimationsNeedBothAxis(1);
animationWasSent = true;
}
} else if ((zoomScale == 1) && container.isZoomed) {
container.isZoomed = false;
if (!root.editMode && animationWasSent) {
root.slotAppletsAnimations(-1);
root.slotAnimationsNeedBothAxis(-1);
animationWasSent = false;
}
}

6
containment/contents/ui/VisibilityManager.qml
View File

@ -117,13 +117,11 @@ Item{
var localY = 0;
normalState = ((root.nowDockHoveredIndex === -1) && (layoutsContainer.hoveredIndex === -1)
&& (root.appletsAnimations === 0)
&& (root.animationsNeedBothAxis === 0) && (root.animationsNeedLength === 0)) || !windowSystem.compositingActive;
// debug maskArea criteria
//console.log(root.nowDockHoveredIndex + ", " + layoutsContainer.hoveredIndex + ", "
// + root.appletsAnimations+ ", "
// + root.animationsNeedBothAxis + ", " + root.animationsNeedLength + ", " + root.animationsNeedThickness);
console.log(root.nowDockHoveredIndex + ", " + layoutsContainer.hoveredIndex + ", "
+ root.animationsNeedBothAxis + ", " + root.animationsNeedLength + ", " + root.animationsNeedThickness);
var tempLength = root.isHorizontal ? width : height;
var tempThickness = root.isHorizontal ? height : width;

14
containment/contents/ui/main.qml
View File

@ -64,7 +64,7 @@ DragDrop.DropArea {
property int animationsNeedBothAxis:0 //animations need space in both axes, e.g zooming a task
property int animationsNeedLength: 0 // animations need length, e.g. adding a task
property int animationsNeedThickness: 0 // animations need thickness, e.g. bouncing animation
property int appletsAnimations: 0 //zoomed applets it is used basically on masking for magic window
property int automaticIconSizeBasedSize: -1 //it is not set, this is the defautl
property int iconSize: (automaticIconSizeBasedSize > 0 && !root.editMode) ? Math.min(automaticIconSizeBasedSize, plasmoid.configuration.iconSize) :
plasmoid.configuration.iconSize
@ -403,8 +403,6 @@ DragDrop.DropArea {
//// END OF Behaviors
//////////////START OF CONNECTIONS
//this is used from zoomed applets in that container
//onAppletsAnimationsChanged: visibilityManager.updateMaskArea();
onEditModeChanged: {
if (editMode) {
@ -850,16 +848,6 @@ DragDrop.DropArea {
visibilityManager.updateMaskArea();
}
function slotAppletsAnimations(step) {
if (step === 0) {
return;
}
appletsAnimations = Math.max(appletsAnimations + step, 0);
visibilityManager.updateMaskArea();
}
//this is used when dragging a task in order to not hide the dock
//and also by the menu appearing from tasks for the same reason
function slotDisableHiding(value) {