diff options
| author |   Unit 193 <unit193@unit193.net> | 2025-03-12 23:59:13 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@unit193.net> | 2025-03-12 23:59:13 -0400 |
| commit | 6f6ec30af057eab5a5f17fae6db2ce044fba6b63 (patch) | |
| tree | 96273af6fe61325b27d7e3c6aec299d00ca6f6ea /src/qt6gtk2-style/qgtkstyle.cpp | |
| parent | b3d6861131979cf5be3b5bddcb97e0341512c076 (diff) | |
| parent | a9fde3a1a12e9801172e6ff75090f430ad8a8f7b (diff) | |
Update upstream source from tag 'upstream/0.4'
Update to upstream version '0.4'
with Debian dir af81c6dc2ab3df63ff63eed1d3a816beae5724af
Diffstat (limited to 'src/qt6gtk2-style/qgtkstyle.cpp')
| -rw-r--r-- | src/qt6gtk2-style/qgtkstyle.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/qt6gtk2-style/qgtkstyle.cpp b/src/qt6gtk2-style/qgtkstyle.cpp index 9bb5b9c..3164e2c 100644 --- a/src/qt6gtk2-style/qgtkstyle.cpp +++ b/src/qt6gtk2-style/qgtkstyle.cpp @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2015 The Qt Company Ltd. * - * Copyright (C) 2016-2024 Ilya Kotov, forkotov02@ya.ru * + * Copyright (C) 2016-2025 Ilya Kotov, forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -1806,8 +1806,14 @@ void QGtkStyle::drawComplexControl(ComplexControl control, const QStyleOptionCom // and http://live.gnome.org/GnomeArt/Tutorials/GtkThemes/GtkComboBoxEntry if (const QStyleOptionComboBox *comboBox = qstyleoption_cast<const QStyleOptionComboBox *>(option)) { bool sunken = comboBox->state & State_On; // play dead, if combobox has no items + +#if (QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)) + QCachedPainter p(painter, QStringLiteral("cb-%0-%1").arg(sunken).arg(comboBox->editable), option); + gtkPainter->reset(painter); +#else BEGIN_STYLE_PIXMAPCACHE(QString::fromLatin1("cb-%0-%1").arg(sunken).arg(comboBox->editable)); gtkPainter->reset(p); +#endif gtkPainter->setUsePixmapCache(false); // cached externally bool isEnabled = (comboBox->state & State_Enabled); @@ -2004,7 +2010,11 @@ void QGtkStyle::drawComplexControl(ComplexControl control, const QStyleOptionCom style, arrowPath.toString() + QString::number(option->direction)); } } - END_STYLE_PIXMAPCACHE; +#if (QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)) + p.finish(); +#else + END_STYLE_PIXMAPCACHE +#endif } break; #endif // QT_NO_COMBOBOX |