Skip to content

sync: from linuxdeepin/dtkwidget #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
18202781743 merged 1 commit into from
Oct 28, 2025
Merged

sync: from linuxdeepin/dtkwidget #180

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: 1 addition & 0 deletions include/widgets/dstyle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ class DStyle : public QCommonStyle
static void setFrameRadius(QWidget *widget, int radius);
static void setUncheckedItemIndicatorVisible(QWidget *widget, bool visible);
static void setRedPointVisible(QObject *object, bool visible);
static void setLineEditIconMargin(QObject *object, int margin);

static void setShortcutUnderlineVisible(bool visible);
static bool shortcutUnderlineVisible();
Expand Down
19 changes: 19 additions & 0 deletions src/widgets/dstyle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,11 @@ void DStyle::setRedPointVisible(QObject *object, bool visible)
object->setProperty("_d_menu_item_redpoint", visible);
}

void DStyle::setLineEditIconMargin(QObject *object, int margin)
{
object->setProperty("_d_dtk_lineeditIconMargin", margin);
}

void DStyle::setShortcutUnderlineVisible(bool visible)
{
qApp->setProperty("_d_menu_underlineshortcut", visible);
Expand Down Expand Up @@ -2255,6 +2260,20 @@ int DStyle::pixelMetric(QStyle::PixelMetric m, const QStyleOption *opt, const QW
return 16;
case PM_MenuButtonIndicator:
return DSizeModeHelper::element(8, QCommonStyle::pixelMetric(m, opt, widget));
// since Qt 6.3 or applied patch Add-setting-thc-ICON-size-attribute-in-lineedit-to-the-style-plugin.patch( uos or deepin).
case PM_LineEditIconMargin: {
if (widget) {
const QVariant &margin_value = widget->property("_d_dtk_lineeditIconMargin");
if (margin_value.isValid()) {
bool ok = false;
int margin = margin_value.toInt(&ok);
if (ok && margin >= 0) {
return margin;
}
}
}
Q_FALLTHROUGH();
}
case PM_FloatingButtonFrameMargin:
return 3;
default:
Expand Down
Loading