From e897a88baf7ba4bf2669fcb2b0e76776fd393dc8 Mon Sep 17 00:00:00 2001
From: Aline Gondim Santos <aline.gondimsantos@savoirfairelinux.com>
Date: Fri, 5 Aug 2022 17:01:13 -0300
Subject: [PATCH] callview: enable scrolling in elipsed buttons
GitLab: #697
Change-Id: I8edada01a7c1cbe4a67fa5c399509d71cd2b446a
---
src/app/mainview/components/CallActionBar.qml | 10 ++++++----
src/app/mainview/components/MainOverlay.qml | 1 +
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/app/mainview/components/CallActionBar.qml b/src/app/mainview/components/CallActionBar.qml
index 6b2004ec6..6e524e253 100644
--- a/src/app/mainview/components/CallActionBar.qml
+++ b/src/app/mainview/components/CallActionBar.qml
@@ -37,6 +37,7 @@ Control {
property alias overflowOpen: overflowButton.popup.visible
property bool subMenuOpen: false
+ property real parentHeight
property real itemSpacing: 2
@@ -549,7 +550,7 @@ Control {
}
Item {
- implicitHeight: children[0].contentHeight
+ implicitHeight: (overflowButton.width + itemSpacing) * urgentOverflowListView.count
width: overflowButton.width
anchors.bottom: parent.top
anchors.bottomMargin: itemSpacing
@@ -581,14 +582,15 @@ Control {
popup: Popup {
y: overflowButton.height + itemSpacing
width: overflowButton.width
- implicitHeight: contentItem.implicitHeight
+ implicitHeight: Math.min(root.parentHeight - itemSpacing,
+ (overflowButton.width + itemSpacing) * overflowHiddenListView.count)
padding: 0
contentItem: JamiListView {
id: overflowHiddenListView
spacing: itemSpacing
- implicitHeight: contentHeight
- interactive: false
+ implicitHeight: Math.min(contentHeight, parent.height)
+ interactive: true
model: overflowButton.popup.visible ?
overflowButton.delegateModel :
null
diff --git a/src/app/mainview/components/MainOverlay.qml b/src/app/mainview/components/MainOverlay.qml
index 721fd535a..08d899104 100644
--- a/src/app/mainview/components/MainOverlay.qml
+++ b/src/app/mainview/components/MainOverlay.qml
@@ -239,6 +239,7 @@ Item {
width: parent.width
height: 55
+ parentHeight: root.height - 81
}
Behavior on opacity {
--
GitLab