From 708d9f32559b74c0c02b587a9a1224caf0475f7f Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich@redhat.com>
Date: Tue, 30 Jul 2019 12:11:38 +0200
Subject: [PATCH] Pull in upstream fixes

---
 adwaita-qt-upstream-fixes.patch | 24 ++++++++++++++++++++++++
 adwaita-qt.spec                 |  7 ++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 adwaita-qt-upstream-fixes.patch

diff --git a/adwaita-qt-upstream-fixes.patch b/adwaita-qt-upstream-fixes.patch
new file mode 100644
index 0000000..d7f7888
--- /dev/null
+++ b/adwaita-qt-upstream-fixes.patch
@@ -0,0 +1,24 @@
+diff --git a/style/adwaitastyle.cpp b/style/adwaitastyle.cpp
+index aeeb8ae..6d2860e 100644
+--- a/style/adwaitastyle.cpp
++++ b/style/adwaitastyle.cpp
+@@ -392,6 +392,10 @@ void Style::polish(QWidget *widget)
+     } else if (widget->inherits("QTipLabel")) {
+         setTranslucentBackground(widget);
+     } else if (QLineEdit *lineEdit = qobject_cast<QLineEdit *>(widget)) {
++        // Do not use additional margin if the QLineEdit is really small
++        const bool useMarginWidth = lineEdit->width() > lineEdit->fontMetrics().width("#####");
++        const int marginWidth = useMarginWidth ? Metrics::LineEdit_MarginWidth : 0;
++        lineEdit->setTextMargins(marginWidth, Metrics::LineEdit_MarginHeight, marginWidth, Metrics::LineEdit_MarginHeight);
+         lineEdit->setTextMargins(Metrics::LineEdit_MarginWidth, Metrics::LineEdit_MarginHeight, Metrics::LineEdit_MarginWidth, Metrics::LineEdit_MarginHeight);
+     } else if (QSpinBox *spinBox = qobject_cast<QSpinBox *>(widget)) {
+         if (!spinBox->isEnabled()) {
+@@ -4844,7 +4848,7 @@ bool Style::drawMenuBarItemControl(const QStyleOption *option, QPainter *painter
+     QRect textRect = option->fontMetrics.boundingRect(rect, textFlags, menuItemOption->text);
+ 
+     // render text
+-    const QPalette::ColorRole role = (useStrongFocus && sunken) ? QPalette::Highlight : QPalette::WindowText;
++    const QPalette::ColorRole role = (useStrongFocus && sunken) ? QPalette::Link : QPalette::WindowText;
+     drawItemText(painter, textRect, textFlags, palette, enabled, menuItemOption->text, role);
+ 
+     return true;
diff --git a/adwaita-qt.spec b/adwaita-qt.spec
index 06b6466..038b32d 100644
--- a/adwaita-qt.spec
+++ b/adwaita-qt.spec
@@ -1,12 +1,14 @@
 Name:           adwaita-qt
 Version:        1.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        LGPLv2+
 Summary:        Adwaita theme for Qt-based applications
 
 Url:            https://github.com/FedoraQt/adwaita-qt
 Source0:        https://github.com/FedoraQt/adwaita-qt/archive/%{version}/adwaita-qt-%{version}.tar.gz
 
+Patch0:         adwaita-qt-upstream-fixes.patch
+
 BuildRequires:  cmake
 BuildRequires:  qt4-devel
 
@@ -74,6 +76,9 @@ make install/fast DESTDIR=%{buildroot} -C "%{_target_platform}-qt5"
 %files
 
 %changelog
+* Tue Jul 30 2019 Jan Grulich <jgrulich@redhat.com> - 1.1.0-2
+- Pull in upstream fixes
+
 * Mon Jul 29 2019 Jan Grulich <jgrulich@redhat.com> - 1.1.0-1
 - Update to 1.1.0