rpms/adwaita-qt
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Pull in upstream fixes

Browse Source
This commit is contained in:
Jan Grulich 2019-09-02 09:54:41 +02:00
parent 384641dddd
commit 712e7fdae5
2 changed files with 110 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
adwaita-qt-upstream-fixes.patch
View File

@ -11,8 +11,34 @@ index b7c830a..09b970a 100644
LineEdit_MarginWidth = 8,
LineEdit_MinHeight = 36,
LineEdit_MinWidth = 80,
diff --git a/style/adwaitahelper.cpp b/style/adwaitahelper.cpp
index 9c9e905..604b9e3 100644
--- a/style/adwaitahelper.cpp
+++ b/style/adwaitahelper.cpp
@@ -182,7 +182,7 @@ QColor Helper::buttonBackgroundColor(const QPalette &palette, bool mouseOver, bo
// Hovered button for normal mode is bg_color
return mix(buttonBackground, background, opacity);
}
- } else if(mouseOver) {
+ } else if (mouseOver) {
if (darkMode) {
// Hovered button for dark mode is darken(bg_color, 0.01)
return darken(background, 0.01);
@@ -575,10 +575,10 @@ void Helper::renderMenuFrame(QPainter *painter, const QRect &rect, const QColor
painter->setBrush(Qt::NoBrush);
painter->setRenderHint(QPainter::Antialiasing, false);
- QRect frameRect(rect);
+ QRectF frameRect(rect);
if (outline.isValid()) {
painter->setPen(outline);
- frameRect.adjust(0, 0, -1, -1);
+ frameRect.adjust(0.5, 0.5, -0.5, -0.5);
} else
painter->setPen(Qt::NoPen);
diff --git a/style/adwaitastyle.cpp b/style/adwaitastyle.cpp
index aeeb8ae..2287e0e 100644
index aeeb8ae..224fa7f 100644
--- a/style/adwaitastyle.cpp
+++ b/style/adwaitastyle.cpp
@@ -392,7 +392,12 @@ void Style::polish(QWidget *widget)
@ -29,7 +55,25 @@ index aeeb8ae..2287e0e 100644
} else if (QSpinBox *spinBox = qobject_cast<QSpinBox *>(widget)) {
if (!spinBox->isEnabled()) {
QPalette pal = spinBox->palette();
@@ -4844,7 +4849,7 @@ bool Style::drawMenuBarItemControl(const QStyleOption *option, QPainter *painter
@@ -1266,9 +1271,6 @@ void Style::drawControl(ControlElement element, const QStyleOption *option, QPai
case CE_MenuBarItem:
fcn = &Style::drawMenuBarItemControl;
break;
- case CE_MenuEmptyArea:
- fcn = &Style::drawMenuEmptyAreaControl;
- break;
case CE_MenuItem:
fcn = &Style::drawMenuItemControl;
break;
@@ -3391,7 +3393,6 @@ bool Style::drawFrameLineEditPrimitive(const QStyleOption *option, QPainter *pai
// focus takes precedence over mouse over
_animations->inputWidgetEngine().updateState(widget, AnimationFocus, hasFocus);
- _animations->inputWidgetEngine().updateState(widget, AnimationHover, mouseOver && !hasFocus);
// retrieve animation mode and opacity
AnimationMode mode(_animations->inputWidgetEngine().frameAnimationMode(widget));
@@ -4844,27 +4845,12 @@ bool Style::drawMenuBarItemControl(const QStyleOption *option, QPainter *painter
QRect textRect = option->fontMetrics.boundingRect(rect, textFlags, menuItemOption->text);
// render text
@ -38,3 +82,63 @@ index aeeb8ae..2287e0e 100644
drawItemText(painter, textRect, textFlags, palette, enabled, menuItemOption->text, role);
return true;
}
-bool Style::drawMenuEmptyAreaControl(const QStyleOption *option, QPainter *painter, const QWidget *widget) const
-{
- if (_isGNOME)
- painter->setPen(Qt::transparent);
- else
- painter->setPen(option->palette.window().color().darker(150));
-
- painter->setBrush(option->palette.base().color());
- if (_isGNOME)
- painter->drawRect(option->rect);
- else
- painter->drawRect(option->rect.adjusted(0, 0, -1, -1));
- return true;
-}
-
//___________________________________________________________________________________
bool Style::drawMenuItemControl(const QStyleOption *option, QPainter *painter, const QWidget *widget) const
{
@@ -4878,11 +4864,6 @@ bool Style::drawMenuItemControl(const QStyleOption *option, QPainter *painter, c
// copy rect and palette
const QRect &rect(option->rect);
const QPalette &palette(option->palette);
- const QColor &background(palette.color(QPalette::Active, QPalette::Base));
-
- painter->setPen(Qt::NoPen);
- painter->setBrush(background);
- painter->drawRect(rect);
// deal with separators
if (menuItemOption->menuItemType == QStyleOptionMenuItem::Separator) {
@@ -6273,11 +6254,13 @@ bool Style::drawComboBoxComplexControl(const QStyleOptionComplex *option, QPaint
AnimationMode mode(_animations->inputWidgetEngine().buttonAnimationMode(widget));
qreal opacity(_animations->inputWidgetEngine().buttonOpacity(widget));
- QColor shadow(palette.color(QPalette::Shadow));
+ // define colors
+ QColor shadow(_helper->shadowColor(palette));
QColor outline(_helper->buttonOutlineColor(palette, mouseOver, hasFocus, opacity, mode, _dark));
QColor background(_helper->buttonBackgroundColor(palette, mouseOver, hasFocus, sunken, opacity, mode, _dark));
- _helper->renderFlatButtonFrame(painter, subControlRect(CC_ComboBox, option, SC_ComboBoxArrow, widget), background, outline, shadow, hasFocus, sunken, mouseOver, enabled && windowActive);
+ // render
+ _helper->renderButtonFrame(painter, rect, background, outline, shadow, hasFocus, sunken, mouseOver, enabled && windowActive, _dark);
QStyleOptionComplex tmpOpt(*option);
tmpOpt.rect.setWidth(tmpOpt.rect.width() - subControlRect(CC_ComboBox, option, SC_ComboBoxArrow, widget).width() + 3);
diff --git a/style/adwaitastyle.h b/style/adwaitastyle.h
index 2809286..ae6b13e 100644
--- a/style/adwaitastyle.h
+++ b/style/adwaitastyle.h
@@ -312,7 +312,6 @@ protected:
virtual bool drawItemViewItemControl(const QStyleOption *option, QPainter *painter, const QWidget *widget) const;
virtual bool drawMenuBarEmptyArea(const QStyleOption *option, QPainter *painter, const QWidget *widget) const;
virtual bool drawMenuBarItemControl(const QStyleOption *option, QPainter *painter, const QWidget *widget) const;
- virtual bool drawMenuEmptyAreaControl(const QStyleOption *option, QPainter *painter, const QWidget *widget) const;
virtual bool drawMenuItemControl(const QStyleOption *option, QPainter *painter, const QWidget *widget) const;
virtual bool drawProgressBarControl(const QStyleOption *option, QPainter *painter, const QWidget *widget) const;
virtual bool drawProgressBarContentsControl(const QStyleOption *option, QPainter *painter, const QWidget *widget) const;

5
adwaita-qt.spec
View File

@ -1,6 +1,6 @@
Name: adwaita-qt
Version: 1.1.0
Release: 3%{?dist}
Release: 4%{?dist}
License: LGPLv2+
Summary: Adwaita theme for Qt-based applications
@ -76,6 +76,9 @@ make install/fast DESTDIR=%{buildroot} -C "%{_target_platform}-qt5"
%files
%changelog
* Mon Sep 02 2019 Jan Grulich <jgrulich@redhat.com> - 1.1.0-4
- Pull in upstream fixes
* Tue Aug 13 2019 Jan Grulich <jgrulich@redhat.com> - 1.1.0-3
- Pull in upstream fixes