Changeset 42

Timestamp:

Jul 7, 2013, 11:31:03 PM (12 years ago)

Author:

Gregg Young

Message:

Attempt to fix ticket 9 using a timer. Currently it delays hiding the taskbar for 5 seconds. During that time the task menus (kill and switch) work.

Location:

trunk

Files:

• h/taskbar.h (modified) (1 diff)
• hook/lswhook.c (modified) (1 diff)
• taskbar.c (modified) (7 diffs)

trunk/h/taskbar.h ¶

@@ -55 +55 @@
 #define TSKBARUPDATEINTERVAL 35
 #define TSKBARBUBBLETIMERID 2
+#define TSKHIDEDELAYTIMERID 3
+#define TSKHIDEDELAYINTERVAL 5000
 
 #define MIS_PROCESS 0x8000

trunk/hook/lswhook.c ¶

@@ -146 +146 @@
                     return FALSE;
 
-                if ((!bOnTop
-                     && plswData->Settings.bTaskBarTopScr ^ ptl.y == 0)
-                    || (bOnTop && !WinIsWindowVisible(plswData->hwndMenu))) {
-                    if (!bOnTop) {
-                        WinQueryWindowRect(plswData->hwndTaskBar, &rcl);
-                        cyTskBar = rcl.yTop;
-                    }
-                    WinSetWindowPos(plswData->hwndTaskBar,
-                                    bOnTop ? HWND_BOTTOM : HWND_TOP, 0, 0, 0,
-                                    0,
-                                    SWP_ZORDER | (plswData->Settings.
-                                                  bTaskBarAlwaysVisible ? 0
-                                                  : (bOnTop ? SWP_HIDE :
-                                                     SWP_SHOW)));
-                    bOnTop ^= TRUE;
-                }
+                //if ((!bOnTop
+                //     && plswData->Settings.bTaskBarTopScr ^ ptl.y == 0)
+                //    || (bOnTop && !WinIsWindowVisible(plswData->hwndMenu))) {
+                if (!bOnTop) {
+                    WinQueryWindowRect(plswData->hwndTaskBar, &rcl);
+                    cyTskBar = rcl.yTop;
+                }
+                WinSetWindowPos(plswData->hwndTaskBar,
+                                HWND_TOP, 0, 0, 0,
+                                0,
+                                //(plswData->Settings.bTaskBarAlwaysVisible ?
+                                SWP_ZORDER | SWP_SHOW);
+                bOnTop ^= TRUE;
+                //}
                 DosFreeMem(plswData);
             }

trunk/taskbar.c ¶

@@ -720 +720 @@
                              ptl.x,
                              ptl.y +
-                             (plswData->Settings.bTaskBarTopScr ? -sItems *
-                              usItemHgt - 2 * usFrameWid : swp.cy),
+                            (plswData->Settings.bTaskBarTopScr ? -sItems *
+                             usItemHgt - 2 * usFrameWid : swp.cy),
                              usHswActive,
                              PU_HCONSTRAIN | PU_VCONSTRAIN | PU_MOUSEBUTTON1 |
@@ -1628 +1628 @@
 #endif
 
-            plswData->hwndTaskMenu = WinCreateMenu(HWND_DESKTOP, NULL);
+            plswData->hwndTaskMenu = WinCreateMenu(hwnd, NULL);
             WinSetWindowPtr(plswData->hwndTaskMenu, 0,
                             (VOID *) WinSubclassWindow(plswData->hwndTaskMenu,
@@ -1761 +1761 @@
 
             hwndOldOver = hwndMouseOver;
-            hwndMouseOver = HWNDFROMMP(mp1);
+            hwndMouseOver = HWNDFROMMP(mp1);
+
+            WinStopTimer(plswData->hab, hwnd, TSKHIDEDELAYTIMERID);
 
 #ifdef XWORKPLACE
@@ -1793 +1795 @@
                 WinStopTimer(plswData->hab, hwnd, TSKBARBUBBLETIMERID);
                 ShowBubble(plswData, 0, 0, 0, -2, NULL);        //should be after WinStopTimer
-            }
-
+            }
+#ifndef XWORKPLACE
+            WinStartTimer(plswData->hab, hwnd, TSKHIDEDELAYTIMERID, TSKHIDEDELAYINTERVAL);
+            //printf("Hidedelaytimer Visible");
+#endif
             break;
         }
@@ -2072 +2077 @@
 //    if (msg==LSWM_ACTIVEWNDCHANGED /*&& (ULONG)mp2==WM_ACTIVATE*/) {
 //#else
+
+        //printf("Hidedelaytimer Visible %i", SHORT1FROMMP(mp1));
             if (SHORT1FROMMP(mp1) == TSKBARUPDATETIMERID) {
 //#endif
@@ -2095 +2102 @@
                 }
                 break;
-            }
-
+            }
+#ifndef XWORKPLACE
+            if (SHORT1FROMMP(mp1) == TSKHIDEDELAYTIMERID) {
+                WinStopTimer(plswData->hab, hwnd, TSKHIDEDELAYTIMERID);
+                WinSetWindowPos(plswData->hwndTaskBar,
+                                HWND_BOTTOM, 0, 0, 0, 0,
+                                (plswData->Settings.bTaskBarAlwaysVisible ? SWP_ZORDER : SWP_HIDE));
+                //printf("Hidedelaytimer Visible %i", plswData->Settings.bTaskBarAlwaysVisible);
+                break;
+            }
+#endif
             if (SHORT1FROMMP(mp1) == TSKBARBUBBLETIMERID) {
                 POINTL ptl;
@@ -2184 +2200 @@
                     SWP_MOVE | SWP_SIZE | (plswData->Settings.
                                            bTaskBarAlwaysVisible ? SWP_SHOW :
-                                           0));
+                                           SWP_HIDE));
 
     WinPostMsg(0, WM_NULL, 0, 0);       //reset the hook