Changeset 275

Timestamp:

07/22/06 05:28:37 (18 years ago)

Author:

Nicholas Riley

Message:

Fix bug with alarm update interval; update tooltip when time changes.

Location:

trunk/hiptop/pester/net/sabi/pester

Files:

• Alarm.java (modified) (1 diff)
• AlarmListView.java (modified) (2 diffs)

trunk/hiptop/pester/net/sabi/pester/Alarm.java

@@ -251 +251 @@
     public int getSecondsUntilNextIntervalStringUpdate() {
         int i = remainingInterval();
-        if (i == 1)
+        if (i <= 1)
             return 0;
         if (i <= 60)
             return 1;
-        if (i <= 24 * 60 * 60)
-            return i % 60;
-        return i % 3600; // update at least once an hour, regardless
+        if (i <= 24 * 60 * 60) {
+            i %= 60;
+            return (i == 0 ? 60 : i);
+        }
+        i %= 3600;
+        return (i == 0 ? 3600 : i);
     }
 

trunk/hiptop/pester/net/sabi/pester/AlarmListView.java

@@ -28 +28 @@
             setHasBorder(true);
         mToolTipAlarm = new danger.app.Alarm(0, this);
+        Application.registerForEvent(this, Event.EVENT_TIME_CHANGED);
         super.onDecoded();
     }
@@ -64 +65 @@
             Alarms.removeAlarm((Alarm)getFocusedItem());
             return true;
+        case Event.EVENT_TIME_CHANGED:
+            if (mToolTipWindow == null || !mToolTipWindow.isVisible())
+                return true;
         case Event.EVENT_ALARM: // tooltip invalid
-            // XXX should do this too if the time changes
             showToolTip();
             return true;