Rework param search ui (#3353)

mavlink · May 9, 2016 · 2b64576 · 2b64576
1 parent 4018513
commit 2b64576
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/QmlControls/ParameterEditor.qml b/src/QmlControls/ParameterEditor.qml
@@ -71,20 +71,20 @@ QGCView {
             height:         searchText.height + ScreenTools.defaultFontPixelHeight / 3
             spacing:        ScreenTools.defaultFontPixelWidth
 
+            QGCTextField {
+                id: searchText
+            }
+
             QGCButton {
                 anchors.top:    searchText.top
                 anchors.bottom: searchText.bottom
-                text:           qsTr("Filter by:")
+                text:           qsTr("Search")
                 onClicked: {
                     _searchResults = controller.searchParametersForComponent(-1, searchText.text)
                     _searchFilter = true
                 }
             }
 
-            QGCTextField {
-                id: searchText
-            }
-
             QGCButton {
                 anchors.top:    searchText.top
                 anchors.bottom: searchText.bottom

diff --git a/src/QmlControls/ScreenTools.qml b/src/QmlControls/ScreenTools.qml
@@ -63,6 +63,7 @@ Item {
         smallFontPointSize      = defaultFontPointSize  * _screenTools.smallFontPointRatio
         mediumFontPointSize     = defaultFontPointSize  * _screenTools.mediumFontPointRatio
         largeFontPointSize      = defaultFontPointSize  * _screenTools.largeFontPointRatio
+        console.log("setBasePointSize", defaultFontPixelWidth)
     }
 
     Text {