Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions include/widgets/dalertcontrol.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ class LIBDTKWIDGETSHARED_EXPORT DAlertControl : public QObject, public DTK_CORE_
void setAlertColor(QColor c);
QColor alertColor() const;
QColor defaultAlertColor() const;
void setAlertAlignment(Qt::Alignment alignment);
Qt::Alignment alertAlignment() const;
void setMessageAlignment(Qt::Alignment alignment);
Qt::Alignment messageAlignment() const;
void showAlertMessage(const QString &text, int duration = 3000);
Expand Down
2 changes: 2 additions & 0 deletions include/widgets/dlineedit.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ class LIBDTKWIDGETSHARED_EXPORT DLineEdit : public QWidget, public DTK_CORE_NAME
bool isAlert() const;
void showAlertMessage(const QString &text, int duration = 3000);
void showAlertMessage(const QString &text, QWidget *follower, int duration = 3000);
void setAlertAlignment(Qt::Alignment alignment);
Qt::Alignment alertAlignment() const;
void setAlertMessageAlignment(Qt::Alignment alignment);
Qt::Alignment alertMessageAlignment() const;
void hideAlertMessage();
Expand Down
31 changes: 27 additions & 4 deletions src/widgets/dalertcontrol.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -158,26 +158,48 @@ QColor DAlertControl::alertColor() const

/*!
@~english
\brief DAlertControl::setMessageAlignmentSpecify the alignment method Now only support the left, right, center, default left
\brief DAlertControl::setAlertAlignment Specify the alignment method Now only support the left, right, center, default left
\note When the parameters are other, the default left
\a alignment 消息对齐方式
*/
void DAlertControl::setMessageAlignment(Qt::Alignment alignment)
void DAlertControl::setAlertAlignment(Qt::Alignment alignment)
{
D_D(DAlertControl);
d->alignment = alignment;
}

/*!
@~english
\brief DAlertControl::messageAlignment Return to the current alarm Tooltips alignment method
\brief DAlertControl::alertAlignment Return to the current alarm Tooltips alignment method
*/
Qt::Alignment DAlertControl::messageAlignment() const
Qt::Alignment DAlertControl::alertAlignment() const
{
D_DC(DAlertControl);
return d->alignment;
}

/*!
@~english
\brief DAlertControl::setMessageAlignment Specify the alignment method Now only support the left, right, center, default center
\note When the parameters are other, the default center
\a alignment 文本内容对齐方式
*/
void DAlertControl::setMessageAlignment(Qt::Alignment alignment)
{
D_D(DAlertControl);
d->messageAlignment = alignment;
}

/*!
@~english
\brief DAlertControl::messageAlignment Return to the current tooltip message alignment method
*/
Qt::Alignment DAlertControl::messageAlignment() const
{
D_DC(DAlertControl);
return d->messageAlignment;
}

/*!
@~english
\brief DAlertControl::showAlertMessage Display warning message
Expand Down Expand Up @@ -216,6 +238,7 @@ void DAlertControl::showAlertMessage(const QString &text, QWidget *follower, int
d->tooltip->setAccessibleName("DAlertControlAlertToolTip");
d->tooltip->setForegroundRole(DPalette::TextWarning);
d->tooltip->setWordWrap(true);
d->tooltip->setAlignment(d->messageAlignment);

d->frame = new DFloatingWidget;
d->frame->setAccessibleName("DAlertControlFloatingWidget");
Expand Down
12 changes: 12 additions & 0 deletions src/widgets/dlineedit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,18 @@ void DLineEdit::showAlertMessage(const QString &text, QWidget *follower, int dur
\note When the parameter is other, the default left alignment
\a alignment Message alignment
*/
void DLineEdit::setAlertAlignment(Qt::Alignment alignment)
{
D_D(DLineEdit);
d->control->setAlertAlignment(alignment);
}

Qt::Alignment DLineEdit::alertAlignment() const
{
D_DC(DLineEdit);
return d->control->alertAlignment();
}

void DLineEdit::setAlertMessageAlignment(Qt::Alignment alignment)
{
D_D(DLineEdit);
Expand Down
1 change: 0 additions & 1 deletion src/widgets/dtiplabel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ DTipLabelPrivate::DTipLabelPrivate(DTipLabel *q)
void DTipLabelPrivate::init()
{
Q_Q(DTipLabel);
q->setAlignment(Qt::AlignCenter);

DFontSizeManager::instance()->bind(q, DFontSizeManager::T7);
}
Expand Down
1 change: 1 addition & 0 deletions src/widgets/private/dalertcontrol_p.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class DAlertControlPrivate : public DTK_CORE_NAMESPACE::DObjectPrivate
QPointer<QWidget> target;
QColor alertColor;
Qt::Alignment alignment{Qt::AlignLeft};
Qt::Alignment messageAlignment{Qt::AlignLeft};
QTimer timer;
};

Expand Down
Loading