Merge tag 'upstream/3.0.4'

Upstream version 3.0.4

# gpg: Signature made Sat 04 Apr 2015 02:41:09 PM EDT using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.com>"

2 files changed, 22 insertions, 9 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/completer/completeritemdelegate.cpp b/SQLiteStudio3/guiSQLiteStudio/completer/completeritemdelegate.cpp
index a0da399..3268960 100644
--- a/SQLiteStudio3/guiSQLiteStudio/completer/completeritemdelegate.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/completer/completeritemdelegate.cpp
@@ -1,5 +1,6 @@
 #include "completeritemdelegate.h"
 #include "completermodel.h"
+#include "common/unused.h"
 #include <QPainter>
 #include <QIcon>
 #include <QApplication>
@@ -21,8 +22,7 @@ void CompleterItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem&
     QStyleOptionViewItem opt = option;
     initStyleOption(&opt, index);
 
-    QApplication::style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &opt, painter, opt.widget);
-
+    paintBackground(painter, opt, index);
     paintIcon(painter, opt, index);
     paintText(painter, opt, index);
 }
@@ -36,6 +36,25 @@ QSize CompleterItemDelegate::sizeHint(const QStyleOptionViewItem& option, const
     return size;
 }
 
+void CompleterItemDelegate::paintBackground(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
+{
+    UNUSED(index);
+
+    painter->save();
+    QPalette::ColorGroup cg = (option.state & QStyle::State_Enabled) ? QPalette::Normal : QPalette::Disabled;
+    if (cg == QPalette::Normal && !(option.state & QStyle::State_Active))
+        cg = QPalette::Inactive;
+
+    QColor bg = option.palette.color(cg, QPalette::Base);
+    if (option.state & QStyle::State_Selected)
+        bg = option.palette.color(cg, QPalette::Highlight);
+
+    painter->setPen(Qt::NoPen);
+    painter->setBrush(bg);
+    painter->drawRect(option.rect);
+    painter->restore();
+}
+
 void CompleterItemDelegate::paintIcon(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
     QIcon icon = index.data(Qt::DecorationRole).value<QIcon>();
@@ -69,15 +88,9 @@ void CompleterItemDelegate::paintText(QPainter* painter, const QStyleOptionViewI
     QColor labelColor = option.palette.color(cg, QPalette::Link);
     if (option.state & QStyle::State_Selected)
     {
-#ifdef Q_OS_WIN32
-        prefixColor = option.palette.color(cg, QPalette::Text);
-        valueColor = option.palette.color(cg, QPalette::Text);
-        labelColor = option.palette.color(cg, QPalette::Text);
-#else
         prefixColor = option.palette.color(cg, QPalette::HighlightedText);
         valueColor = option.palette.color(cg, QPalette::HighlightedText);
         labelColor = option.palette.color(cg, QPalette::HighlightedText);
-#endif
     }
 
     // Using ascent() to measure usual height of the font, excluding anything below baseline.
diff --git a/SQLiteStudio3/guiSQLiteStudio/completer/completerwindow.cpp b/SQLiteStudio3/guiSQLiteStudio/completer/completerwindow.cpp
index 34ae30b..544adca 100644
--- a/SQLiteStudio3/guiSQLiteStudio/completer/completerwindow.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/completer/completerwindow.cpp
@@ -138,7 +138,7 @@ void CompleterWindow::changeEvent(QEvent *e)
 
 void CompleterWindow::keyPressEvent(QKeyEvent* e)
 {
-    if (e->key() == Qt::Key_Return)
+    if (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter)
     {
         accept();
         return;