Index: sources/gui/qml/dialogs/AlarmListDialog.qml =================================================================== diff -u -r20b286ab574a6b8ad25a51aeb3477506f7dafc5d -r2721daffd0af06accf99ed7c9a1b5a7035f8634f --- sources/gui/qml/dialogs/AlarmListDialog.qml (.../AlarmListDialog.qml) (revision 20b286ab574a6b8ad25a51aeb3477506f7dafc5d) +++ sources/gui/qml/dialogs/AlarmListDialog.qml (.../AlarmListDialog.qml) (revision 2721daffd0af06accf99ed7c9a1b5a7035f8634f) @@ -110,13 +110,13 @@ } ScrollBar { - visible : vAlarmActiveList.adjustment_Accepted + visible : vAlarmActiveList.adjustment_Accepted && ( flickable.height < flickable.contentHeight ) anchors.fill: _flickable flickable : _flickable backColor : Colors.backgroundDialog } - Flickable { id: _flickable + Flickable { id : _flickable clip : true visible : vAlarmActiveList.adjustment_Accepted anchors { @@ -126,8 +126,8 @@ bottomMargin : Variables.mainMenuHeight + Variables.minVGap horizontalCenter: parent.horizontalCenter } - width : Variables.dialogWidth - Variables.minVGap2 * 2 // * 2 : for each side - height : Variables.dialogHeight - _titleBar.height - Variables.minVGap * 2 // * 2 : for each side + width : Variables.dialogWidth - Variables.minVGap2 * 2 // * 2 : for each side + height : Variables.dialogHeight - Variables.minVGap * 2 - _titleBar.height // * 2 : for each side contentWidth : width contentHeight: _alarmGrid.height @@ -136,7 +136,7 @@ height : rowCount * ( rowSpacing + itemHeight ) width : parent.width colCount : 1 - rowCount : 10 + rowCount : vAlarmActiveList.alarmIDs.length itemHeight : 80 itemWidth : Variables.dialogWidth - Variables.minVGap2 * (2 + 1) // * 2 : for each side & + 1 to not cover the scrollbar rowSpacing : 0