Merge lp:~fboucault/unity-2d/dash_clear_hint_on_partial_input_method into lp:unity-2d

[Florian Boucault]

[dash] Do not display the search hint in the search field when a partial input is available from an input method.

Only works with Qt Quick 1.1.

=== modified file 'places/SearchEntry.qml'
--- places/SearchEntry.qml	2011-08-25 13:08:52 +0000
+++ places/SearchEntry.qml	2011-09-13 18:21:23 +0000
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 1.0
+import QtQuick 1.1
 import Effects 1.0
 
 AbstractButton {
@@ -96,7 +96,7 @@
                     offset.x: 0
                     offset.y: 0
                     color: "white"
-                    enabled: search_input.text != ""
+                    enabled: search_input.text != "" || search_input.inputMethodComposing
                 }
 
             anchors.left: search_icon.right
@@ -165,7 +165,7 @@
                 fontSize: "x-large"
                 font.italic: true
                 text: {
-                    if(search_input.text)
+                    if(search_input.text || search_input.inputMethodComposing)
                         return ""
                     else if(dash.currentPage != undefined && dash.currentPage.model.searchHint)
                         return dash.currentPage.model.searchHint