diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2018-11-08 16:28:41 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-11-12 07:19:04 +0000 |
commit | a58c709598971d162ede34c7e506c713c4421235 (patch) | |
tree | b48ca43c678f1336e9a1234b7c664a6be3fab593 | |
parent | eb9005cc872e8465eb265c04969ad6284b77fb3f (diff) |
Fix combobox selection area
Extend the touch area to cover whole compobox width. Also with
QTBUG-49224 now fixed, previous workaround can be removed.
Change-Id: Iabf784ec91fac839da19a3615a6977a99e532a40
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
-rw-r--r-- | src/settingsui/timedate/ManualTime.qml | 20 | ||||
-rw-r--r-- | src/settingsui/timedate/TimeDate.qml | 3 |
2 files changed, 11 insertions, 12 deletions
diff --git a/src/settingsui/timedate/ManualTime.qml b/src/settingsui/timedate/ManualTime.qml index 1438565..87e0f7e 100644 --- a/src/settingsui/timedate/ManualTime.qml +++ b/src/settingsui/timedate/ManualTime.qml @@ -69,8 +69,8 @@ Item { delegate: ItemDelegate { id: dayDelegate height: dayBox.height - // QTBUG-49224: contentItem: Item {} - Text { + width: dayBox.width + contentItem: Text { anchors.left: dayDelegate.left anchors.leftMargin: pluginMain.margin text: modelData + 1 @@ -97,8 +97,8 @@ Item { delegate: ItemDelegate { id: monthDelegate height: monthBox.height - // QTBUG-49224: contentItem: Item {} - Text { + width: monthBox.width + contentItem: Text { anchors.left: monthDelegate.left anchors.leftMargin: pluginMain.margin color: monthBox.currentIndex == index ? viewSettings.buttonGreenColor : "white" @@ -128,8 +128,8 @@ Item { delegate: ItemDelegate { id: yearDelegate height: yearBox.height - // QTBUG-49224: contentItem: Item {} - Text { + width: yearBox.width + contentItem: Text { anchors.left: yearDelegate.left anchors.leftMargin: pluginMain.margin text: index + firstYear @@ -170,8 +170,8 @@ Item { delegate: ItemDelegate { id: hourDelegate height: hourBox.height - // QTBUG-49224: contentItem: Item {} - Text { + width: hourBox.width + contentItem: Text { anchors.left: hourDelegate.left anchors.leftMargin: pluginMain.margin text: zeroPadTime(parseInt(modelData)) @@ -198,8 +198,8 @@ Item { delegate: ItemDelegate { id: minuteDelegate height: minuteBox.height - // QTBUG-49224: contentItem: Item {} - Text { + width: minuteBox.width + contentItem: Text { anchors.left: minuteDelegate.left anchors.leftMargin: pluginMain.margin text: zeroPadTime(parseInt(modelData)) diff --git a/src/settingsui/timedate/TimeDate.qml b/src/settingsui/timedate/TimeDate.qml index 8e618c1..c27f431 100644 --- a/src/settingsui/timedate/TimeDate.qml +++ b/src/settingsui/timedate/TimeDate.qml @@ -118,8 +118,7 @@ Item { id: timeZoneDelegate height: timeZoneBox.height width: timeZoneBox.width - // QTBUG-49224: contentItem: Item {} - Text { + contentItem: Text { anchors.left: timeZoneDelegate.left anchors.leftMargin: pluginMain.margin text: modelData["id"] |