diff options
| author | Mitch Curtis <mitch.curtis@digia.com> | 2014-02-03 15:37:44 +0100 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@digia.com> | 2014-02-03 15:38:58 +0100 |
| commit | 7980cd04fc68a1b6b0cc57181ed9d4f7fd63d3c8 (patch) | |
| tree | e2e7e6014752f08a6807f814cb2dea18e8583cf9 | |
| parent | 9e9c84a67c543a887289a02f00e32451d72b45bc (diff) | |
| download | qtquickcontrols-7980cd04fc68a1b6b0cc57181ed9d4f7fd63d3c8.tar.gz | |
Fix MouseArea in delegates.
9e9c84a67c543a887289a02f00e32451d72b45bc broke it after a bad
merge conflict resolution.
Change-Id: Icb068ec8299aeb1fe4b118fade9c74266aac9b20
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
| -rw-r--r-- | src/controls/Styles/Base/CalendarStyle.qml | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/controls/Styles/Base/CalendarStyle.qml b/src/controls/Styles/Base/CalendarStyle.qml index 220e5161..fc621db9 100644 --- a/src/controls/Styles/Base/CalendarStyle.qml +++ b/src/controls/Styles/Base/CalendarStyle.qml @@ -446,21 +446,21 @@ Style { if (control.isValidDate(date)) { control.selectedDate = date; } + } - onClicked: { - setDateIfValid(date) - } + onClicked: { + setDateIfValid(date) + } - onDoubleClicked: { - if (date.getTime() === control.selectedDate.getTime()) { - // Only accept double clicks if the first click does not - // change the month displayed. This is because double- - // clicking on a date in the next month will first cause - // a single click which will change the month and the - // the release will be triggered on the same index but a - // different date (the date in the next month). - control.doubleClicked(date); - } + onDoubleClicked: { + if (date.getTime() === control.selectedDate.getTime()) { + // Only accept double clicks if the first click does not + // change the month displayed. This is because double- + // clicking on a date in the next month will first cause + // a single click which will change the month and the + // the release will be triggered on the same index but a + // different date (the date in the next month). + control.doubleClicked(date); } } } |