Icon indicators everywhere

Makefile

@@ -12,6 +12,7 @@ EXTRA_MODULES = \
                 dash.js \
                 docking.js \
                 appIcons.js \
+				appIconsDecorator.js \
                 appIconIndicators.js \
                 fileManager1API.js \
                 imports.js \
@@ -36,7 +37,9 @@ EXTRA_MEDIA = logo.svg \
               $(NULL)
 
 TOLOCALIZE =  prefs.js \
+			  docking.js \
               appIcons.js \
+              appIconsDecorator.js \
               locations.js \
               $(NULL)
 

_stylesheet.scss

@@ -217,15 +217,17 @@ $dock_style_modes: [null, shrink, extended, extended-shrink];
                     };
                 }
 
-                .app-well-app {
+                .app-well-app,
+                .overview-tile {
                     &.running .overview-icon {
                         background-image: none;
                     }
                     &.focused .overview-icon {
                         background-color: $remark_color;
                     }
 
-                    .app-well-app-running-dot {
+                    .app-well-app-running-dot,
+                    .app-grid-running-dot {
                         margin-bottom: 2px;
                     }
                 }
@@ -362,7 +364,9 @@ $dock_style_modes: [null, shrink, extended, extended-shrink];
     background: $dash_background_color;
 }
 
-#dashtodockContainer.dashtodock .progress-bar {
+#dashtodockContainer.dashtodock .progress-bar,
+.overview-tile .progress-bar,
+.icon-grid .progress-bar {
     /* Customization of the progress bar style. The possible elements
      * are:
      *
@@ -407,13 +411,23 @@ $dock_style_modes: [null, shrink, extended, extended-shrink];
      *   -progress-bar-background: 204, 204, 204, 1.0
      *   -progress-bar-border: 230, 230, 230, 1.0
      *   -progress-bar-line-width: 1
+     *   -progress-bar-top-offset: undefined
+     *   -progress-bar-valign: 1.0
      */
     -progress-bar-track-background: rgba(0, 0, 0, 0.45);
     -progress-bar-track-border: rgba(0, 0, 0, 0.7);
     -progress-bar-background: rgba(255, 255, 255, 1.0);
     -progress-bar-border: rgba(255, 255, 255, 1.0);
 }
 
+#overview,
+.apps-scroll-view {
+    .progress-bar {
+        -progress-bar-top-offset: 0;
+        -progress-bar-valign: 0.8;
+    }
+}
+
 #dashtodockContainer.top #dash .placeholder,
 #dashtodockContainer.bottom #dash .placeholder {
     width: 32px;
@@ -440,13 +454,17 @@ $dock_style_modes: [null, shrink, extended, extended-shrink];
     transition-duration: 500ms;
 }
 
-#dashtodockContainer .number-overlay {
+#dashtodockContainer .number-overlay,
+.overview-tile .number-overlay,
+.icon-grid .number-overlay {
     color: rgba(255, 255, 255, 1);
     background-color: rgba(0, 0, 0, 0.8);
     text-align: center;
 }
 
-#dashtodockContainer .notification-badge {
+#dashtodockContainer .notification-badge,
+.overview-tile .notification-badge,
+.icon-grid .notification-badge {
     color: rgba(255, 255, 255, 1);
     background-color: rgba(255, 0, 0, 1);
     padding: 0.2em 0.5em;

appIconIndicators.js

@@ -676,7 +676,7 @@ class RunningIndicatorBinary extends RunningIndicatorDots {
 /*
  * Unity like notification and progress indicators
  */
-class UnityIndicator extends IndicatorBase {
+export class UnityIndicator extends IndicatorBase {
     static defaultProgressBar = {
         // default values for the progress bar itself
         background: {
@@ -755,7 +755,17 @@ class UnityIndicator extends IndicatorBase {
             this._source._iconContainer,
             'notify::size',
             this.updateNotificationBadgeStyle.bind(this),
+        ], [
+            this._source,
+            'style-changed',
+            () => this._updateIconStyle(),
         ]);
+
+        this._updateNotificationsCount();
+        this.setProgress(this._remoteEntry.progress_visible
+            ? this._remoteEntry.progress : -1);
+        this.setUrgent(this._remoteEntry.urgent);
+        this.setUpdating(this._remoteEntry.updating);
     }
 
     destroy() {
@@ -943,20 +953,30 @@ class UnityIndicator extends IndicatorBase {
         const {scaleFactor} = St.ThemeContext.get_for_stage(global.stage);
         const [surfaceWidth, surfaceHeight] = area.get_surface_size();
         const cr = area.get_context();
-
+        const node = this._progressOverlayArea.get_theme_node();
         const iconSize = this._source.icon.iconSize * scaleFactor;
 
         let x = Math.floor((surfaceWidth - iconSize) / 2);
         let y = Math.floor((surfaceHeight - iconSize) / 2);
 
+        const [hasTopOffset, topOffset] = node.lookup_double(
+            '-progress-bar-top-offset', false);
+        if (hasTopOffset)
+            y = topOffset;
+
         const baseLineWidth = Math.floor(Number(scaleFactor));
         const padding = Math.floor(iconSize * 0.05);
         let width = iconSize - 2.0 * padding;
         let height = Math.floor(Math.min(18.0 * scaleFactor, 0.20 * iconSize));
         x += padding;
-        y += iconSize - height - padding;
 
-        const node = this._progressOverlayArea.get_theme_node();
+        const valignParameters = node.lookup_double(
+            '-progress-bar-valign', false);
+        const [hasValign] = valignParameters;
+        let [, valign] = valignParameters;
+        if (!hasValign)
+            valign = 1.0;
+        y += (iconSize - height - padding) * valign;
 
         const progressBarTrack = this._readElementData(node,
             '-progress-bar-track',
@@ -1027,6 +1047,16 @@ class UnityIndicator extends IndicatorBase {
     setUpdating(updating) {
         this._source.updating = updating;
     }
+
+    _updateIconStyle() {
+        const opacityLookup =
+            this._source.get_theme_node().lookup_double('opacity', true);
+        const [hasOpacity] = opacityLookup;
+        let [, opacity] = opacityLookup;
+        if (!hasOpacity)
+            opacity = this._source.updating ? 0.5 : 1;
+        this._source.icon.set_opacity(255 * opacity);
+    }
 }