diff --git a/include/widgets/danchors.h b/include/widgets/danchors.h index caa275f1c..9d1bdb1fd 100644 --- a/include/widgets/danchors.h +++ b/include/widgets/danchors.h @@ -11,7 +11,6 @@ #include #include #include -#include #include diff --git a/include/widgets/darrowbutton.h b/include/widgets/darrowbutton.h index f86cd0ea5..94334943d 100644 --- a/include/widgets/darrowbutton.h +++ b/include/widgets/darrowbutton.h @@ -8,7 +8,6 @@ #include #include #include -#include #include #include diff --git a/include/widgets/darrowrectangle.h b/include/widgets/darrowrectangle.h index a0050eff2..cf9ca6cc5 100644 --- a/include/widgets/darrowrectangle.h +++ b/include/widgets/darrowrectangle.h @@ -11,13 +11,9 @@ #include #include #include -#include -#include #include #include -#include -#include #include DWIDGET_BEGIN_NAMESPACE diff --git a/include/widgets/dloadingindicator.h b/include/widgets/dloadingindicator.h index 52c83e631..87d1d1efe 100644 --- a/include/widgets/dloadingindicator.h +++ b/include/widgets/dloadingindicator.h @@ -15,7 +15,6 @@ #include #include #include -#include #include #include diff --git a/src/widgets/darrowrectangle.cpp b/src/widgets/darrowrectangle.cpp index dc340f528..9fb56dda2 100644 --- a/src/widgets/darrowrectangle.cpp +++ b/src/widgets/darrowrectangle.cpp @@ -6,6 +6,7 @@ #include "dplatformwindowhandle.h" #include "dapplication.h" #include "private/darrowrectangle_p.h" +#include "dgraphicsgloweffect.h" #include "dstyle.h" #include diff --git a/src/widgets/dstyleditemdelegate.cpp b/src/widgets/dstyleditemdelegate.cpp index e6861ec80..9b749e3eb 100644 --- a/src/widgets/dstyleditemdelegate.cpp +++ b/src/widgets/dstyleditemdelegate.cpp @@ -1385,7 +1385,8 @@ void DStyledItemDelegate::initStyleOption(QStyleOptionViewItem *option, const QM QPalette::ColorRole role = getViewItemColorRole(index, Dtk::ViewItemBackgroundRole); if (role != QPalette::NoRole) { - option->backgroundBrush = lv->palette().brush(role); + auto pa = option->widget ? option->widget->palette() : qApp->palette(); + option->backgroundBrush = pa.brush(role); } } diff --git a/src/widgets/dtextedit.cpp b/src/widgets/dtextedit.cpp index f55ec5e48..993fe29da 100644 --- a/src/widgets/dtextedit.cpp +++ b/src/widgets/dtextedit.cpp @@ -128,7 +128,7 @@ bool DTextEdit::event(QEvent *e) } } } else if ((e->type() == QEvent::WindowActivate || e->type() == QEvent::WindowDeactivate) && - !DGuiApplicationHelper::testAttribute(DGuiApplicationHelper::UseInactiveColorGroup)) { + DGuiApplicationHelper::testAttribute(DGuiApplicationHelper::UseInactiveColorGroup)) { // only work for DTextEdit without setAttribute UseInactiveColorGroup false // TODO: remove me if QTextEdit fix it QTextEditPrivate *d = reinterpret_cast(qGetPtrHelper(d_ptr));