From b862c4483e40c3f348737893bc02a85a1844b759 Mon Sep 17 00:00:00 2001
From: Aline Gondim Santos <aline.gondimsantos@savoirfairelinux.com>
Date: Wed, 14 Dec 2022 15:00:41 -0300
Subject: [PATCH] callActionBar: do not hide single button
Change-Id: I5030cb4a5b53f4828485792f82e7241ecd06164c
GitLab: #810
---
src/app/calloverlaymodel.cpp | 4 ++--
src/app/mainview/components/CallActionBar.qml | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/app/calloverlaymodel.cpp b/src/app/calloverlaymodel.cpp
index 6eb8ec5a6..a6e613450 100644
--- a/src/app/calloverlaymodel.cpp
+++ b/src/app/calloverlaymodel.cpp
@@ -357,7 +357,7 @@ CallOverlayModel::eventFilter(QObject* object, QEvent* event)
void
CallOverlayModel::setControlRanges()
{
- overflowModel_->setRange(0, overflowIndex_ - 1);
+ overflowModel_->setRange(0, overflowIndex_);
overflowVisibleModel_->setRange(overflowIndex_, secondaryModel_->rowCount());
- overflowHiddenModel_->setRange(overflowIndex_, secondaryModel_->rowCount());
+ overflowHiddenModel_->setRange(overflowIndex_ + 1, secondaryModel_->rowCount());
}
diff --git a/src/app/mainview/components/CallActionBar.qml b/src/app/mainview/components/CallActionBar.qml
index 8c6ba02be..717981b95 100644
--- a/src/app/mainview/components/CallActionBar.qml
+++ b/src/app/mainview/components/CallActionBar.qml
@@ -503,14 +503,14 @@ Control {
property int overflowIndex: {
var maxItems = Math.floor(
- (overflowRect.remainingSpace - 24) / root.height) - 1
+ (overflowRect.remainingSpace) / (root.height + itemSpacing)) - 2
return Math.min(overflowItemCount, maxItems)
}
property int nOverflowItems: overflowItemCount - overflowIndex
onNOverflowItemsChanged: {
var diff = overflowItemListView.count - nOverflowItems
var effectiveOverflowIndex = overflowIndex
- if (effectiveOverflowIndex === overflowItemCount - 1)
+ if (effectiveOverflowIndex === overflowItemCount - 2)
effectiveOverflowIndex += diff
CallOverlayModel.overflowIndex = effectiveOverflowIndex
@@ -523,7 +523,7 @@ Control {
ComboBox {
id: overflowButton
- visible: CallOverlayModel.overflowIndex < overflowItemCount
+ visible: CallOverlayModel.overflowIndex < overflowItemCount - 2
width: root.height
height: width
--
GitLab