From ad9fac22a306c1accdea6990255bea9917c2c0af Mon Sep 17 00:00:00 2001
From: Don Ho <don.h@free.fr>
Date: Wed, 20 Nov 2013 10:40:29 +0000
Subject: [PATCH] [BUG_FIXED] (Author: tns) Fix tab close button's color
 remains hovered while mouse leaves.

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1150 f5eea248-9336-0410-98b8-ebc06183d4e3
---
 PowerEditor/src/WinControls/TabBar/TabBar.cpp | 61 +++++++++++--------
 1 file changed, 37 insertions(+), 24 deletions(-)

diff --git a/PowerEditor/src/WinControls/TabBar/TabBar.cpp b/PowerEditor/src/WinControls/TabBar/TabBar.cpp
index b50ebbdb4..3a0893342 100644
--- a/PowerEditor/src/WinControls/TabBar/TabBar.cpp
+++ b/PowerEditor/src/WinControls/TabBar/TabBar.cpp
@@ -466,13 +466,7 @@ LRESULT TabBarPlus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPara
 				// Get cursor position of "Screen"
 				// For using the function "WindowFromPoint" afterward!!!
 				::GetCursorPos(&_draggingPoint);
-/*
-				HWND h = ::WindowFromPoint(_draggingPoint);
-				::SetFocus(h);
-*/
-
 				draggingCursor(_draggingPoint);
-				//::SendMessage(h, NPPM_INTERNAL_ISDRAGGING, 0, 0);
 			    return TRUE;
 			}
 			
@@ -481,31 +475,50 @@ LRESULT TabBarPlus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPara
 				int xPos = LOWORD(lParam);
 				int yPos = HIWORD(lParam);
 
-				int index = getTabIndexAt(xPos, yPos);
-				
-				if (index != -1)
-				{
-					// Reduce flicker by only redrawing needed tabs
-					
-					bool oldVal = _isCloseHover;
-					int oldIndex = _currentHoverTabItem;
-					RECT oldRect;
+				int _currentHoverTabItemOld = _currentHoverTabItem;
+				RECT _currentHoverTabRectOld = _currentHoverTabRect;
+				bool _isCloseHoverOld = _isCloseHover;
 
-					::SendMessage(_hSelf, TCM_GETITEMRECT, index, (LPARAM)&_currentHoverTabRect);
-					::SendMessage(_hSelf, TCM_GETITEMRECT, oldIndex, (LPARAM)&oldRect);
-					_currentHoverTabItem = index;
+				_currentHoverTabItem = getTabIndexAt(xPos, yPos);
+				if (_currentHoverTabItem != -1)
+				{
+					::SendMessage(_hSelf, TCM_GETITEMRECT, _currentHoverTabItem, (LPARAM)&_currentHoverTabRect);
 					_isCloseHover = _closeButtonZone.isHit(xPos, yPos, _currentHoverTabRect);
-					
-					if (oldVal != _isCloseHover)
-					{
-						InvalidateRect(hwnd, &oldRect, FALSE);
+				}
+				else
+				{
+					SetRectEmpty(&_currentHoverTabRect);
+					_isCloseHover = false;
+				}
+				
+				if (_currentHoverTabItem != _currentHoverTabItemOld || _isCloseHover != _isCloseHoverOld)
+				{
+					if (_isCloseHoverOld && (_currentHoverTabItem != _currentHoverTabItemOld || !_isCloseHover))
+						InvalidateRect(hwnd, &_currentHoverTabRectOld, FALSE);
+					if (_isCloseHover)
 						InvalidateRect(hwnd, &_currentHoverTabRect, FALSE);
-					}
-				}				
+				}
+
+				if (_isCloseHover)
+				{
+					TRACKMOUSEEVENT tme = {};
+					tme.cbSize = sizeof(tme);
+					tme.dwFlags = TME_LEAVE;
+					tme.hwndTrack = hwnd;
+					TrackMouseEvent(&tme);
+				}
 			}
 			break;
 		}
 
+		case WM_MOUSELEAVE:
+			if (_isCloseHover)
+				InvalidateRect(hwnd, &_currentHoverTabRect, FALSE);
+			_currentHoverTabItem = -1;
+			SetRectEmpty(&_currentHoverTabRect);
+			_isCloseHover = false;
+			break;
+
 		case WM_LBUTTONUP :
 		{
 			int xPos = LOWORD(lParam);