Changeset 105

Timestamp:

Sep 24, 2017, 5:09:58 PM (8 years ago)

Author:

Gregg Young

Message:

Prevent stand alone taskbar from switching z-order or hiding while a menu is open. Ticket #42 Improve grouping logic to account for program type being PROG_DEFAULT in some cases and its actual type (ie PROG_PM) in others Ticket #45

File:

• trunk/taskbar.c (modified) (8 diffs)

trunk/taskbar.c ¶

@@ -1040 +1040 @@
             (WinQuerySwitchEntry
              (WinQuerySwitchHandle(pbData->hwndFirstItem, 0), &swctl1stItem),
-             swctl.bProgType == swctl1stItem.bProgType))
+             (swctl.bProgType == 0 || swctl1stItem.bProgType == 0 ||
+             swctl.bProgType == swctl1stItem.bProgType)))
             hwndBtnSameHmte = hwndNext;
     WinEndEnumWindows(henum);
@@ -1430 +1431 @@
 // 0xFFFF means errors in getting object title, don't make further attempts
                     if (hwndBtnSameHmte != 0 && pbData->pszObjName == NULL
-                        && pbData->usObjHandle != 0xFFFF) {
+                        && pbData->usObjHandle != 0xFFFF) {
                         if (ulFunc != 4 && swctl.bProgType == PROG_PM
-                            && !IsWPSPid(swctl.idProcess)) {
+                            && !IsWPSPid(swctl.idProcess)) {
                             WinPostMsg(pbData->hwndFirstItem, atomGetProcCmd,
                                        0, mp2);
@@ -1864 +1865 @@
     case LSWM_MOUSEOVERBTN:{
             BTNDATA *pbtnData;
-            HWND hwndOldOver;
+            HWND hwndOldOver;
 
             hwndOldOver = hwndMouseOver;
@@ -1901 +1902 @@
             }
 #ifndef XWORKPLACE
-                WinStartTimer(plswData->hab, hwnd, TSKHIDEDELAYTIMERID, TSKHIDEDELAYINTERVAL);
+            WinStartTimer(plswData->hab, hwnd, TSKHIDEDELAYTIMERID, TSKHIDEDELAYINTERVAL);
 #endif
             break;
@@ -2193 +2194 @@
                 usOldActive = usHswActive;
                 hwndActive = WinQueryActiveWindow(HWND_DESKTOP);
-                usHswActive = WinQuerySwitchHandle(hwndActive, 0) & 0xFFFF;
-                if (usHswActive != usOldActive) {
-                    hwndHsw = GetBtnFromHsw(hwnd, usOldActive);
+                usHswActive = WinQuerySwitchHandle(hwndActive, 0) & 0xFFFF;
+                if (usHswActive != usOldActive) {
+                    WinInvalidateRect(hwnd, NULL, TRUE);
+                    /*hwndHsw = GetBtnFromHsw(hwnd, usOldActive);
                     WinInvalidateRect(IsWindowClass(hwndHsw, "#3") ? hwndHsw :
                                       WinQueryWindow(hwndHsw, QW_OWNER), NULL,
@@ -2202 +2204 @@
                     WinInvalidateRect(IsWindowClass(hwndHsw, "#3") ? hwndHsw :
                                       WinQueryWindow(hwndHsw, QW_OWNER), NULL,
-                                      FALSE);
+                                      FALSE); */
                 }
                 break;
@@ -2214 +2216 @@
                 RECTL rcl;
                 ULONG fl = SWP_SHOW;
-
+                BTNDATA *pbtnData;
+                static HWND groupmenuhwnd = 0;
+
+                if ((pbtnData = WinQueryWindowPtr(hwndMouseOver, 0)) != NULL &&
+                    pbtnData->hwndSubWinMenu != 0)
+                    groupmenuhwnd = pbtnData->hwndSubWinMenu;
+                if (!WinIsWindow(plswData->hab, groupmenuhwnd))
+                   groupmenuhwnd = 0;
                 if (!WinIsWindowVisible(plswData->hwndMenu) &&
-                    !WinIsWindowVisible(plswData->hwndTaskMenu))
+                    !WinIsWindowVisible(plswData->hwndTaskMenu) &&
+                    !WinIsWindowVisible(groupmenuhwnd))
                     fl = SWP_ZORDER;
                 WinQueryWindowRect(plswData->hwndTaskBar, &rcl);
@@ -2223 +2233 @@
                     usOldY = ptl.y;
                     if (ptl.y > 2 * cyTskBar && ptl.y < cyScreen - 2 * cyTskBar) {
-                WinSetWindowPos(plswData->hwndTaskBar,
-                                HWND_BOTTOM, 0, 0, 0, 0,
-                                (plswData->Settings.bTaskBarAlwaysVisible ? fl :
-                                 SWP_HIDE));
-                WinInvalidateRect(plswData->hwndTaskBar, NULL, TRUE);
+                        if (!WinIsWindowVisible(plswData->hwndMenu) &&
+                            !WinIsWindowVisible(plswData->hwndTaskMenu)&&
+                            !WinIsWindowVisible(groupmenuhwnd)) {
+                            WinSetWindowPos(plswData->hwndTaskBar,
+                                            HWND_BOTTOM, 0, 0, 0, 0,
+                                            (plswData->Settings.bTaskBarAlwaysVisible ? fl :
+                                             SWP_HIDE));
+                            WinInvalidateRect(plswData->hwndTaskBar, NULL, TRUE);
+                        }
                     }
                 }