3 files changed, 51 insertions, 11 deletions

diff --git a/components/kube/contents/ui/AddresseeListEditor.qml b/components/kube/contents/ui/AddresseeListEditor.qml
index 873e0c6c..1f106dfd 100644
--- a/components/kube/contents/ui/AddresseeListEditor.qml
+++ b/components/kube/contents/ui/AddresseeListEditor.qml
@@ -78,20 +78,18 @@ Item {
             }
         }
 
-        MouseArea {
+        Item {
             height: Kube.Units.gridUnit * Kube.Units.smallSpacing * 2
             width: parent.width
-            hoverEnabled: true
 
-            onClicked: {
-                lineEdit.visible = true
-                lineEdit.forceActiveFocus()
-            }
-
-            Kube.Label {
+            Kube.TextButton {
+                id: button
                 text: "+ " + qsTr("Add recipient")
                 color: Kube.Colors.highlightColor
-                font.underline: parent.containsMouse
+                onClicked: {
+                    lineEdit.visible = true
+                    lineEdit.forceActiveFocus()
+                }
             }
 
             Kube.AutocompleteLineEdit {
@@ -100,7 +98,6 @@ Item {
                     left: parent.left
                     right: parent.right
                 }
-
                 visible: false
 
                 placeholderText: "+ " + qsTr("Add recipient")
@@ -108,7 +105,6 @@ Item {
                 onSearchTermChanged: root.completer.searchString = searchTerm
                 onAccepted: {
                     root.added(text);
-                    console.warn("Accepted input: ", text)
                     clear()
                     visible = false
                 }
diff --git a/framework/qml/TextButton.qml b/framework/qml/TextButton.qml
new file mode 100644
index 00000000..4d7ea27d
--- /dev/null
+++ b/framework/qml/TextButton.qml
@@ -0,0 +1,43 @@
+/*
+ *  Copyright (C) 2017 Michael Bohlender, <bohlender@kolabsys.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+import QtQuick 2.7
+import QtQuick.Templates 2.0 as T
+import org.kube.framework 1.0
+
+T.Button {
+    id: root
+
+    property alias color: label.color
+
+    width: Math.max(Units.gridUnit, contentItem.implicitWidth + leftPadding + rightPadding)
+    height: contentItem.implicitHeight + topPadding + bottomPadding
+
+    clip: true
+    hoverEnabled: true
+    Keys.onReturnPressed: root.clicked()
+
+    contentItem: Label {
+        id: label
+        text: root.text
+        font.underline: root.activeFocus || root.hovered
+        elide: Text.ElideRight
+        horizontalAlignment: Text.AlignHCenter
+        verticalAlignment: Text.AlignVCenter
+    }
+}
diff --git a/framework/qmldir b/framework/qmldir
index 0a71b6c8..156cdb07 100644
--- a/framework/qmldir
+++ b/framework/qmldir
@@ -20,6 +20,7 @@ ProgressBar 1.0 ProgressBar.qml
 StatusBar 1.0 StatusBar.qml
 ComboBox 1.0 ComboBox.qml
 PositiveButton 1.0 PositiveButton.qml
+TextButton 1.0 TextButton.qml
 TextField 1.0 TextField.qml
 TextArea 1.0 TextArea.qml
 TextEditor 1.0 TextEditor.qml