[Pkg-mozext-commits] [firetray] 180/399: minor refactoring: firetray.Window.setVisibility()

[David Prévot]

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

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

commit 2789844b069e55125b93f82ab9651ab52dd77717
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Sun Feb 19 15:36:16 2012 +0100

    minor refactoring: firetray.Window.setVisibility()
---
 src/modules/linux/FiretrayWindow.jsm |   35 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/modules/linux/FiretrayWindow.jsm b/src/modules/linux/FiretrayWindow.jsm
index eca6608..07d29a9 100644
--- a/src/modules/linux/FiretrayWindow.jsm
+++ b/src/modules/linux/FiretrayWindow.jsm
@@ -194,25 +194,21 @@ firetray.Window = {
     // try to restore previous state. TODO: z-order respected ?
     firetray.Window.restorePositionAndSize(xid);
     firetray.Window.restoreStates(xid);
+    // better visual effect if visibility set here instead of before
     firetray.Handler.windows[xid].baseWin.visibility = true; // show
     firetray.Window.restoreDesktop(xid);               // after show
     firetray.Window.activate(xid);
 
-    firetray.Handler.windows[xid].visibility = true;
-    firetray.Handler.visibleWindowsCount += 1;
+    firetray.Window.setVisibility(xid, true);
 
     if (firetray.Handler.popupMenuWindowItemsHandled())
       firetray.PopupMenu.hideSingleWindowItemAndSeparatorMaybe(xid);
     firetray.Handler.showHideIcon();
   },
-
   showSingleStatelessOnce: function(xid) {
     LOG("showSingleStateless");
 
-    firetray.Handler.windows[xid].baseWin.visibility = true; // show
-
-    firetray.Handler.windows[xid].visibility = true;
-    firetray.Handler.visibleWindowsCount += 1;
+    firetray.Window.setVisibility(xid, true);
 
     if (firetray.Handler.popupMenuWindowItemsHandled())
       firetray.PopupMenu.hideSingleWindowItemAndSeparatorMaybe(xid);
@@ -231,28 +227,21 @@ firetray.Window = {
     firetray.Window.saveStates(xid);
     firetray.Window.saveDesktop(xid);
 
-    firetray.Handler.windows[xid].baseWin.visibility = false; // hide
-
-    firetray.Handler.windows[xid].visibility = false;
-    firetray.Handler.visibleWindowsCount -= 1;
+    firetray.Window.setVisibility(xid, false);
 
     if (firetray.Handler.popupMenuWindowItemsHandled())
       firetray.PopupMenu.showSingleWindowItem(xid);
     firetray.Handler.showHideIcon();
   },
-
   /**
-   * hides without saving window states (position, size, ...) This is needed when
-   * application starts hidden: as windows are not realized, their state is not
-   * accurate.
+   * hides without saving window states (position, size, ...) This is needed
+   * when application starts hidden: as windows are not realized, their state
+   * is not accurate.
    */
   hideSingleStatelessOnce: function(xid) {
     LOG("hideSingleStateless");
 
-    firetray.Handler.windows[xid].baseWin.visibility = false; // hide
-
-    firetray.Handler.windows[xid].visibility = false;
-    firetray.Handler.visibleWindowsCount -= 1;
+    firetray.Window.setVisibility(xid, false);
 
     if (firetray.Handler.popupMenuWindowItemsHandled())
       firetray.PopupMenu.showSingleWindowItem(xid);
@@ -327,6 +316,14 @@ firetray.Window = {
     delete firetray.Handler.windows[xid].savedDesktop;
   },
 
+  setVisibility: function(xid, visibility) {
+    firetray.Handler.windows[xid].baseWin.visibility = visibility;
+    firetray.Handler.windows[xid].visibility = visibility;
+    firetray.Handler.visibleWindowsCount = visibility ?
+      firetray.Handler.visibleWindowsCount + 1 :
+      firetray.Handler.visibleWindowsCount - 1 ;
+  },
+
   xSendClientMessgeEvent: function(xid, atom, data, dataSize) {
     let xev = new x11.XClientMessageEvent;
     xev.type = x11.ClientMessage;

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