alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use PlasmaCore.ColorScope in needed places

Browse Source 
standard controls should work better in inverted color scopes

Change-Id: I3d10a195cb0ae0b2f2fbbcca21fc6f87f99e7cfc
This commit is contained in:
Marco Martin 2015-05-28 12:51:30 +02:00
parent eca200f67e
commit a2e223c1ad
5 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/declarativeimports/plasmastyle/GroupBoxStyle.qml
View File

@ -58,6 +58,7 @@ Style {
imagePath: "widgets/frame" imagePath: "widgets/frame"
prefix: "plain" prefix: "plain"
visible: !control.flat visible: !control.flat
colorGroup: PlasmaCore.ColorScope.colorGroup
Component.onCompleted: { Component.onCompleted: {
styleRoot.padding.left = frame.margins.left styleRoot.padding.left = frame.margins.left
styleRoot.padding.top = frame.margins.top + label.height styleRoot.padding.top = frame.margins.top + label.height

1
src/declarativeimports/plasmastyle/MenuBarStyle.qml
View File

@ -43,6 +43,7 @@ QtQuickControlStyle.MenuBarStyle {
implicitWidth: text.implicitWidth + units.smallSpacing * 3 implicitWidth: text.implicitWidth + units.smallSpacing * 3
implicitHeight: text.implicitHeight + units.smallSpacing * 2 implicitHeight: text.implicitHeight + units.smallSpacing * 2
enabled: styleData.enabled enabled: styleData.enabled
colorGroup: PlasmaCore.ColorScope.colorGroup
Accessible.role: Accessible.MenuItem Accessible.role: Accessible.MenuItem
Accessible.name: plainText Accessible.name: plainText

3
src/declarativeimports/plasmastyle/ScrollViewStyle.qml
View File

@ -35,6 +35,7 @@ QtQuickControlStyle.ScrollViewStyle {
PlasmaCore.Svg { PlasmaCore.Svg {
id: borderSvg id: borderSvg
imagePath: "widgets/scrollwidget" imagePath: "widgets/scrollwidget"
colorGroup: PlasmaCore.ColorScope.colorGroup
} }
PlasmaCore.SvgItem { PlasmaCore.SvgItem {
@ -121,12 +122,14 @@ QtQuickControlStyle.ScrollViewStyle {
imagePath:"widgets/scrollbar" imagePath:"widgets/scrollbar"
prefix: styleData.horizontal ? "background-horizontal" : "background-vertical" prefix: styleData.horizontal ? "background-horizontal" : "background-vertical"
implicitWidth: widthHint implicitWidth: widthHint
colorGroup: PlasmaCore.ColorScope.colorGroup
} }
handle: PlasmaCore.FrameSvgItem { handle: PlasmaCore.FrameSvgItem {
imagePath:"widgets/scrollbar" imagePath:"widgets/scrollbar"
implicitWidth: widthHint implicitWidth: widthHint
implicitHeight: widthHint implicitHeight: widthHint
colorGroup: PlasmaCore.ColorScope.colorGroup
prefix: { prefix: {
if (styleData.hovered) { if (styleData.hovered) {

1
src/declarativeimports/plasmastyle/TabViewStyle.qml
View File

@ -50,6 +50,7 @@ QtQuickControlStyle.TabViewStyle {
opacity: styleData.selected ? 1 : (styleData.hovered ? 0.4 : 0) opacity: styleData.selected ? 1 : (styleData.hovered ? 0.4 : 0)
imagePath: "widgets/tabbar" imagePath: "widgets/tabbar"
prefix: control.tabPosition === Qt.TopEdge ? "north-active-tab" : "south-active-tab" prefix: control.tabPosition === Qt.TopEdge ? "north-active-tab" : "south-active-tab"
colorGroup: PlasmaCore.ColorScope.colorGroup
Behavior on opacity { Behavior on opacity {
PropertyAnimation { PropertyAnimation {
duration: units.longDuration duration: units.longDuration

1
src/declarativeimports/plasmastyle/ToolBarStyle.qml
View File

@ -28,5 +28,6 @@ QtQuickControlStyle.ToolBarStyle {
background: PlasmaCore.FrameSvgItem { background: PlasmaCore.FrameSvgItem {
imagePath: "widgets/toolbar" imagePath: "widgets/toolbar"
colorGroup: PlasmaCore.ColorScope.colorGroup
} }
} }