dont show Preview after activating task with click

BUG: 404099
pull/4/head
Michail Vourlakos 6 years ago
parent 031e19a8ab
commit bd68d5dbcc

@ -163,7 +163,7 @@ PlasmaExtras.ScrollArea {
//! Central Functionality //! Central Functionality
function mouseIsInside(){ function mouseIsInside(){
var isInside = contentItemMouseArea.containsMouse || instancesContainMouse() || (parentTask && parentTask.containsMouse); var isInside = contentItemMouseArea.containsMouse || instancesContainMouse();
if (isInside){ if (isInside){
mainToolTip.containsMouse = true; mainToolTip.containsMouse = true;

@ -539,7 +539,7 @@ Item {
} }
function hide(debug){ function hide(debug){
// console.log("on hide previews event called: "+debug); // console.log("on hide previews event called: "+debug);
if (latteView && signalSent) { if (latteView && signalSent) {
//it is used to unblock dock hiding //it is used to unblock dock hiding
@ -561,7 +561,7 @@ Item {
return; return;
} }
// console.log("preview show called..."); // console.log("preview show called...");
if ((!activeItem || (activeItem !== taskItem)) && !root.contextMenu) { if ((!activeItem || (activeItem !== taskItem)) && !root.contextMenu) {
//console.log("preview show called: accepted..."); //console.log("preview show called: accepted...");
@ -1811,10 +1811,11 @@ Item {
} }
function previewContainsMouse() { function previewContainsMouse() {
if(toolTipDelegate && toolTipDelegate.containsMouse && toolTipDelegate.parentTask) if(toolTipDelegate && toolTipDelegate.containsMouse && toolTipDelegate.parentTask) {
return true; return true;
else } else {
return false; return false;
}
} }
function containsMouse(){ function containsMouse(){

@ -586,6 +586,21 @@ MouseArea{
showTitleTooltip(); showTitleTooltip();
} }
//! show previews if enabled
if(root.showPreviews && !windowsPreviewDlg.visible && windowsPreviewDlg.activeItem !== taskItem){
if (hoveredTimerObj) {
//! don't delay showing preview in normal states,
//! that is when the dock wasn't hidden
if (!hoveredTimerObj.running) {
hoveredTimerObj.start();
}
} else {
if (!root.disableAllWindowsFunctionality) {
hoveredTimerObj = hoveredTimerComponent.createObject(taskItem);
}
}
}
if (root.latteView && root.latteView.isHalfShown) { if (root.latteView && root.latteView.isHalfShown) {
return; return;
} }
@ -648,21 +663,6 @@ MouseArea{
return; return;
} }
//! show previews
if(root.showPreviews && !windowsPreviewDlg.visible && windowsPreviewDlg.activeItem !== taskItem){
if (hoveredTimerObj) {
//! don't delay showing preview in normal states,
//! that is when the dock wasn't hidden
if (!hoveredTimerObj.running) {
hoveredTimerObj.start();
}
} else {
if (!root.disableAllWindowsFunctionality) {
hoveredTimerObj = hoveredTimerComponent.createObject(taskItem);
}
}
}
if((inAnimation == false)&&(!root.taskInAnimation)&&(!root.disableRestoreZoom) && hoverEnabled){ if((inAnimation == false)&&(!root.taskInAnimation)&&(!root.disableRestoreZoom) && hoverEnabled){
if (icList.hoveredIndex === -1 && root.dockHoveredIndex ===-1) { if (icList.hoveredIndex === -1 && root.dockHoveredIndex ===-1) {
root.startDirectRenderDelayerDuringEntering(); root.startDirectRenderDelayerDuringEntering();
@ -906,6 +906,8 @@ MouseArea{
tasksModel.requestActivate(taskIndex); tasksModel.requestActivate(taskIndex);
} }
hidePreviewWindow();
//negative direction //negative direction
} else if (angle < -12) { } else if (angle < -12) {
if (isLauncher || root.disableAllWindowsFunctionality) { if (isLauncher || root.disableAllWindowsFunctionality) {
@ -923,6 +925,8 @@ MouseArea{
tasksModel.requestActivate(taskIndex); tasksModel.requestActivate(taskIndex);
} }
hidePreviewWindow();
} }
} }

Loading…
Cancel
Save