Skip to content
This repository was archived by the owner on Jul 15, 2026. It is now read-only.

sync: from linuxdeepin/dtkwidget #13

Merged
FeiWang1119 merged 1 commit into from
Jan 10, 2024
Merged

sync: from linuxdeepin/dtkwidget #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion include/widgets/danchors.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
#include <QResizeEvent>
#include <QMoveEvent>
#include <QWidget>
#include <QDebug>

#include <dtkwidget_global.h>

Expand Down
1 change: 0 additions & 1 deletion include/widgets/darrowbutton.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#include <QWidget>
#include <QLabel>
#include <QStyle>
#include <QDebug>

#include <dtkwidget_global.h>
#include <dconstants.h>
Expand Down
4 changes: 0 additions & 4 deletions include/widgets/darrowrectangle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,9 @@
#include <QHBoxLayout>
#include <QVBoxLayout>
#include <QPainter>
#include <QTimer>
#include <QDebug>

#include <DObject>
#include <dtkwidget_global.h>
#include <DThemeManager>
#include <dgraphicsgloweffect.h>
#include <DBlurEffectWidget>

DWIDGET_BEGIN_NAMESPACE
Expand Down
1 change: 0 additions & 1 deletion include/widgets/dloadingindicator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include <QGraphicsPixmapItem>
#include <QGraphicsView>
#include <QEasingCurve>
#include <QDebug>

#include <dtkwidget_global.h>
#include <DObject>
Expand Down
1 change: 1 addition & 0 deletions src/widgets/darrowrectangle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "dplatformwindowhandle.h"
#include "dapplication.h"
#include "private/darrowrectangle_p.h"
#include "dgraphicsgloweffect.h"
#include "dstyle.h"

#include <DGuiApplicationHelper>
Expand Down
3 changes: 2 additions & 1 deletion src/widgets/dstyleditemdelegate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/widgets/dtextedit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<QTextEditPrivate *>(qGetPtrHelper(d_ptr));
Expand Down