From 6535846732362f19d471b2cfbc362b335f740fdb Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Wed, 27 Jun 2018 16:46:22 +0100
Subject: [PATCH] Launcher styling tweaks

---
 src/GUI/qml/HistoryPopup.qml          | 2 +-
 src/GUI/qml/SearchButton.qml          | 1 +
 src/GUI/qml/SettingExtraArguments.qml | 7 +++++--
 src/GUI/qml/ViewCommandLine.qml       | 2 ++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/GUI/qml/HistoryPopup.qml b/src/GUI/qml/HistoryPopup.qml
index cafa8793b..a731fff39 100644
--- a/src/GUI/qml/HistoryPopup.qml
+++ b/src/GUI/qml/HistoryPopup.qml
@@ -76,7 +76,7 @@ Item {
                 id: choicesRepeater
                 model: root.model
                 delegate:
-                    Text {
+                    StyledText {
                         id: choiceText
 
                         // Taken from TableViewItemDelegateLoader.qml to follow QML role conventions
diff --git a/src/GUI/qml/SearchButton.qml b/src/GUI/qml/SearchButton.qml
index 56b2ddf26..b8ebc59ab 100644
--- a/src/GUI/qml/SearchButton.qml
+++ b/src/GUI/qml/SearchButton.qml
@@ -52,6 +52,7 @@ FocusScope
 
             color: Style.baseTextColor
             focus: true
+            font.pixelSize: Style.baseFontPixelSize
 
             onTextChanged: {
                 if (root.autoSubmit) {
diff --git a/src/GUI/qml/SettingExtraArguments.qml b/src/GUI/qml/SettingExtraArguments.qml
index 32c8b8474..9a51f0f6c 100644
--- a/src/GUI/qml/SettingExtraArguments.qml
+++ b/src/GUI/qml/SettingExtraArguments.qml
@@ -79,12 +79,15 @@ SettingControl {
                 font.family: "Courier"
                 selectByMouse: true
                 wrapMode: TextEdit.WordWrap
+                font.pixelSize: Style.baseFontPixelSize
+                color: Style.baseTextColor
 
-                Text {
+                StyledText {
                     id: placeholder
                     visible: (edit.text.length == 0) && !edit.activeFocus
                     text: root.placeholder
-                    color: Style.baseTextColor
+                    font.family: "Courier"
+                    color: Style.disabledTextColor
                 }
            }
         }
diff --git a/src/GUI/qml/ViewCommandLine.qml b/src/GUI/qml/ViewCommandLine.qml
index d02b9bec9..cb932d459 100644
--- a/src/GUI/qml/ViewCommandLine.qml
+++ b/src/GUI/qml/ViewCommandLine.qml
@@ -26,6 +26,8 @@ Item {
             readOnly: true
 
             wrapMode: TextEdit.Wrap
+            font.pixelSize: Style.baseFontPixelSize
+            color: Style.baseTextColor
 
             text: _config.htmlForCommandLine();
         }