From 205f98560b22c50b61924589a8bd43c32e33f5bc Mon Sep 17 00:00:00 2001
From: Hielke Morsink <hielke.morsink@gmail.com>
Date: Sat, 28 May 2022 11:26:21 +0200
Subject: [PATCH] Remove highlight when cursor leaves new rides list

---
 src/openrct2-ui/windows/NewRide.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/openrct2-ui/windows/NewRide.cpp b/src/openrct2-ui/windows/NewRide.cpp
index b42d2c2146..d2873bcb5e 100644
--- a/src/openrct2-ui/windows/NewRide.cpp
+++ b/src/openrct2-ui/windows/NewRide.cpp
@@ -667,11 +667,17 @@ static void WindowNewRideUpdate(rct_window* w)
         WindowNewRideSelect(w);
 
     WindowNewRidePopulateList();
-    // widget_invalidate(w, WIDX_RIDE_LIST);
 
     if (_windowNewRideCurrentTab < WINDOW_NEW_RIDE_PAGE_RESEARCH)
     {
         _windowNewRideTabScroll[_windowNewRideCurrentTab] = w->scrolls[0].v_top;
+
+        // Remove highlight when mouse leaves rides list
+        if (!WidgetIsHighlighted(w, WIDX_RIDE_LIST))
+        {
+            w->new_ride.HighlightedRide = { RIDE_TYPE_NULL, OBJECT_ENTRY_INDEX_NULL };
+            widget_invalidate(w, WIDX_RIDE_LIST);
+        }
     }
 }
 
@@ -717,13 +723,7 @@ static void WindowNewRideScrollMousedown(rct_window* w, int32_t scrollIndex, con
  */
 static void WindowNewRideScrollmouseover(rct_window* w, int32_t scrollIndex, const ScreenCoordsXY& screenCoords)
 {
-    RideSelection item;
-
-    if (w->new_ride.SelectedRide.Type != RIDE_TYPE_NULL)
-        return;
-
-    item = WindowNewRideScrollGetRideListItemAt(w, screenCoords);
-
+    RideSelection item = WindowNewRideScrollGetRideListItemAt(w, screenCoords);
     if (w->new_ride.HighlightedRide == item)
         return;