Skip to content

Commit

Permalink
fix: double click to activate the detail window
Browse files Browse the repository at this point in the history
fix the double click to activate the detail window

Log: fix the double click to activate the detail window
Bug: https://pms.uniontech.com/bug-view-269597.html
  • Loading branch information
add-uos committed Sep 29, 2024
1 parent 4289a5a commit a79bcba
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 3 deletions.
3 changes: 3 additions & 0 deletions ThumbnailListShare.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.pragma library

var isFaverDoubleClicked = true
1 change: 1 addition & 0 deletions src/deepin-album.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -78,5 +78,6 @@
<file>qml/Control/MonthImage.qml</file>
<file>qml/Control/Animation/SwitchViewAnimation.qml</file>
<file>qml/Control/Animation/FadeInoutAnimation.qml</file>
<file>qml/Control/ListView/ThumbnailListShare.js</file>
</qresource>
</RCC>
7 changes: 6 additions & 1 deletion src/qml/Control/ListView/ThumbnailListDelegate.qml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import org.deepin.dtk 1.0
import Qt5Compat.GraphicalEffects

import org.deepin.album 1.0 as Album

import "ThumbnailListShare.js" as Share
import "../"
import "../../"
import "./"
Expand Down Expand Up @@ -380,6 +380,11 @@ Item {
}

mouse.accepted = true
Share.isFaverDoubleClicked = false
}
onDoubleClicked: (mouse)=> {
mouse.accepted = true
Share.isFaverDoubleClicked = true
}
}
}
Expand Down
3 changes: 3 additions & 0 deletions src/qml/Control/ListView/ThumbnailListShare.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.pragma library

var isFaverDoubleClicked = false
7 changes: 5 additions & 2 deletions src/qml/Control/ListView/ThumbnailListViewAlbum.qml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import "../../PreviewImageViewer"
import "../../PreviewImageViewer/Utils"

import "ThumbnailListViewTools.js" as ThumbnailTools

import "ThumbnailListShare.js" as Share
FocusScope {
id : main

Expand Down Expand Up @@ -322,12 +322,15 @@ FocusScope {
// 单击模式点击/双击模式双击打开图片
if (Qt.styleHints.singleClickActivation || bDbClicked || mouse.source === Qt.MouseEventSynthesizedByQt) {
var c = clickedItem.mapToItem(mainStack, 0, 0)
ThumbnailTools.executeViewImage(c.x, c.y, clickedItem.width, clickedItem.height)
console.log(Share.isFaverDoubleClicked)
if (!Share.isFaverDoubleClicked)
ThumbnailTools.executeViewImage(c.x, c.y, clickedItem.width, clickedItem.height)
}
else {
bDbClicked = true;
dbClickTimer.interval = Qt.styleHints.mouseDoubleClickInterval;
dbClickTimer.start();
Share.isFaverDoubleClicked = false;
}
}

Expand Down

0 comments on commit a79bcba

Please sign in to comment.