[Pkg-mozext-commits] [firetray] 377/399: remove experimental fade feature for AMO review

David Prévot taffit at alioth.debian.org
Tue Oct 29 18:24:17 UTC 2013


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch dfsg-clean
in repository firetray.

commit 2875aaa7ba7418a255ce456f3463319f978d0a02
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Tue Jun 18 22:48:23 2013 +0200

    remove experimental fade feature for AMO review
---
 src/modules/linux/FiretrayChatStatusIcon.jsm |   89 --------------------------
 1 file changed, 89 deletions(-)

diff --git a/src/modules/linux/FiretrayChatStatusIcon.jsm b/src/modules/linux/FiretrayChatStatusIcon.jsm
index daa0ea1..6881ca6 100644
--- a/src/modules/linux/FiretrayChatStatusIcon.jsm
+++ b/src/modules/linux/FiretrayChatStatusIcon.jsm
@@ -87,95 +87,6 @@ firetray.ChatStatusIcon = {
     gtk.gtk_status_icon_set_from_pixbuf(this.trayIcon, null);
   },
 
-  /**
-   * EXPERIMENTAL fancy blinking.
-   * TODO: how to wait for last fade in to restore themedIconNameCurrent
-   */
-  crossFade: function() {
-
-    /* borrowed from mozmill utils.js*/
-    function sleep(milliseconds) {
-      var timeup = false;
-      function wait() { timeup = true; }
-      let timer = Components.classes["@mozilla.org/timer;1"]
-            .createInstance(Components.interfaces.nsITimer);
-      timer.initWithCallback(wait, milliseconds, Components.interfaces.nsITimer.TYPE_ONE_SHOT);
-
-      var thread = Components.classes["@mozilla.org/thread-manager;1"].
-        getService().currentThread;
-      while(!timeup) {
-        thread.processNextEvent(true);
-      }
-    }
-
-    let icon_theme = gtk.gtk_icon_theme_get_for_screen(gdk.gdk_screen_get_default());
-    firetray.ChatStatusIcon.timers['cross-fade'] = firetray.Utils.timer(
-      500, Ci.nsITimer.TYPE_REPEATING_SLACK, function() {
-
-        // get pixbuf
-        let arry = gobject.gchar.ptr.array()(2);
-        arry[0] = gobject.gchar.array()(firetray.ChatStatusIcon.themedIconNameCurrent);
-        arry[1] = null;
-        log.debug("theme="+icon_theme+", arry="+arry);
-        let icon_info = gtk.gtk_icon_theme_choose_icon(icon_theme, arry, 22, gtk.GTK_ICON_LOOKUP_FORCE_SIZE);
-
-        // create pixbuf
-        let pixbuf = gdk.gdk_pixbuf_copy(gtk.gtk_icon_info_load_icon(icon_info, null));
-        gtk.gtk_icon_info_free(icon_info);   // gobject.g_object_unref(icon_info) in 3.8
-
-        // checks
-        if (gdk.gdk_pixbuf_get_colorspace(pixbuf) != gdk.GDK_COLORSPACE_RGB)
-          log.error("wrong colorspace for pixbuf");
-        if (gdk.gdk_pixbuf_get_bits_per_sample(pixbuf) != 8)
-          log.error("wrong bits_per_sample for pixbuf");
-        if (!gdk.gdk_pixbuf_get_has_alpha(pixbuf))
-          log.error("pixbuf doesn't have alpha");
-        let n_channels = gdk.gdk_pixbuf_get_n_channels(pixbuf);
-        if (n_channels != 4)
-          log.error("wrong nb of channels for pixbuf");
-
-        // init transform
-        let width = gdk.gdk_pixbuf_get_width(pixbuf);
-        let height = gdk.gdk_pixbuf_get_height(pixbuf);
-        log.warn("width="+width+", height="+height);
-        let rowstride = gdk.gdk_pixbuf_get_rowstride(pixbuf);
-        log.warn("rowstride="+rowstride);
-        let length = width*height*n_channels;
-        let pixels = ctypes.cast(gdk.gdk_pixbuf_get_pixels(pixbuf),
-                                 gobject.guchar.array(length).ptr);
-        log.warn("pixels="+pixels);
-
-        // backup alpha for later fade-in
-        let buffer = new ArrayBuffer(width*height);
-        let alpha_bak = new Uint8Array(buffer);
-        for (let i=3; i<length; i+=n_channels)
-          alpha_bak[(i-3)/n_channels] = pixels.contents[i];
-
-        const ALPHA_STEP = 5;
-
-        // fade out
-        for (let a=255; a>0; a-=ALPHA_STEP) {
-          for(let i=3; i<length; i+=n_channels)
-            if (pixels.contents[i]-ALPHA_STEP>0)
-              pixels.contents[i] -= ALPHA_STEP;
-          gtk.gtk_status_icon_set_from_pixbuf(firetray.ChatStatusIcon.trayIcon, pixbuf);
-          sleep(10);
-        }
-
-        // fade in
-        for (let a=255; a>0; a-=ALPHA_STEP) {
-          for(let i=3; i<length; i+=n_channels)
-            if (pixels.contents[i]+ALPHA_STEP<=alpha_bak[(i-3)/n_channels]) {
-              pixels.contents[i] += ALPHA_STEP;
-            }
-          gtk.gtk_status_icon_set_from_pixbuf(firetray.ChatStatusIcon.trayIcon, pixbuf);
-          sleep(10);
-        }
-
-        gobject.g_object_unref(pixbuf);
-      });
-  },
-
   startIconBlinking: function() { // gtk_status_icon_set_blinking() deprecated
     this.on = true;
     firetray.ChatStatusIcon.timers['blink'] = firetray.Utils.timer(

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firetray.git



More information about the Pkg-mozext-commits mailing list