Don't show avatar tooltips when context menu open

This commit is contained in:
miruka 2020-07-22 00:04:12 -04:00
parent e917e29913
commit 0f1d0f336e
3 changed files with 9 additions and 10 deletions

View File

@ -3,9 +3,6 @@
- Image viewer: - Image viewer:
- hflickable: support kinetic scrolling disabler - hflickable: support kinetic scrolling disabler
- Avatar tooltip can get displayed in front of presence menu
- Use loading cursorShape
- global presence control - global presence control
- fix members not synced bug - fix members not synced bug

View File

@ -82,10 +82,12 @@ Rectangle {
background.border.width * 2, background.border.width * 2,
) )
visible: ! avatarImage.broken && visible:
avatarImage.width < dimension * 0.75 && ! avatarImage.broken &&
(toolTipSourceOverride || toolTipMxc) && ! window.anyMenu &&
hoverHandler.hovered avatarImage.width < dimension * 0.75 &&
(toolTipSourceOverride || toolTipMxc) &&
hoverHandler.hovered
delay: 1000 delay: 1000
backgroundColor: theme.controls.avatar.hoveredImage.background backgroundColor: theme.controls.avatar.hoveredImage.background

View File

@ -28,9 +28,9 @@ ApplicationWindow {
readonly property var visibleMenus: ({}) readonly property var visibleMenus: ({})
readonly property var visiblePopups: ({}) readonly property var visiblePopups: ({})
readonly property bool anyPopupOrMenu: readonly property bool anyMenu: Object.keys(visibleMenus).length > 0
Object.keys(window.visibleMenus).length > 0 || readonly property bool anyPopup: Object.keys(visiblePopups).length > 0
Object.keys(window.visiblePopups).length > 0 readonly property bool anyPopupOrMenu: anyMenu || anyPopup
function saveState(obj) { function saveState(obj) {