summary refs log tree commit diff
path: root/resources
diff options
context:
space:
mode:
authorJedi18 <targetakhil@gmail.com>2021-03-07 00:18:24 +0530
committerJedi18 <targetakhil@gmail.com>2021-03-07 00:18:24 +0530
commit8870455f9dd6463f9b8ef04516d69efef3c6287d (patch)
tree475f1eef9c90c1149e8dd8cf6bdf594be606c949 /resources
parentchanged bottomToTop to true and renamed textWidth to textHeight (diff)
downloadnheko-8870455f9dd6463f9b8ef04516d69efef3c6287d.tar.xz
change allowed mistakes, fix minor style issues, remove old completer function from inputbar
Diffstat (limited to 'resources')
-rw-r--r--resources/qml/Completer.qml2
-rw-r--r--resources/qml/MatrixTextField.qml7
-rw-r--r--resources/qml/QuickSwitcher.qml9
3 files changed, 12 insertions, 6 deletions
diff --git a/resources/qml/Completer.qml b/resources/qml/Completer.qml
index 3abf8f38..4a692c55 100644
--- a/resources/qml/Completer.qml
+++ b/resources/qml/Completer.qml
@@ -92,6 +92,7 @@ Popup {
         model: completer
         verticalLayoutDirection: popup.bottomToTop ? ListView.BottomToTop : ListView.TopToBottom
         spacing: rowSpacing
+        pixelAligned: true
 
         delegate: Rectangle {
             color: model.index == popup.currentIndex ? colors.highlight : colors.base
@@ -202,6 +203,7 @@ Popup {
 
                         Label {
                             text: model.roomName
+                            font.pixelSize: popup.avatarHeight * 0.5
                             color: model.index == popup.currentIndex ? colors.highlightedText : colors.text
                         }
 
diff --git a/resources/qml/MatrixTextField.qml b/resources/qml/MatrixTextField.qml
index 037a0b71..9e8d286b 100644
--- a/resources/qml/MatrixTextField.qml
+++ b/resources/qml/MatrixTextField.qml
@@ -2,8 +2,13 @@ import QtQuick 2.13
 import QtQuick.Layouts 1.13
 import QtQuick.Controls 2.13
 
-TextInput {
+TextField {
     id: input
+    palette: colors
+
+    background: Rectangle {
+        color: colors.base
+    }
 
     Rectangle {
         id: blueBar
diff --git a/resources/qml/QuickSwitcher.qml b/resources/qml/QuickSwitcher.qml
index ab037d4e..29d9a9b2 100644
--- a/resources/qml/QuickSwitcher.qml
+++ b/resources/qml/QuickSwitcher.qml
@@ -5,7 +5,7 @@ import im.nheko 1.0
 Popup {
     id: quickSwitcher
 
-    property int textHeight: 48
+    property int textHeight: 32
     property int textMargin: 8
 
     x: parent.width / 2 - width / 2
@@ -49,9 +49,9 @@ Popup {
     Completer {
         id: completerPopup
 
-        x: roomTextInput.x - 5
-        y: roomTextInput.y + roomTextInput.height + 5
-        width: parent.width + 10
+        x: roomTextInput.x
+        y: roomTextInput.y + roomTextInput.height + textMargin
+        width: parent.width
         completerName: "room"
         bottomToTop: false
         fullWidth: true
@@ -77,7 +77,6 @@ Popup {
 
     Connections {
         onCompletionSelected: {
-            console.log(id)
             TimelineManager.setHistoryView(id)
             TimelineManager.highlightRoom(id)
             quickSwitcher.close()