status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(StatusChatListCategoryItem): don't render menubutton with no popup 

Fixes #153
This commit is contained in:
Pascal Precht 2021-06-15 17:11:42 +02:00 committed by Michał Cieślak
parent 209a208455
commit 1b30a45eb8
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/StatusQ/src/StatusQ/Components/StatusChatListCategory.qml
View File

@ -31,6 +31,8 @@ Column {
title: statusChatListCategory.name title: statusChatListCategory.name
opened: statusChatListCategory.opened opened: statusChatListCategory.opened
showMenuButton: !!statusChatListCategory.popupMenu
onClicked: { onClicked: {
if (mouse.button === Qt.RightButton) { if (mouse.button === Qt.RightButton) {
highlighted = true highlighted = true

6
ui/StatusQ/src/StatusQ/Components/StatusChatListCategoryItem.qml
View File

@ -17,6 +17,8 @@ StatusListItem {
property bool opened: true property bool opened: true
property bool highlighted: false property bool highlighted: false
property bool showActionButtons: false property bool showActionButtons: false
property bool showMenuButton: showActionButtons
property bool showAddButton: showActionButtons
property alias addButton: addButton property alias addButton: addButton
property alias menuButton: menuButton property alias menuButton: menuButton
property alias toggleButton: toggleButton property alias toggleButton: toggleButton
@ -40,7 +42,7 @@ StatusListItem {
id: addButton id: addButton
icon.name: "add" icon.name: "add"
icon.width: 20 icon.width: 20
visible: statusChatListCategoryItem.showActionButtons && visible: statusChatListCategoryItem.showAddButton &&
(statusChatListCategoryItem.highlighted || (statusChatListCategoryItem.highlighted ||
statusChatListCategoryItem.sensor.containsMouse) statusChatListCategoryItem.sensor.containsMouse)
onClicked: statusChatListCategoryItem.addButtonClicked(mouse) onClicked: statusChatListCategoryItem.addButtonClicked(mouse)
@ -50,7 +52,7 @@ StatusListItem {
id: menuButton id: menuButton
icon.name: "more" icon.name: "more"
icon.width: 21 icon.width: 21
visible: statusChatListCategoryItem.showActionButtons && visible: statusChatListCategoryItem.showMenuButton &&
(statusChatListCategoryItem.highlighted || (statusChatListCategoryItem.highlighted ||
statusChatListCategoryItem.sensor.containsMouse) statusChatListCategoryItem.sensor.containsMouse)
onClicked: statusChatListCategoryItem.menuButtonClicked(mouse) onClicked: statusChatListCategoryItem.menuButtonClicked(mouse)