[Xfce4-commits] [apps/xfdashboard] 01/01: Do not only check for first items in result container (as in commit c84c7fc1ebdb4b4a3199fb2655f9533f4a6680db) but do also check for last items even if it should already be handled globally by focus manager. I just want to be safe ; 9

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

nomad pushed a commit to branch master
in repository apps/xfdashboard.

commit e177d3808297a188027d0b95b10129b772f09f25
Author: Stephan Haller <nomad at froevel.de>
Date:   Mon Mar 21 07:01:40 2016 +0100

    Do not only check for first items in result container (as in commit c84c7fc1ebdb4b4a3199fb2655f9533f4a6680db) but do also check for last items even if it should already be handled globally by focus manager. I just want to be safe ;9
    
    This commit addresses also GH #119
---
 libxfdashboard/search-view.c | 74 +++++++++++++++++++++++++++-----------------
 1 file changed, 46 insertions(+), 28 deletions(-)

diff --git a/libxfdashboard/search-view.c b/libxfdashboard/search-view.c
index f62a690..2300e65 100644
--- a/libxfdashboard/search-view.c
+++ b/libxfdashboard/search-view.c
@@ -724,8 +724,9 @@ static guint _xfdashboard_search_view_perform_search(XfdashboardSearchView *self
 	GList										*providers;
 	GList										*iter;
 	guint										numberResults;
-	ClutterActor								*reselectSelection;
-	XfdashboardSearchViewProviderData			*reselectFirstOfProvider;
+	ClutterActor								*reselectOldSelection;
+	XfdashboardSearchViewProviderData			*reselectProvider;
+	XfdashboardSelectionTarget					reselectDirection;
 #ifdef DEBUG
 	GTimer										*timer=NULL;
 #endif
@@ -746,36 +747,52 @@ static guint _xfdashboard_search_view_perform_search(XfdashboardSearchView *self
 	 * result container if selection gets lost while updating results for
 	 * this search.
 	 */
-	reselectFirstOfProvider=NULL;
-	reselectSelection=xfdashboard_focusable_get_selection(XFDASHBOARD_FOCUSABLE(self));
-	if(reselectSelection)
+	reselectProvider=NULL;
+	reselectOldSelection=xfdashboard_focusable_get_selection(XFDASHBOARD_FOCUSABLE(self));
+	if(reselectOldSelection)
 	{
 		XfdashboardSearchViewProviderData	*providerData;
-		ClutterActor						*firstItem;
-
-		providerData=NULL;
-		firstItem=NULL;
 
 		/* Find data of provider for requested selection and check if current
 		 * selection is the first item at provider's result container.
 		 */
-		providerData=_xfdashboard_search_view_get_provider_data_by_actor(self, reselectSelection);
+		providerData=_xfdashboard_search_view_get_provider_data_by_actor(self, reselectOldSelection);
 		if(providerData)
 		{
+			ClutterActor					*item;
+
+			/* Get last item of provider's result container */
+			item=xfdashboard_search_result_container_find_selection(XFDASHBOARD_SEARCH_RESULT_CONTAINER(providerData->container),
+																	NULL,
+																	XFDASHBOARD_SELECTION_TARGET_LAST,
+																	XFDASHBOARD_VIEW(self),
+																	FALSE);
+
+			/* Check if it the same as the current selection then remember
+			 * the provider to reselect last item if selection changes
+			 * while updating search results.
+			 */
+			if(reselectOldSelection==item)
+			{
+				reselectProvider=providerData;
+				reselectDirection=XFDASHBOARD_SELECTION_TARGET_LAST;
+			}
+
 			/* Get first item of provider's result container */
-			firstItem=xfdashboard_search_result_container_find_selection(XFDASHBOARD_SEARCH_RESULT_CONTAINER(providerData->container),
-																			NULL,
-																			XFDASHBOARD_SELECTION_TARGET_FIRST,
-																			XFDASHBOARD_VIEW(self),
-																			FALSE);
+			item=xfdashboard_search_result_container_find_selection(XFDASHBOARD_SEARCH_RESULT_CONTAINER(providerData->container),
+																	NULL,
+																	XFDASHBOARD_SELECTION_TARGET_FIRST,
+																	XFDASHBOARD_VIEW(self),
+																	FALSE);
 
 			/* Check if it the same as the current selection then remember
 			 * the provider to reselect first item if selection changes
 			 * while updating search results.
 			 */
-			if(reselectSelection==firstItem)
+			if(reselectOldSelection==item)
 			{
-				reselectFirstOfProvider=providerData;
+				reselectProvider=providerData;
+				reselectDirection=XFDASHBOARD_SELECTION_TARGET_FIRST;
 			}
 		}
 	}
@@ -840,10 +857,10 @@ static guint _xfdashboard_search_view_perform_search(XfdashboardSearchView *self
 	g_timer_destroy(timer);
 #endif
 
-	/* Reselect first item at provider if we remembered the provider whose first item
-	 * should be reselected and if selection has changed while updating results.
+	/* Reselect first or last item at provider if we remembered the provider where
+	 * the item should be reselected and if selection has changed while updating results.
 	 */
-	if(reselectFirstOfProvider)
+	if(reselectProvider)
 	{
 		ClutterActor							*selection;
 
@@ -852,22 +869,23 @@ static guint _xfdashboard_search_view_perform_search(XfdashboardSearchView *self
 		 */
 		selection=xfdashboard_focusable_get_selection(XFDASHBOARD_FOCUSABLE(self));
 
-		/* If selection has changed then re-select first item of provider */
-		if(selection!=reselectSelection)
+		/* If selection has changed then re-select first or last item of provider */
+		if(selection!=reselectOldSelection)
 		{
-			/* Get new selection which is the first item of provider's result
-			 * container.
+			/* Get new selection which is the first or last item of provider's
+			 * result container.
 			 */
-			selection=xfdashboard_search_result_container_find_selection(XFDASHBOARD_SEARCH_RESULT_CONTAINER(reselectFirstOfProvider->container),
+			selection=xfdashboard_search_result_container_find_selection(XFDASHBOARD_SEARCH_RESULT_CONTAINER(reselectProvider->container),
 																			NULL,
-																			XFDASHBOARD_SELECTION_TARGET_FIRST,
+																			reselectDirection,
 																			XFDASHBOARD_VIEW(self),
 																			FALSE);
 
 			/* Set new selection */
 			xfdashboard_focusable_set_selection(XFDASHBOARD_FOCUSABLE(self), selection);
-			g_debug("Reselecting first selectable item at provider %s as old selection vanished",
-					xfdashboard_search_provider_get_name(reselectFirstOfProvider->provider));
+			g_debug("Reselecting selectable item in direction %d at provider %s as old selection vanished",
+					reselectDirection,
+					xfdashboard_search_provider_get_name(reselectProvider->provider));
 		}
 	}
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.