From c0fb3e7ede62f0e16eb495109abf0cf2b86207af Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Mon, 20 Mar 2017 19:40:18 +0200 Subject: [PATCH] fix #262,dont hide preview window for buffer init --- plasmoid/contents/ui/TaskDelegate.qml | 9 +++++++-- plasmoid/contents/ui/ToolTipInstance.qml | 14 +++++++++++++- plasmoid/contents/ui/main.qml | 24 +----------------------- 3 files changed, 21 insertions(+), 26 deletions(-) diff --git a/plasmoid/contents/ui/TaskDelegate.qml b/plasmoid/contents/ui/TaskDelegate.qml index c0cb16ec9..c632186a6 100644 --- a/plasmoid/contents/ui/TaskDelegate.qml +++ b/plasmoid/contents/ui/TaskDelegate.qml @@ -653,7 +653,12 @@ MouseArea{ ////window previews///////// if (isWindow) { if(containsMouse && root.showPreviews && Latte.WindowSystem.compositingActive){ - hoveredTimerObj = hoveredTimerComponent.createObject(mainItemContainer); + // if (!windowsPreviewDlg.visible) { + hoveredTimerObj = hoveredTimerComponent.createObject(mainItemContainer); + // } else { + // mainItemContainer.preparePreviewWindow(false); + // } + // preparePreviewWindow(); } else{ @@ -1134,7 +1139,7 @@ MouseArea{ Timer { id: hoveredTimer - interval: 2*root.durationTime*units.longDuration + interval: 600 repeat: false diff --git a/plasmoid/contents/ui/ToolTipInstance.qml b/plasmoid/contents/ui/ToolTipInstance.qml index ffad76b65..dfa4bc09f 100644 --- a/plasmoid/contents/ui/ToolTipInstance.qml +++ b/plasmoid/contents/ui/ToolTipInstance.qml @@ -178,11 +178,23 @@ Column { // TODO: this causes XCB error message when being visible the first time property int winId: isWin && windows[flatIndex] != undefined ? windows[flatIndex] : 0 + onWinIdChanged: { + if (winId !== previewThumb.prevWinId){ + previewThumb.visible = false; + previewThumb.prevWinId = winId; + previewThumb.visible = true; + } + + } + PlasmaCore.WindowThumbnail { + id: previewThumb anchors.fill: parent visible: !albumArtImage.visible && !thumbnailSourceItem.isMinimized - winId: thumbnailSourceItem.winId + winId: prevWinId //thumbnailSourceItem.winId + + property int prevWinId: 0 ToolTipWindowMouseArea { id: area2 diff --git a/plasmoid/contents/ui/main.qml b/plasmoid/contents/ui/main.qml index 4832e6a9c..a60d6b859 100644 --- a/plasmoid/contents/ui/main.qml +++ b/plasmoid/contents/ui/main.qml @@ -345,7 +345,7 @@ Item { //console.log("preview show called: accepted..."); //used to initialize windows previews buffers from task to task - visible = false; + visible = true; activeItem = taskItem; toolTipDelegate.parentTask = taskItem; @@ -355,29 +355,7 @@ Item { signalSent = true; //root.signalDraggingState(true); } - - //small delay to show in order to not mess up with the buffers clearing - //from previous visible:false - initializePreviewComponent.createObject(windowsPreviewDlg); - } - } - } - - //A Timer to delay to show in order to not mess up with the buffers clearing - //from previous visible:false - Component { - id: initializePreviewComponent - Timer { - id: initializePreviewTimer - interval: 100 - repeat: false - - onTriggered: { - windowsPreviewDlg.visible = true; - initializePreviewTimer.destroy(); } - - Component.onCompleted: initializePreviewTimer.start() } }