diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2014-05-08 12:54:36 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2014-05-08 14:05:09 -0500 |
commit | 119414ddcded64aa6db0cec87a517fc9fe64716b (patch) | |
tree | 71b8d1b4a9e1ca32bfb52ca19a6e455e6e619de9 /pkgs/misc | |
parent | e5fcc046321cca432ea1b0175059fe85666c4f2c (diff) | |
download | nixlib-119414ddcded64aa6db0cec87a517fc9fe64716b.tar nixlib-119414ddcded64aa6db0cec87a517fc9fe64716b.tar.gz nixlib-119414ddcded64aa6db0cec87a517fc9fe64716b.tar.bz2 nixlib-119414ddcded64aa6db0cec87a517fc9fe64716b.tar.lz nixlib-119414ddcded64aa6db0cec87a517fc9fe64716b.tar.xz nixlib-119414ddcded64aa6db0cec87a517fc9fe64716b.tar.zst nixlib-119414ddcded64aa6db0cec87a517fc9fe64716b.zip |
qtcurve: add toolbar alpha patch
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/themes/qtcurve/default.nix | 5 | ||||
-rw-r--r-- | pkgs/misc/themes/qtcurve/qtcurve-1.8.18-toolbar-alpha.patch | 34 |
2 files changed, 38 insertions, 1 deletions
diff --git a/pkgs/misc/themes/qtcurve/default.nix b/pkgs/misc/themes/qtcurve/default.nix index 78f2a594569b..e63f68460022 100644 --- a/pkgs/misc/themes/qtcurve/default.nix +++ b/pkgs/misc/themes/qtcurve/default.nix @@ -23,7 +23,10 @@ stdenv.mkDerivation { xlibs.libxshmfence ]; - patches = [ ./qtcurve-1.8.18-install-paths.patch ]; + patches = [ + ./qtcurve-1.8.18-install-paths.patch + ./qtcurve-1.8.18-toolbar-alpha.patch + ]; cmakeFlags = '' -DENABLE_QT5=OFF diff --git a/pkgs/misc/themes/qtcurve/qtcurve-1.8.18-toolbar-alpha.patch b/pkgs/misc/themes/qtcurve/qtcurve-1.8.18-toolbar-alpha.patch new file mode 100644 index 000000000000..85400e6f0f67 --- /dev/null +++ b/pkgs/misc/themes/qtcurve/qtcurve-1.8.18-toolbar-alpha.patch @@ -0,0 +1,34 @@ +diff --git a/qt4/style/qtcurve.cpp b/qt4/style/qtcurve.cpp +index d7659f5..aede882 100644 +--- a/qt4/style/qtcurve.cpp ++++ b/qt4/style/qtcurve.cpp +@@ -12436,7 +12436,12 @@ Style::drawMenuOrToolBarBackground(const QWidget *widget, QPainter *p, + if (!qtcIsCustomBgnd(&opts) || !qtcIsFlat(app) || + (menu && SHADE_NONE != opts.shadeMenubars)) { + p->save(); ++#if 0 ++ // Revert for now ++ // This is necessary for correct opacity on the menubar but may ++ // break transparent gradient. + p->setCompositionMode(QPainter::CompositionMode_Source); ++#endif + QRect rx(r); + QColor col(menu && (option->state & State_Enabled || + SHADE_NONE != opts.shadeMenubars) ? +diff --git a/qt5/style/qtcurve.cpp b/qt5/style/qtcurve.cpp +index c43b8a3..135eddc 100644 +--- a/qt5/style/qtcurve.cpp ++++ b/qt5/style/qtcurve.cpp +@@ -3398,7 +3398,12 @@ Style::drawMenuOrToolBarBackground(const QWidget *widget, QPainter *p, + if (!qtcIsCustomBgnd(&opts) || !qtcIsFlat(app) || + (menu && opts.shadeMenubars != SHADE_NONE)) { + p->save(); ++#if 0 ++ // Revert for now ++ // This is necessary for correct opacity on the menubar but may ++ // break transparent gradient. + p->setCompositionMode(QPainter::CompositionMode_Source); ++#endif + QRect rx(r); + QColor col(menu && (option->state & State_Enabled || + opts.shadeMenubars != SHADE_NONE) ? |