fix some coloring for different window states

pull/1/head
Michail Vourlakos 8 years ago
parent 6042e09703
commit bed027e6e5

@ -36,11 +36,11 @@ Item{
property color attentionColor: colorScopePalette.negativeTextColor // "#ffff1717" property color attentionColor: colorScopePalette.negativeTextColor // "#ffff1717"
property color basicColor: "blue" property color basicColor: "blue"
onShowAttentionChanged: { /*onShowAttentionChanged: {
if(showAttention == false){ if(!showAttention){
smallCircle.color = basicColor; smallCircle.color = basicColor;
} }
} }*/
Item{ Item{
id:mainGlow id:mainGlow
@ -54,10 +54,10 @@ Item{
color: glowItem.basicColor color: glowItem.basicColor
radius: glowItem.roundCorners ? Math.min(width,height) / 2 : 0 radius: glowItem.roundCorners ? Math.min(width,height) / 2 : 0
SequentialAnimation{ SequentialAnimation{
running: (glowItem.showAttention == true) running: glowItem.showAttention
loops: Animation.Infinite loops: Animation.Infinite
alwaysRunToEnd: true
PropertyAnimation { PropertyAnimation {
target: smallCircle target: smallCircle

@ -62,11 +62,11 @@ Item{
id:firstPoint id:firstPoint
visible: ( !IsLauncher ) ? true: false visible: ( !IsLauncher ) ? true: false
basicColor: (mainItemContainer.hasActive) ? basicColor: IsActive===true || (mainItemContainer.isGroupParent && mainItemContainer.hasShown)?
glowFrame.isActiveColor : glowFrame.notActiveColor glowFrame.isActiveColor : glowFrame.notActiveColor
roundCorners: true roundCorners: true
showAttention: model.IsDemandingAttention && plasmoid.status === PlasmaCore.Types.RequiresAttentionStatus? true : false showAttention: model.IsDemandingAttention && plasmoid.status === PlasmaCore.Types.RequiresAttentionStatus ? true : false
opacity: (!mainItemContainer.hasActive && root.showPreviews opacity: (!mainItemContainer.hasActive && root.showPreviews
&& windowsPreviewDlg.activeItem && (windowsPreviewDlg.activeItem === mainItemContainer)) ? 0.4 : 1 && windowsPreviewDlg.activeItem && (windowsPreviewDlg.activeItem === mainItemContainer)) ? 0.4 : 1
@ -160,7 +160,7 @@ Item{
width: visible ? glowFrame.size : 0 width: visible ? glowFrame.size : 0
height: width height: width
basicColor: mainItemContainer.hasActive ? state2Color : state1Color basicColor: state2Color //mainItemContainer.hasActive ? state2Color : state1Color
roundCorners: true roundCorners: true
visible: ( mainItemContainer.isGroupParent && root.dotsOnActive ) visible: ( mainItemContainer.isGroupParent && root.dotsOnActive )
|| (mainItemContainer.isGroupParent && !mainItemContainer.hasActive)? true: false || (mainItemContainer.isGroupParent && !mainItemContainer.hasActive)? true: false

@ -72,13 +72,14 @@ Item{
checkInternalStates(); checkInternalStates();
} }
else{ else{
if(mainItemContainer.isActive)
hasActive = true;
if(mainItemContainer.isMinimized){ if(mainItemContainer.isMinimized){
hasMinimized = true; hasMinimized = true;
} } else {
else if(mainItemContainer.isActive)
hasActive = true;
else
hasShown = true; hasShown = true;
}
} }
} }
@ -89,10 +90,11 @@ Item{
for(var i=0; i<childs.count; ++i){ for(var i=0; i<childs.count; ++i){
var kid = childs.get(i); var kid = childs.get(i);
if (kid.model.IsActive)
hasActive = true;
if(kid.model.IsMinimized) if(kid.model.IsMinimized)
hasMinimized = true; hasMinimized = true;
else if (kid.model.IsActive)
hasActive = true;
else else
hasShown = true; hasShown = true;
} }

Loading…
Cancel
Save