Improve sorting and sizing of completions a bit

resources/qml/Avatar.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import "./ui"

resources/qml/Completer.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import "./ui"
@@ -62,18 +61,17 @@ Popup {
     }
 
     function finishCompletion() {
-        if(popup.completerName == "room") {
+        if (popup.completerName == "room")
-            popup.completionSelected(listView.itemAtIndex(currentIndex).modelData.roomid)
+            popup.completionSelected(listView.itemAtIndex(currentIndex).modelData.roomid);
-        }
+
     }
 
     onCompleterNameChanged: {
         if (completerName) {
-            if (completerName == "user") {
+            if (completerName == "user")
                 completer = TimelineManager.completerFor(completerName, TimelineManager.timeline.roomId());
-            } else {
+            else
                 completer = TimelineManager.completerFor(completerName);
-            }
             completer.setSearchString("");
         } else {
             completer = undefined;
@@ -99,10 +97,11 @@ Popup {
         pixelAligned: true
 
         delegate: Rectangle {
+            property variant modelData: model
+
             color: model.index == popup.currentIndex ? colors.highlight : colors.base
             height: chooser.childrenRect.height + 2 * popup.rowMargin
             implicitWidth: fullWidth ? popup.width : chooser.childrenRect.width + 4
-            property variant modelData: model
 
             MouseArea {
                 id: mouseArea
@@ -111,10 +110,10 @@ Popup {
                 hoverEnabled: true
                 onPositionChanged: popup.currentIndex = model.index
                 onClicked: {
-                    popup.completionClicked(completer.completionAt(model.index))
+                    popup.completionClicked(completer.completionAt(model.index));
-                    if(popup.completerName == "room") {
+                    if (popup.completerName == "room")
-                        popup.completionSelected(model.roomid)
+                        popup.completionSelected(model.roomid);
-                    }
+
                 }
 
                 Ripple {
@@ -200,8 +199,8 @@ Popup {
                             width: popup.avatarWidth
                             url: model.avatarUrl.replace("mxc://", "image://MxcImage/")
                             onClicked: {
-                                popup.completionClicked(completer.completionAt(model.index))
+                                popup.completionClicked(completer.completionAt(model.index));
-                                popup.completionSelected(model.roomid)
+                                popup.completionSelected(model.roomid);
                             }
                         }
 

resources/qml/EncryptionIndicator.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.12

resources/qml/ImageButton.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import "./ui"

resources/qml/MatrixText.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.5

resources/qml/MatrixTextField.qml

@@ -1,56 +1,62 @@
 import QtQuick 2.13
-import QtQuick.Layouts 1.13
 import QtQuick.Controls 2.13
+import QtQuick.Layouts 1.13
 
 TextField {
     id: input
-    palette: colors
 
-    background: Rectangle {
+    palette: colors
-        color: colors.base
-    }
 
     Rectangle {
         id: blueBar
 
         anchors.top: parent.bottom
         anchors.horizontalCenter: parent.horizontalCenter
-
         color: colors.highlight
         height: 1
         width: parent.width
-    
+
         Rectangle {
             id: blackBar
 
             anchors.verticalCenter: blueBar.verticalCenter
             anchors.horizontalCenter: parent.horizontalCenter
-
+            height: parent.height + 1
-            height: parent.height+1
             width: 0
             color: colors.text
-        
+
             states: State {
-                name: "focused"; when: input.activeFocus == true
+                name: "focused"
+                when: input.activeFocus == true
+
                 PropertyChanges {
                     target: blackBar
                     width: blueBar.width
                 }
+
             }
-        
+
             transitions: Transition {
                 from: ""
                 to: "focused"
                 reversible: true
 
-                NumberAnimation { 
+                NumberAnimation {
                     target: blackBar
                     properties: "width"
                     duration: 500
                     easing.type: Easing.InOutQuad
-                    alwaysRunToEnd: true 
+                    alwaysRunToEnd: true
                 }
+
             }
+
         }
+
     }
-}
+
+    background: Rectangle {
+        color: colors.base
+    }
+
+}

resources/qml/MessageInput.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import "./voip"

resources/qml/MessageView.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import "./delegates"

resources/qml/NhekoBusyIndicator.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.9

resources/qml/PrivacyScreen.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtGraphicalEffects 1.0

resources/qml/QuickSwitcher.qml

@@ -5,19 +5,31 @@ import im.nheko 1.0
 Popup {
     id: quickSwitcher
 
-    property int textHeight: 32
+    property int textHeight: Math.round(Qt.application.font.pixelSize * 2.4)
-    property int textMargin: 8
+    property int textMargin: Math.round(textHeight / 8)
 
-    x: parent.width / 2 - width / 2
+    function delay(delayTime, cb) {
-    y: parent.height / 4 - height / 2
+        timer.interval = delayTime;
-    width: parent.width / 2
+        timer.repeat = false;
+        timer.triggered.connect(cb);
+        timer.start();
+    }
+
+    width: Math.round(parent.width / 2)
+    x: Math.round(parent.width / 2 - width / 2)
+    y: Math.round(parent.height / 4 - height / 2)
     modal: true
     closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
     parent: Overlay.overlay
     palette: colors
-
+    onOpened: {
-    Overlay.modal: Rectangle {
+        completerPopup.open();
-        color: "#aa1E1E1E"
+        delay(200, function() {
+            roomTextInput.forceActiveFocus();
+        });
+    }
+    onClosed: {
+        completerPopup.close();
     }
 
     MatrixTextField {
@@ -27,11 +39,9 @@ Popup {
         font.pixelSize: Math.ceil(quickSwitcher.textHeight * 0.6)
         padding: textMargin
         color: colors.text
-
         onTextEdited: {
-            completerPopup.completer.setSearchString(text)
+            completerPopup.completer.searchString = text;
         }
-
         Keys.onPressed: {
             if (event.key == Qt.Key_Up && completerPopup.opened) {
                 event.accepted = true;
@@ -40,7 +50,7 @@ Popup {
                 event.accepted = true;
                 completerPopup.down();
             } else if (event.matches(StandardKey.InsertParagraphSeparator)) {
-                completerPopup.finishCompletion()
+                completerPopup.finishCompletion();
                 event.accepted = true;
             }
         }
@@ -50,36 +60,30 @@ Popup {
         id: completerPopup
 
         x: roomTextInput.x
-        y: roomTextInput.y + roomTextInput.height + textMargin
+        y: roomTextInput.y + quickSwitcher.textHeight + quickSwitcher.textMargin
+        visible: roomTextInput.length > 0
         width: parent.width
         completerName: "room"
         bottomToTop: false
         fullWidth: true
-        avatarHeight: textHeight
+        avatarHeight: quickSwitcher.textHeight
-        avatarWidth: textHeight
+        avatarWidth: quickSwitcher.textHeight
         centerRowContent: false
-        rowMargin: 8
+        rowMargin: Math.round(quickSwitcher.textMargin / 2)
-        rowSpacing: 6
+        rowSpacing: quickSwitcher.textMargin
-
         closePolicy: Popup.NoAutoClose
     }
 
-    onOpened: {
-        completerPopup.open()
-        delay(200, function() {
-            roomTextInput.forceActiveFocus()
-        })
-    }
-
-    onClosed: {
-        completerPopup.close()
-    }
-
     Connections {
         onCompletionSelected: {
-            TimelineManager.setHistoryView(id)
+            TimelineManager.setHistoryView(id);
-            TimelineManager.highlightRoom(id)
+            TimelineManager.highlightRoom(id);
-            quickSwitcher.close()
+            quickSwitcher.close();
+        }
+        onCountChanged: {
+            if (completerPopup.count > 0 && (completerPopup.currentIndex < 0 || completerPopup.currentIndex >= completerPopup.count))
+                completerPopup.currentIndex = 0;
+
         }
         target: completerPopup
     }
@@ -88,10 +92,8 @@ Popup {
         id: timer
     }
 
-    function delay(delayTime, cb) {
+    Overlay.modal: Rectangle {
-        timer.interval = delayTime;
+        color: "#aa1E1E1E"
-        timer.repeat = false;
-        timer.triggered.connect(cb);
-        timer.start();
     }
+
 }

resources/qml/Reactions.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.6

resources/qml/ReplyPopup.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import "./delegates/"

resources/qml/RoomSettings.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import Qt.labs.platform 1.1 as Platform

resources/qml/ScrollHelper.qml

@@ -1,9 +1,7 @@
 // Copyright (C) 2016 Michael Bohlender, <michael.bohlender@kdemail.net>
 // Copyright (C) 2017 Christian Mollekopf, <mollekopf@kolabsystems.com>
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
-
 /*
 * Shamelessly stolen from:
 * https://cgit.kde.org/kube.git/tree/framework/qml/ScrollHelper.qml

resources/qml/StatusIndicator.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.5

resources/qml/TimelineRow.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import "./delegates"

resources/qml/TimelineView.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import "./delegates"
@@ -77,13 +76,14 @@ Page {
 
         QuickSwitcher {
         }
+
     }
 
     Shortcut {
         sequence: "Ctrl+K"
         onActivated: {
             var quickSwitch = quickSwitcherComponent.createObject(timelineRoot);
-            TimelineManager.focusTimeline()
+            TimelineManager.focusTimeline();
             quickSwitch.open();
         }
     }

resources/qml/ToggleButton.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.5

resources/qml/TopBar.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.9

resources/qml/TypingIndicator.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.9

resources/qml/UserProfile.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import "./device-verification"

resources/qml/delegates/FileMessage.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.12

resources/qml/delegates/ImageMessage.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.12

resources/qml/delegates/MessageDelegate.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.6

resources/qml/delegates/NoticeMessage.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 TextMessage {

resources/qml/delegates/Pill.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.5

resources/qml/delegates/Placeholder.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import ".."

resources/qml/delegates/PlayableMediaMessage.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtMultimedia 5.6

resources/qml/delegates/Reply.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.12

resources/qml/delegates/TextMessage.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import ".."

resources/qml/device-verification/AwaitingVerificationConfirmation.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.3

resources/qml/device-verification/DeviceVerification.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.10

resources/qml/device-verification/DigitVerification.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.3

resources/qml/device-verification/EmojiElement.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.3

resources/qml/device-verification/EmojiVerification.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.3

resources/qml/device-verification/Failed.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.3

resources/qml/device-verification/NewVerificationRequest.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.3

resources/qml/device-verification/Success.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.3

resources/qml/device-verification/Waiting.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.3

resources/qml/emoji/EmojiButton.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import "../"

resources/qml/emoji/EmojiPicker.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import "../"

resources/qml/ui/Ripple.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtGraphicalEffects 1.0

resources/qml/voip/ActiveCallBar.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import "../"

resources/qml/voip/CallDevices.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.9

resources/qml/voip/CallInvite.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import "../"

resources/qml/voip/CallInviteBar.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import "../"

resources/qml/voip/DeviceError.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.9

resources/qml/voip/PlaceCall.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import "../"

resources/qml/voip/ScreenShare.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import "../"

resources/qml/voip/VideoCall.qml

@@ -1,5 +1,4 @@
 // SPDX-FileCopyrightText: 2021 Nheko Contributors
-//
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 import QtQuick 2.9

src/CompletionProxyModel.cpp

@@ -19,6 +19,7 @@ CompletionProxyModel::CompletionProxyModel(QAbstractItemModel *model,
         setSourceModel(model);
         QRegularExpression splitPoints("\\s+|-");
 
+        // insert all the full texts
         for (int i = 0; i < sourceModel()->rowCount(); i++) {
                 if (i < 7)
                         mapping.push_back(i);
@@ -29,6 +30,19 @@ CompletionProxyModel::CompletionProxyModel(QAbstractItemModel *model,
                                  .toLower();
                 trie_.insert(string1.toUcs4(), i);
 
+                auto string2 = sourceModel()
+                                 ->data(sourceModel()->index(i, 0), CompletionModel::SearchRole2)
+                                 .toString()
+                                 .toLower();
+        }
+
+        // insert the partial matches
+        for (int i = 0; i < sourceModel()->rowCount(); i++) {
+                auto string1 = sourceModel()
+                                 ->data(sourceModel()->index(i, 0), CompletionModel::SearchRole)
+                                 .toString()
+                                 .toLower();
+
                 for (const auto &e : string1.split(splitPoints)) {
                         if (!e.isEmpty()) // NOTE(Nico): Use Qt::SkipEmptyParts in Qt 5.14
                                 trie_.insert(e.toUcs4(), i);
@@ -40,7 +54,6 @@ CompletionProxyModel::CompletionProxyModel(QAbstractItemModel *model,
                                  .toLower();
 
                 if (!string2.isEmpty()) {
-                        trie_.insert(string2.toUcs4(), i);
                         for (const auto &e : string2.split(splitPoints)) {
                                 if (!e.isEmpty()) // NOTE(Nico): Use Qt::SkipEmptyParts in Qt 5.14
                                         trie_.insert(e.toUcs4(), i);
@@ -55,7 +68,7 @@ CompletionProxyModel::CompletionProxyModel(QAbstractItemModel *model,
           [this](QString s) {
                   s.remove(":");
                   s.remove("@");
-                  searchString = s.toLower();
+                  searchString_ = s.toLower();
                   invalidate();
           },
           Qt::QueuedConnection);
@@ -64,7 +77,7 @@ CompletionProxyModel::CompletionProxyModel(QAbstractItemModel *model,
 void
 CompletionProxyModel::invalidate()
 {
-        auto key = searchString.toUcs4();
+        auto key = searchString_.toUcs4();
         beginResetModel();
         mapping = trie_.search(key, 7, maxMistakes_);
         endResetModel();

src/CompletionProxyModel.h

@@ -135,7 +135,8 @@ struct trie
 class CompletionProxyModel : public QAbstractProxyModel
 {
         Q_OBJECT
-
+        Q_PROPERTY(
+          QString searchString READ searchString WRITE setSearchString NOTIFY newSearchString)
 public:
         CompletionProxyModel(QAbstractItemModel *model,
                              int max_mistakes = 2,
@@ -159,12 +160,13 @@ public slots:
         QVariant completionAt(int i) const;
 
         void setSearchString(QString s);
+        QString searchString() const { return searchString_; }
 
 signals:
         void newSearchString(QString);
 
 private:
-        QString searchString;
+        QString searchString_;
         trie<uint, int> trie_;
         std::vector<int> mapping;
         int maxMistakes_;