callActionBar: do not hide single button

Change-Id: I5030cb4a5b53f4828485792f82e7241ecd06164c
GitLab: #810

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());
 }

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