Changeset 951 for trunk/src/3rdparty/os2/xsystray/plugin/w_xsystray.c

Timestamp:

Aug 9, 2011, 10:34:15 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

OS/2: xsystray: Paint empty box for NULL icon.

This is what tray widgets on Windows and Linux do. Previously,
xsystray would leave an old icon if NULL icon was sent to it,
which was totally confusing.

File:

• trunk/src/3rdparty/os2/xsystray/plugin/w_xsystray.c (modified) (8 diffs)

trunk/src/3rdparty/os2/xsystray/plugin/w_xsystray.c

@@ -828 +828 @@
                 break;
 
-            DrawPointer(hps, x, y, pSysTrayData->pIcons[i].hIcon, DP_MINI);
+            // just leave an empty box if the icon is NULL, this is what
+            // Windows and Linux tray widgets do
+            if (pSysTrayData->pIcons[i].hIcon != NULLHANDLE)
+                DrawPointer(hps, x, y, pSysTrayData->pIcons[i].hIcon, DP_MINI);
             x += lIconStep;
         }
@@ -1210 +1213 @@
             // make a private copy of the provided icon (it will get lost after
             // we return from this message)
-            brc = WinQueryPointerInfo(pCtlData->u.icon.hIcon, &Info);
-            if (!brc)
-                break;
-            hIcon = WinCreatePointerIndirect(HWND_DESKTOP, &Info);
-            if (hIcon == NULLHANDLE)
-                break;
+            if (pCtlData->u.icon.hIcon != NULLHANDLE)
+            {
+                brc = WinQueryPointerInfo(pCtlData->u.icon.hIcon, &Info);
+                if (!brc)
+                    break;
+                hIcon = WinCreatePointerIndirect(HWND_DESKTOP, &Info);
+                if (hIcon == NULLHANDLE)
+                    break;
+            }
 
             pData = FindIconData(pSysTrayData, pCtlData->hwndSender,
@@ -1231 +1237 @@
                     if (!pData->pszToolTip)
                     {
-                        WinDestroyPointer(hIcon);
+                        if (hIcon != NULLHANDLE)
+                            WinDestroyPointer(hIcon);
                         break;
                     }
@@ -1251 +1258 @@
 
                 // now update the icon
-                WinDestroyPointer(pData->hIcon);
+                if (pData->hIcon != NULLHANDLE)
+                    WinDestroyPointer(pData->hIcon);
                 pData->hIcon = hIcon;
                 pData->ulMsgId = pCtlData->u.icon.ulMsgId;
@@ -1276 +1284 @@
                     if (pNewIcons == NULL)
                     {
-                        WinDestroyPointer(hIcon);
+                        if (hIcon != NULLHANDLE)
+                            WinDestroyPointer(hIcon);
                         break;
                     }
@@ -1299 +1308 @@
                     if (!pData->pszToolTip)
                     {
-                        WinDestroyPointer(hIcon);
+                        if (hIcon != NULLHANDLE)
+                            WinDestroyPointer(hIcon);
                         break;
                     }
@@ -1328 +1338 @@
             // make a private copy of the provided icon (it will get lost after
             // we return from this message)
-            brc = WinQueryPointerInfo(pCtlData->u.icon.hIcon, &Info);
-            if (!brc)
-                break;
-            hIcon = WinCreatePointerIndirect(HWND_DESKTOP, &Info);
-            if (hIcon == NULLHANDLE)
-                break;
+            if (pCtlData->u.icon.hIcon != NULLHANDLE)
+            {
+                brc = WinQueryPointerInfo(pCtlData->u.icon.hIcon, &Info);
+                if (!brc)
+                    break;
+                hIcon = WinCreatePointerIndirect(HWND_DESKTOP, &Info);
+                if (hIcon == NULLHANDLE)
+                    break;
+            }
 
             pData = FindIconData(pSysTrayData, pCtlData->hwndSender,
@@ -1341 +1354 @@
                 LOGF((" Replacing with hIcon %x\n", hIcon));
 
-                WinDestroyPointer(pData->hIcon);
+                if (pData->hIcon != NULLHANDLE)
+                    WinDestroyPointer(pData->hIcon);
                 pData->hIcon = hIcon;
                 pData->ulMsgId = pCtlData->u.icon.ulMsgId;