[Thaw-dev] r13744 - in trunk/apps/Thaw/src/thaw: core plugins

[jfle...@freenetproject.org]

Author: jflesch
Date: 2007-06-23 23:23:28 +0000 (Sat, 23 Jun 2007)
New Revision: 13744

Modified:
   trunk/apps/Thaw/src/thaw/core/MainWindow.java
   trunk/apps/Thaw/src/thaw/plugins/TrayIcon.java
Log:
Just to simplify a little bit the code used to 'reduce' the main window to the 
systray

Modified: trunk/apps/Thaw/src/thaw/core/MainWindow.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/MainWindow.java       2007-06-23 22:53:59 UTC 
(rev 13743)
+++ trunk/apps/Thaw/src/thaw/core/MainWindow.java       2007-06-23 23:23:28 UTC 
(rev 13744)
@@ -236,11 +236,19 @@
        }

        public void setIconified() {
-               mainWindow.setExtendedState(JFrame.ICONIFIED);
+               int state = mainWindow.getExtendedState();
+
+               state |= JFrame.ICONIFIED;
+
+               mainWindow.setExtendedState(state);
        }

        public void setNonIconified() {
-               mainWindow.setExtendedState(JFrame.NORMAL);
+               int state = mainWindow.getExtendedState();
+
+               state &= ~JFrame.ICONIFIED;
+
+               mainWindow.setExtendedState(state);
        }



Modified: trunk/apps/Thaw/src/thaw/plugins/TrayIcon.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/TrayIcon.java      2007-06-23 22:53:59 UTC 
(rev 13743)
+++ trunk/apps/Thaw/src/thaw/plugins/TrayIcon.java      2007-06-23 23:23:28 UTC 
(rev 13744)
@@ -84,11 +84,7 @@
        public void switchMainWindowVisibility() {
                boolean v = !core.getMainWindow().isVisible();

-               core.getMainWindow().setNonIconified();
-
                core.getMainWindow().setVisible(v);
-
-               core.getMainWindow().setNonIconified();
        }