diff --git a/src/qml/common/InformationTable.qml b/src/qml/common/InformationTable.qml --- a/src/qml/common/InformationTable.qml +++ b/src/qml/common/InformationTable.qml @@ -25,6 +25,11 @@ property alias model: repeator.model id: root height: childrenRect.height + + SystemPalette { + id: activePalette + colorGroup: SystemPalette.Active + } Column { id: column @@ -58,6 +63,7 @@ text: model.modelData.text wrapMode: Text.Wrap height: Math.max(paintedHeight, titleLabel.paintedHeight) + color: activePalette.text } } } diff --git a/src/qml/common/LearningProgressChart.qml b/src/qml/common/LearningProgressChart.qml --- a/src/qml/common/LearningProgressChart.qml +++ b/src/qml/common/LearningProgressChart.qml @@ -107,7 +107,7 @@ text: learningProgressPointTooltip.row !== -1? learningProgressModel.charactersPerMinute(learningProgressPointTooltip.row): "" } ] - width: 250 + width: 450 model: infoModel } } diff --git a/src/qml/homescreen/ProfileDetailsItem.qml b/src/qml/homescreen/ProfileDetailsItem.qml --- a/src/qml/homescreen/ProfileDetailsItem.qml +++ b/src/qml/homescreen/ProfileDetailsItem.qml @@ -100,7 +100,8 @@ anchors.horizontalCenter: parent.horizontalCenter width: parent.width height: parent.height - legend.height - parent.spacing - + backgroundColor: colorScheme.normalBackground + textColor: activePalette.text model: learningProgressModel } diff --git a/src/qml/homescreen/StatPopupDialog.qml b/src/qml/homescreen/StatPopupDialog.qml --- a/src/qml/homescreen/StatPopupDialog.qml +++ b/src/qml/homescreen/StatPopupDialog.qml @@ -42,6 +42,11 @@ width: parent.width - leftMargin - rightMargin height: parent.height - topMargin - bottomMargin padding: 0 + + SystemPalette { + id: activePalette + colorGroup: SystemPalette.Active + } contentItem: Rectangle { @@ -63,6 +68,7 @@ Layout.fillHeight: true Layout.fillWidth: true backgroundColor: colorScheme.normalBackground + textColor: activePalette.text model: LearningProgressModel { id: learningProgressModel } @@ -74,10 +80,12 @@ Charts.LegendItem { id: accuracyLegend dimension: learningProgressChart.accuracy + textColor: activePalette.text } Charts.LegendItem { id: charactersPerMinuteLegend dimension: learningProgressChart.charactersPerMinute + textColor: activePalette.text } } } diff --git a/src/qml/scorescreen/ScoreScreen.qml b/src/qml/scorescreen/ScoreScreen.qml --- a/src/qml/scorescreen/ScoreScreen.qml +++ b/src/qml/scorescreen/ScoreScreen.qml @@ -106,7 +106,11 @@ colorGroup: KColorScheme.Active colorSet: KColorScheme.View } - + + SystemPalette { + id: activePalette + colorGroup: SystemPalette.Active + } LearningProgressModel { @@ -335,7 +339,7 @@ Charts.LegendItem { id: accuracyLegend - textColor: colorScheme.normalText + textColor: activePalette.text Layout.alignment: Qt.AlignVCenter opacity: tabGroup.currentItem === learningProgressTab? 1: 0 Behavior on opacity { @@ -344,7 +348,7 @@ } Charts.LegendItem { id: charactersPerMinuteLegend - textColor: colorScheme.normalText + textColor: activePalette.text Layout.alignment: Qt.AlignVCenter opacity: tabGroup.currentItem === learningProgressTab? 1: 0 Behavior on opacity { @@ -371,6 +375,7 @@ property string iconName: "office-chart-area" model: learningProgressModel backgroundColor: colorScheme.normalBackground + textColor: activePalette.text Component.onCompleted: { accuracyLegend.dimension = learningProgressTab.accuracy