From ef383e8162219166e7a8aa6da32fa9022e1852f1 Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <mvourlakos@gmail.com>
Date: Sun, 23 May 2021 09:14:07 +0300
Subject: [PATCH] respect icon size for layout:menuitem-icon

BUG:437525
---
 app/settings/generic/generictools.cpp                        | 2 +-
 app/settings/generic/layoutscombobox.cpp                     | 4 ++--
 app/settings/settingsdialog/delegates/backgrounddelegate.cpp | 2 +-
 .../settingsdialog/delegates/layoutcmbitemdelegate.cpp       | 4 ++--
 containmentactions/contextmenu/layoutmenuitemwidget.cpp      | 5 +++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/settings/generic/generictools.cpp b/app/settings/generic/generictools.cpp
index fdb17cf4c..fae07f609 100644
--- a/app/settings/generic/generictools.cpp
+++ b/app/settings/generic/generictools.cpp
@@ -228,7 +228,7 @@ void drawLayoutIcon(QPainter *painter, const QStyleOption &option, const bool &i
     painter->setRenderHint(QPainter::Antialiasing, true);
 
     if (isBackgroundFile) {
-        int backImageMargin = qMin(target.height()/4, ICONMARGIN+1);
+        int backImageMargin = 1; //most icon themes provide 1-2px. padding around icons //OLD CALCS: ICONMARGIN; //qMin(target.height()/4, ICONMARGIN+1);
         QRect backTarget(target.x() + backImageMargin, target.y() + backImageMargin, target.width() - 2*backImageMargin, target.height() - 2*backImageMargin);
 
         QPixmap backImage(iconName);
diff --git a/app/settings/generic/layoutscombobox.cpp b/app/settings/generic/layoutscombobox.cpp
index 6f754489c..e673b44a5 100644
--- a/app/settings/generic/layoutscombobox.cpp
+++ b/app/settings/generic/layoutscombobox.cpp
@@ -68,8 +68,8 @@ void LayoutsComboBox::paintEvent(QPaintEvent *event)
     painter.drawComplexControl(QStyle::CC_ComboBox, opt);
 
     // icon
-    QRect remained = Latte::remainedFromLayoutIcon(opt, Qt::AlignLeft, 3, 3);
-    Latte::drawLayoutIcon(&painter, opt, m_layoutIcon.isBackgroundFile, m_layoutIcon.name, Qt::AlignLeft, 7, 4);
+    QRect remained = Latte::remainedFromLayoutIcon(opt, Qt::AlignLeft, 3, 5);
+    Latte::drawLayoutIcon(&painter, opt, m_layoutIcon.isBackgroundFile, m_layoutIcon.name, Qt::AlignLeft, 7, 6);
     opt.rect = remained;
 
     // adjust text place, move it a bit to the left
diff --git a/app/settings/settingsdialog/delegates/backgrounddelegate.cpp b/app/settings/settingsdialog/delegates/backgrounddelegate.cpp
index 646486d97..373c9aeb4 100644
--- a/app/settings/settingsdialog/delegates/backgrounddelegate.cpp
+++ b/app/settings/settingsdialog/delegates/backgrounddelegate.cpp
@@ -49,7 +49,7 @@ void BackgroundDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
 
     //! background
     Latte::drawBackground(painter, option);
-    Latte::drawLayoutIcon(painter, option, icon.isBackgroundFile, icon.name, Qt::AlignHCenter, -1, 2);
+    Latte::drawLayoutIcon(painter, option, icon.isBackgroundFile, icon.name, Qt::AlignHCenter, -1, 3);
 }
 
 }
diff --git a/app/settings/settingsdialog/delegates/layoutcmbitemdelegate.cpp b/app/settings/settingsdialog/delegates/layoutcmbitemdelegate.cpp
index 4f37702da..1b5d118bd 100644
--- a/app/settings/settingsdialog/delegates/layoutcmbitemdelegate.cpp
+++ b/app/settings/settingsdialog/delegates/layoutcmbitemdelegate.cpp
@@ -49,8 +49,8 @@ void LayoutCmbItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem
     Latte::Data::LayoutIcon icon = index.data(Model::Layouts::BACKGROUNDUSERROLE).value<Latte::Data::LayoutIcon>();
 
     //! icon
-    QRect remained = Latte::remainedFromLayoutIcon(myOptions, Qt::AlignLeft, 4, 0);
-    Latte::drawLayoutIcon(painter, myOptions, icon.isBackgroundFile, icon.name, Qt::AlignLeft, 5, 0); //+1px in order to take into account popup window border
+    QRect remained = Latte::remainedFromLayoutIcon(myOptions, Qt::AlignLeft, 4, 2);
+    Latte::drawLayoutIcon(painter, myOptions, icon.isBackgroundFile, icon.name, Qt::AlignLeft, 5, 2); //+1px in order to take into account popup window border
     myOptions.rect = remained;
 
     //!
diff --git a/containmentactions/contextmenu/layoutmenuitemwidget.cpp b/containmentactions/contextmenu/layoutmenuitemwidget.cpp
index 1b4cfed9a..cbffecb6b 100644
--- a/containmentactions/contextmenu/layoutmenuitemwidget.cpp
+++ b/containmentactions/contextmenu/layoutmenuitemwidget.cpp
@@ -96,8 +96,9 @@ void LayoutMenuItemWidget::paintEvent(QPaintEvent* e)
     opt.rect  = remained;
 
     //! icon
-    remained = Latte::remainedFromLayoutIcon(opt, Qt::AlignLeft, 1, 4); //add also spacing to push text a little to the right
-    Latte::drawLayoutIcon(&painter, opt, m_isBackgroundFile, m_iconName, Qt::AlignLeft, 0, 4);
+    int thickpadding = (opt.rect.height() - qMax(16, opt.maxIconWidth)) / 2; //old value 4
+    remained = Latte::remainedFromLayoutIcon(opt, Qt::AlignLeft, 1, thickpadding);
+    Latte::drawLayoutIcon(&painter, opt, m_isBackgroundFile, m_iconName, Qt::AlignLeft, 1, thickpadding);
     opt.rect  = remained;
 
     //! text