Index: sources/gui/qml/dialogs/AlarmListDialog.qml =================================================================== diff -u -r21041955990385205ec1aca17ef51fc1fd9a4b29 -r5d784780bbec88cd8531bb56fbcc6e6fe2703236 --- sources/gui/qml/dialogs/AlarmListDialog.qml (.../AlarmListDialog.qml) (revision 21041955990385205ec1aca17ef51fc1fd9a4b29) +++ sources/gui/qml/dialogs/AlarmListDialog.qml (.../AlarmListDialog.qml) (revision 5d784780bbec88cd8531bb56fbcc6e6fe2703236) @@ -126,41 +126,33 @@ } } - Flickable { id : _flickable - visible : vAlarmActiveList.adjustment_Accepted + TouchGrid { id: _alarmGrid anchors { top : _content.top topMargin : Variables.minVGap bottom : _root.bottom bottomMargin : Variables.mainMenuHeight + Variables.minVGap horizontalCenter: parent.horizontalCenter } + visible : vAlarmActiveList.adjustment_Accepted + + alignCenter : false width : _content.width - Variables.minVGap * 2 // * 2 : for each side height : _content.height - Variables.minVGap * 2 - _titleBar.height // * 2 : for each side - contentWidth : _content.width - Variables.minVGap * 2 - contentHeight : _alarmGrid.height - boundsBehavior : Flickable.StopAtBounds - interactive : false - - TouchGrid { id: _alarmGrid - alignCenter : false - height : rowCount * ( rowSpacing + itemHeight ) - width : parent.width - colCount : 1 - rowCount : vAlarmActiveList.alarmIDs.length - itemHeight : 75 - itemWidth : _content.width - Variables.minVGap * (2 + 1) // * 2 : for each side & the +1 to not cover the scrollbar - rowSpacing : 0 - colSpacing : 0 - lineColor : Colors.alarmDialogText - textColor : Colors.alarmDialogText - itemsText : vAlarmActiveList.alarmIDs - itemsValue : vAlarmActiveList.alarmTexts - itemsTouchable : [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ] - itemsValueLeftMargin : 80 // if decreased maybe covered by title - itemsUnitLeftMargin : 470 // if increased will be covered by chevron if touchable - onItemClicked : _root.itemClicked(vIndex) - } + colCount : 1 + rowCount : vAlarmActiveList.alarmIDs.length + itemHeight : 75 + itemWidth : _content.width - Variables.minVGap * (2 + 1) // * 2 : for each side & the +1 to not cover the scrollbar + rowSpacing : 0 + colSpacing : 0 + lineColor : Colors.alarmDialogText + textColor : Colors.alarmDialogText + itemsText : vAlarmActiveList.alarmIDs + itemsValue : vAlarmActiveList.alarmTexts + itemsTouchable : [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ] + itemsValueLeftMargin : 80 // if decreased maybe covered by title + itemsUnitLeftMargin : 470 // if increased will be covered by chevron if touchable + onItemClicked : _root.itemClicked(vIndex) } } }