Merge branch 'stable-1.2' into master

This commit is contained in:
Lukas W
2020-06-01 15:19:20 +02:00
18 changed files with 121 additions and 58 deletions

View File

@@ -622,6 +622,8 @@ TrackContentObjectView {
qproperty-textBackgroundColor: rgba(0, 0, 0, 75);
qproperty-textShadowColor: rgb( 0, 0, 0 );
qproperty-gradient: true; /* boolean property, set true to have a gradient */
/* finger tip offset of cursor */
qproperty-mouseHotspotHand: 3px 3px;
font-size: 11px;
}

View File

@@ -660,6 +660,8 @@ TrackContentObjectView {
qproperty-textBackgroundColor: rgba(0, 0, 0, 75);
qproperty-textShadowColor: rgba(0,0,0,200);
qproperty-gradient: false; /* boolean property, set true to have a gradient */
/* finger tip offset of cursor */
qproperty-mouseHotspotHand: 7px 2px;
font-size: 11px;
}