diff options
| author | Jens Bache-Wiig <jens.bache-wiig@digia.com> | 2012-11-15 17:04:18 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-15 18:15:50 +0100 |
| commit | 48f3128a7d97ca8961d5c7017c0b19ca1e735157 (patch) | |
| tree | b716c2ba153f9c8f975ac3fc651432dabdaf34e9 /src | |
| parent | e9b6eb7795f5f87b705af0cae855c46c5c135297 (diff) | |
Add feature to enable rounded line edit on mac
This will not currently be exposed in the widget API but we
can make use of it for qt quick components.
Change-Id: I08300a3bcd58e68df633fe9b36a988eb6176ef9c
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/widgets/styles/qmacstyle_mac.mm | 3 | ||||
| -rw-r--r-- | src/widgets/styles/qstyleoption.h | 3 | ||||
| -rw-r--r-- | src/widgets/widgets/qlineedit.cpp | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/widgets/styles/qmacstyle_mac.mm b/src/widgets/styles/qmacstyle_mac.mm index b4c115583b..baeda89642 100644 --- a/src/widgets/styles/qmacstyle_mac.mm +++ b/src/widgets/styles/qmacstyle_mac.mm @@ -3118,7 +3118,8 @@ void QMacStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPai fdi.state = tds; SInt32 frame_size; if (pe == PE_FrameLineEdit) { - fdi.kind = kHIThemeFrameTextFieldSquare; + fdi.kind = frame->features & QStyleOptionFrame::Rounded ? kHIThemeFrameTextFieldRound : + kHIThemeFrameTextFieldSquare; GetThemeMetric(kThemeMetricEditTextFrameOutset, &frame_size); if ((frame->state & State_ReadOnly) || !(frame->state & State_Enabled)) fdi.state = kThemeStateInactive; diff --git a/src/widgets/styles/qstyleoption.h b/src/widgets/styles/qstyleoption.h index 2625bf7256..b4641f36bb 100644 --- a/src/widgets/styles/qstyleoption.h +++ b/src/widgets/styles/qstyleoption.h @@ -125,7 +125,8 @@ public: int midLineWidth; enum FrameFeature { None = 0x00, - Flat = 0x01 + Flat = 0x01, + Rounded = 0x02 }; Q_DECLARE_FLAGS(FrameFeatures, FrameFeature) FrameFeatures features; diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp index a06c8ed54c..f4539e8e4a 100644 --- a/src/widgets/widgets/qlineedit.cpp +++ b/src/widgets/widgets/qlineedit.cpp @@ -120,8 +120,7 @@ void QLineEdit::initStyleOption(QStyleOptionFrame *option) const if (hasEditFocus()) option->state |= QStyle::State_HasEditFocus; #endif - if (QStyleOptionFrameV2 *optionV2 = qstyleoption_cast<QStyleOptionFrameV2 *>(option)) - optionV2->features = QStyleOptionFrameV2::None; + option->features = QStyleOptionFrame::None; } /*! |