Fix painting of items for gtk style when touch friendly

support/combobox.cpp

@@ -30,6 +30,7 @@
 #include <QStyledItemDelegate>
 #include <QDesktopWidget>
 #include <QApplication>
+#include <QPainter>
 #include "gtkstyle.h"
 #include "flickcharm.h"
 
@@ -39,7 +40,7 @@ static int maxPopupItemCount=-1;
 class ComboItemDelegate : public QStyledItemDelegate
 {
 public:
-    ComboItemDelegate(QObject *p) : QStyledItemDelegate(p) { }
+    ComboItemDelegate(ComboBox *p) : QStyledItemDelegate(p), mCombo(p) { }
     virtual ~ComboItemDelegate() { }
     QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const
     {
@@ -50,6 +51,84 @@ public:
         }
         return sz;
     }
+    void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
+    {
+        if (GtkStyle::isActive()) {
+            QStyleOptionMenuItem opt = getStyleOption(option, index);
+            painter->fillRect(option.rect, opt.palette.background());
+            mCombo->style()->drawControl(QStyle::CE_MenuItem, &opt, painter, mCombo);
+        } else {
+            QStyledItemDelegate::paint(painter, option, index);
+        }
+    }
+
+    static bool isSeparator(const QModelIndex &index)
+    {
+        return index.data(Qt::AccessibleDescriptionRole).toString() == QLatin1String("separator");
+    }
+
+    QStyleOptionMenuItem getStyleOption(const QStyleOptionViewItem &option, const QModelIndex &index) const
+    {
+        QStyleOptionMenuItem menuOption;
+
+        QPalette resolvedpalette = option.palette.resolve(QApplication::palette("QMenu"));
+        QVariant value = index.data(Qt::ForegroundRole);
+        if (value.canConvert<QBrush>()) {
+            resolvedpalette.setBrush(QPalette::WindowText, qvariant_cast<QBrush>(value));
+            resolvedpalette.setBrush(QPalette::ButtonText, qvariant_cast<QBrush>(value));
+            resolvedpalette.setBrush(QPalette::Text, qvariant_cast<QBrush>(value));
+        }
+        menuOption.palette = resolvedpalette;
+        menuOption.state = QStyle::State_None;
+        if (mCombo->window()->isActiveWindow()) {
+            menuOption.state = QStyle::State_Active;
+        }
+        if ((option.state & QStyle::State_Enabled) && (index.model()->flags(index) & Qt::ItemIsEnabled)) {
+            menuOption.state |= QStyle::State_Enabled;
+        } else {
+            menuOption.palette.setCurrentColorGroup(QPalette::Disabled);
+        }
+        if (option.state & QStyle::State_Selected) {
+            menuOption.state |= QStyle::State_Selected;
+        }
+        menuOption.checkType = QStyleOptionMenuItem::NonExclusive;
+        menuOption.checked = mCombo->currentIndex() == index.row();
+        if (isSeparator(index)) {
+            menuOption.menuItemType = QStyleOptionMenuItem::Separator;
+        } else {
+            menuOption.menuItemType = QStyleOptionMenuItem::Normal;
+        }
+
+        QVariant variant = index.model()->data(index, Qt::DecorationRole);
+        switch (variant.type()) {
+        case QVariant::Icon:
+            menuOption.icon = qvariant_cast<QIcon>(variant);
+            break;
+        case QVariant::Color: {
+            static QPixmap pixmap(option.decorationSize);
+            pixmap.fill(qvariant_cast<QColor>(variant));
+            menuOption.icon = pixmap;
+            break;
+        }
+        default:
+            menuOption.icon = qvariant_cast<QPixmap>(variant);
+            break;
+        }
+        if (index.data(Qt::BackgroundRole).canConvert<QBrush>()) {
+            menuOption.palette.setBrush(QPalette::All, QPalette::Background,
+                                        qvariant_cast<QBrush>(index.data(Qt::BackgroundRole)));
+        }
+        menuOption.text = index.model()->data(index, Qt::DisplayRole).toString()
+                               .replace(QLatin1Char('&'), QLatin1String("&&"));
+        menuOption.tabWidth = 0;
+        menuOption.maxIconWidth =  option.decorationSize.width() + 4;
+        menuOption.menuRect = option.rect;
+        menuOption.rect = option.rect;
+        menuOption.font = mCombo->font();
+        menuOption.fontMetrics = QFontMetrics(menuOption.font);
+        return menuOption;
+    }
+    ComboBox *mCombo;
 };
 
 ComboBox::ComboBox(QWidget *p)
@@ -69,6 +148,7 @@ ComboBox::ComboBox(QWidget *p)
     }
     if (Utils::touchFriendly()) {
         setItemDelegate(new ComboItemDelegate(this));
+        FlickCharm::self()->activateOn(view());
     }
 }
 
@@ -95,7 +175,10 @@ void ComboBox::showPopup()
         }
     }
     QComboBox::showPopup();
-    FlickCharm::self()->activateOn(view());
+    if (Utils::touchFriendly()) {
+        view()->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+        view()->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    }
 
     if (GtkStyle::isActive() && parentWidget() && view()->parentWidget() && count()>maxPopupItemCount) {
         // Also, if the size of the popup is more than required for 32 items, then