From c67d37f2238f2a4c88eb466defddaf128ada28b4 Mon Sep 17 00:00:00 2001 From: David Quintana Date: Tue, 23 Dec 2014 01:55:48 +0000 Subject: [PATCH] [EXPLORER] * Fix count of visible buttons getting out of sync when removing buttons. Fixes empty space at the end of the notification toolbar. CORE-8840 #resolve #comment This should be fixed as of r65805. svn path=/trunk/; revision=65805 --- reactos/base/shell/explorer/trayntfy.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/reactos/base/shell/explorer/trayntfy.cpp b/reactos/base/shell/explorer/trayntfy.cpp index 76d5ccb186a..adc5ae05361 100644 --- a/reactos/base/shell/explorer/trayntfy.cpp +++ b/reactos/base/shell/explorer/trayntfy.cpp @@ -132,7 +132,6 @@ public: tbBtn.fsState |= TBSTATE_HIDDEN; m_VisibleButtonCount--; } - } /* TODO: support NIF_INFO, NIF_GUID, NIF_REALTIME, NIF_SHOWTIP */ @@ -209,6 +208,12 @@ public: return; DeleteButton(index); + + if (!(notifyItem->dwState & NIS_HIDDEN)) + { + m_VisibleButtonCount--; + } + delete notifyItem; } -- 2.17.1