Merge tag 'upstream/2.3'

[minitube] / src / urllineedit.cpp

diff --git a/src/urllineedit.cpp b/src/urllineedit.cpp
index 60fdf5436c3ceb73a2a4d65228dde53c85d3d182..1b79fd07bf619970018a3452ebfca29890f0d351 100644 (file)
--- a/src/urllineedit.cpp
+++ b/src/urllineedit.cpp
@@ -42,17 +42,17 @@
 #include "urllineedit.h"
 #include "searchlineedit.h"
 
-#include <QtCore/QEvent>
-
-#include <QtGui/QApplication>
-#include <QtGui/QCompleter>
-#include <QtGui/QFocusEvent>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QLabel>
-#include <QtGui/QLineEdit>
-#include <QtGui/QPainter>
-#include <QtGui/QStyle>
-#include <QtGui/QStyleOptionFrameV2>
+#include <QEvent>
+
+#include <QApplication>
+#include <QCompleter>
+#include <QFocusEvent>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPainter>
+#include <QStyle>
+#include <QStyleOptionFrameV2>
 
 #include <QtCore/QDebug>
 
@@ -76,6 +76,7 @@ ExLineEdit::ExLineEdit(QWidget *parent)
     m_lineEdit->setFrame(false);
     m_lineEdit->setFocusProxy(this);
     m_lineEdit->setAttribute(Qt::WA_MacShowFocusRect, false);
+    m_lineEdit->setStyleSheet("background:transparent");
     QPalette clearPalette = m_lineEdit->palette();
     clearPalette.setBrush(QPalette::Base, QBrush(Qt::transparent));
     m_lineEdit->setPalette(clearPalette);
@@ -178,6 +179,9 @@ void ExLineEdit::focusOutEvent(QFocusEvent *event)
 
 void ExLineEdit::keyPressEvent(QKeyEvent *event)
 {
+    if (event->key() == Qt::Key_Escape && !m_lineEdit->text().isEmpty()) {
+        m_lineEdit->clear();
+    }
     m_lineEdit->event(event);
     QWidget::keyPressEvent(event);
 }