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

cleanup deprecated directRenderTimer/containment

Browse Source
This commit is contained in:
Michail Vourlakos 2018-02-19 00:50:29 +02:00
parent 7c1cd0cb70
commit 14ffc70088
3 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
containment/package/contents/ui/applet/AppletItem.qml
View File

@ -218,11 +218,7 @@ Item {
//property int debCounter: 0;
function clearZoom(){
if (layoutsContainer.hoveredIndex === -1) {
// if (root.globalDirectRender){
// wrapper.zoomScale = 1;
//} else {
restoreAnimation.start();
// }
restoreAnimation.start();
}
}
@ -385,13 +381,13 @@ Item {
Connections{
target: root
onGlobalDirectRenderChanged:{
/* onGlobalDirectRenderChanged:{
if (root.globalDirectRender && restoreAnimation.running) {
// console.log("CLEAR APPLET SCALE !!!!");
//restoreAnimation.stop();
//wrapper.zoomScale = 1;
}
}
}*/
onLatteAppletHoveredIndexChanged: {
if ( (root.zoomFactor>1) && (root.latteAppletHoveredIndex >= 0) ){
@ -427,7 +423,16 @@ Item {
&& (Math.abs(index-layoutsContainer.hoveredIndex)>=2))
container.clearZoom();
if ((layoutsContainer.hoveredIndex !== -1) && (restoreAnimation.running)) {
if ((restoreAnimation.running) && (layoutsContainer.hoveredIndex !== -1)) {
restoreAnimation.stop();
}
}
}
Connections{
target: root
onLatteAppletHoveredIndexChanged: {
if ((restoreAnimation.running) && (root.latteAppletHoveredIndex !== -1)) {
restoreAnimation.stop();
}
}
@ -571,8 +576,7 @@ Item {
fastEnteringFlag = false;
}
if ((layoutsContainer.hoveredIndex !== -1)
&& !enableDirectRenderTimer.running && !root.globalDirectRender) {
if ((layoutsContainer.hoveredIndex !== -1) && !root.globalDirectRender) {
fastEnteringFlag = true;
}
@ -637,9 +641,8 @@ Item {
//! mouse enters between two tasks at start
if (lengthPos >= (wrapper.center - root.iconSize/2)
&& lengthPos <= (wrapper.center + root.iconSize/2)) {
if (!enableDirectRenderTimer.running && !root.globalDirectRender) {
if (!root.globalDirectRender) {
root.setGlobalDirectRender(true);
// enableDirectRenderTimer.start();
}
fastEnteringFlag = false;
@ -676,7 +679,7 @@ Item {
container.activateAppletForNeutralAreas(mouse);
pressed = true;
// mouse.accepted = false;
// mouse.accepted = false;
}
onReleased: {

3
containment/package/contents/ui/applet/AppletItemWrapper.qml
View File

@ -208,9 +208,8 @@ Item{
}
onZoomScaleChanged: {
if ((zoomScale === root.zoomFactor) && !enableDirectRenderTimer.running && !root.globalDirectRender) {
if ((zoomScale === root.zoomFactor) && !root.globalDirectRender) {
root.setGlobalDirectRender(true);
// enableDirectRenderTimer.start();
}
if ((zoomScale > 1) && !container.isZoomed) {

6
containment/package/contents/ui/main.qml
View File

@ -56,7 +56,6 @@ DragDrop.DropArea {
property bool debugModeWindow: Qt.application.arguments.indexOf("--with-window")>=0
property bool globalDirectRender: false //it is used as a globalDirectRender for all elements in the dock
property bool directRenderTimerIsRunning: enableDirectRenderTimer.running
property int directRenderAnimationTime: 0
property bool addLaunchersMessage: false
@ -1109,11 +1108,6 @@ DragDrop.DropArea {
}
}
function startEnableDirectRenderTimer(){
if (!enableDirectRenderTimer.running)
enableDirectRenderTimer.start();
}
function startCheckRestoreZoomTimer(){
checkRestoreZoom.start();
}