status-im
/
status-qml
mirror of
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(StatusChatToolBar): Use updated StatusFlatRoundButton 

Adapting the StatusChatToolBar with the new StatusFlatRoundButton and initializing it
This commit is contained in:
Khushboo Mehta 2021-08-12 16:31:49 +02:00 committed by Pascal Precht
parent 5a0489ba17
commit d24c2e6208
1 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/StatusQ/Components/StatusChatToolBar.qml
View File

@ -56,12 +56,10 @@ Rectangle {
type: StatusFlatRoundButton.Type.Secondary type: StatusFlatRoundButton.Type.Secondary
onClicked: statusChatToolBar.searchButtonClicked() onClicked: statusChatToolBar.searchButtonClicked()
StatusToolTip { // initializing the tooltip
visible: !!text && parent.hovered tooltip.text: "Search"
text: "Search" tooltip.orientation: StatusToolTip.Orientation.Bottom
orientation: StatusToolTip.Orientation.Bottom tooltip.y: parent.height + 12
y: parent.height + 12
}
} }
StatusFlatRoundButton { StatusFlatRoundButton {
@ -72,12 +70,10 @@ Rectangle {
type: StatusFlatRoundButton.Type.Secondary type: StatusFlatRoundButton.Type.Secondary
onClicked: statusChatToolBar.membersButtonClicked() onClicked: statusChatToolBar.membersButtonClicked()
StatusToolTip { // initializing the tooltip
visible: !!text && parent.hovered tooltip.text: "Members"
text: "Members" tooltip.orientation: StatusToolTip.Orientation.Bottom
orientation: StatusToolTip.Orientation.Bottom tooltip.y: parent.height + 12
y: parent.height + 12
}
} }
StatusFlatRoundButton { StatusFlatRoundButton {
@ -88,6 +84,12 @@ Rectangle {
type: StatusFlatRoundButton.Type.Secondary type: StatusFlatRoundButton.Type.Secondary
visible: !!statusChatToolBar.popupMenu visible: !!statusChatToolBar.popupMenu
// initializing the tooltip
tooltip.visible: !!tooltip.text && menuButton.hovered && !popupMenuSlot.item.opened
tooltip.text: "More"
tooltip.orientation: StatusToolTip.Orientation.Bottom
tooltip.y: parent.height + 12
property bool showMoreMenu: false property bool showMoreMenu: false
onClicked: { onClicked: {
if (showMoreMenu) { if (showMoreMenu) {
@ -101,13 +103,6 @@ Rectangle {
showMoreMenu = !showMoreMenu; showMoreMenu = !showMoreMenu;
} }
StatusToolTip {
visible: !!text && parent.hovered && !popupMenuSlot.item.opened
text: "More"
orientation: StatusToolTip.Orientation.Bottom
y: parent.height + 12
}
Loader { Loader {
id: popupMenuSlot id: popupMenuSlot
active: !!statusChatToolBar.popupMenu active: !!statusChatToolBar.popupMenu
@ -137,6 +132,11 @@ Rectangle {
icon.height: 21 icon.height: 21
type: StatusFlatRoundButton.Type.Secondary type: StatusFlatRoundButton.Type.Secondary
// initializing the tooltip
tooltip.text: "Activity"
tooltip.orientation: StatusToolTip.Orientation.Bottom
tooltip.y: parent.height + 12
onClicked: statusChatToolBar.notificationButtonClicked() onClicked: statusChatToolBar.notificationButtonClicked()
StatusBadge { StatusBadge {
@ -160,14 +160,6 @@ Rectangle {
border.width: 2 border.width: 2
border.color: parent.hovered ? Theme.palette.baseColor2 : Theme.palette.statusAppLayout.backgroundColor border.color: parent.hovered ? Theme.palette.baseColor2 : Theme.palette.statusAppLayout.backgroundColor
} }
StatusToolTip {
visible: !!text && parent.hovered
text: "Activity"
orientation: StatusToolTip.Orientation.Bottom
y: parent.height + 12
arrow.x: width - (parent.width-4)
}
} }
} }