diff options
| -rw-r--r-- | src/widgets/widgets/qlineedit_p.cpp | 22 | ||||
| -rw-r--r-- | src/widgets/widgets/qlineedit_p.h | 21 |
2 files changed, 22 insertions, 21 deletions
diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp index 5afedf68235..59d8d798616 100644 --- a/src/widgets/widgets/qlineedit_p.cpp +++ b/src/widgets/widgets/qlineedit_p.cpp @@ -523,6 +523,28 @@ void QLineEditPrivate::removeAction(QAction *action) q->update(); } +static bool isSideWidgetVisible(const QLineEditPrivate::SideWidgetEntry &e) +{ + return e.widget->isVisible(); +} + +int QLineEditPrivate::effectiveLeftTextMargin() const +{ + const auto &list = leftSideWidgetList(); + return leftTextMargin + (QLineEditIconButton::IconMargin + iconSize().width()) + * int(std::count_if(list.begin(), list.end(), + isSideWidgetVisible)); +} + +int QLineEditPrivate::effectiveRightTextMargin() const +{ + const auto &list = rightSideWidgetList(); + return rightTextMargin + (QLineEditIconButton::IconMargin + iconSize().width()) + * int(std::count_if(list.begin(), list.end(), + isSideWidgetVisible)); +} + + QT_END_NAMESPACE #endif diff --git a/src/widgets/widgets/qlineedit_p.h b/src/widgets/widgets/qlineedit_p.h index 198f301e735..b2f8e537e40 100644 --- a/src/widgets/widgets/qlineedit_p.h +++ b/src/widgets/widgets/qlineedit_p.h @@ -231,27 +231,6 @@ private: }; Q_DECLARE_TYPEINFO(QLineEditPrivate::SideWidgetEntry, Q_PRIMITIVE_TYPE); -static bool isSideWidgetVisible(const QLineEditPrivate::SideWidgetEntry &e) -{ - return e.widget->isVisible(); -} - -inline int QLineEditPrivate::effectiveLeftTextMargin() const -{ - const auto &list = leftSideWidgetList(); - return leftTextMargin + (QLineEditIconButton::IconMargin + iconSize().width()) - * int(std::count_if(list.begin(), list.end(), - isSideWidgetVisible)); -} - -inline int QLineEditPrivate::effectiveRightTextMargin() const -{ - const auto &list = rightSideWidgetList(); - return rightTextMargin + (QLineEditIconButton::IconMargin + iconSize().width()) - * int(std::count_if(list.begin(), list.end(), - isSideWidgetVisible)); -} - #endif // QT_NO_LINEEDIT QT_END_NAMESPACE |
