From 8607f1000b67b24015c2d01cc8db361a665fad82 Mon Sep 17 00:00:00 2001
From: John Gibbon <john.gibbon@comspace.de>
Date: Mon, 11 Jan 2021 10:22:54 +0100
Subject: [PATCH] Only show inline query element mode if username is valid

---
 qml/pages/ChatPage.qml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/qml/pages/ChatPage.qml b/qml/pages/ChatPage.qml
index bd10354..1747aae 100644
--- a/qml/pages/ChatPage.qml
+++ b/qml/pages/ChatPage.qml
@@ -1302,7 +1302,7 @@ Page {
                     property bool isNeeded: false
                     width: chatPage.width
                     x: -Theme.horizontalPageMargin
-                    height: isNeeded && !inlineQuery.active ? attachmentOptionsRow.height : 0
+                    height: isNeeded && !inlineQuery.userNameIsValid ? attachmentOptionsRow.height : 0
                     Behavior on height { SmoothedAnimation { duration: 200 } }
                     visible: height > 0
                     contentHeight: attachmentOptionsRow.height
@@ -1434,7 +1434,7 @@ Page {
 
                 Row {
                     id: attachmentPreviewRow
-                    visible: (!!locationData || !!fileProperties) && !inlineQuery.active
+                    visible: (!!locationData || !!fileProperties) && !inlineQuery.userNameIsValid
                     spacing: Theme.paddingMedium
                     width: parent.width
                     layoutDirection: Qt.RightToLeft
@@ -1705,7 +1705,7 @@ Page {
                             }
                         }
 
-                        EnterKey.enabled: !inlineQuery.active && (!appSettings.sendByEnter || text.length)
+                        EnterKey.enabled: !inlineQuery.userNameIsValid && (!appSettings.sendByEnter || text.length)
                         EnterKey.iconSource: appSettings.sendByEnter ? "image://theme/icon-m-chat" : "image://theme/icon-m-enter"
 
                         onTextChanged: {
@@ -1720,7 +1720,7 @@ Page {
                         anchors.bottom: parent.bottom
                         anchors.bottomMargin: Theme.paddingSmall
                         enabled: !attachmentPreviewRow.visible
-                        visible: !inlineQuery.active
+                        visible: !inlineQuery.userNameIsValid
                         onClicked: {
                             if (attachmentOptionsFlickable.isNeeded) {
                                 attachmentOptionsFlickable.isNeeded = false;
@@ -1737,7 +1737,7 @@ Page {
                         icon.source: "image://theme/icon-m-chat"
                         anchors.bottom: parent.bottom
                         anchors.bottomMargin: Theme.paddingSmall
-                        visible: !inlineQuery.active && (!appSettings.sendByEnter || attachmentPreviewRow.visible)
+                        visible: !inlineQuery.userNameIsValid && (!appSettings.sendByEnter || attachmentPreviewRow.visible)
                         enabled: false
                         onClicked: {
                             sendMessage();
@@ -1751,7 +1751,7 @@ Page {
                     Item {
                         width: cancelInlineQueryButton.width
                         height: cancelInlineQueryButton.height
-                        visible: inlineQuery.active
+                        visible: inlineQuery.userNameIsValid
                         anchors.bottom: parent.bottom
                         anchors.bottomMargin: Theme.paddingSmall