Preselect reveal

Author: basilevs

modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.impl/src/org/eclipse/rcptt/tesla/nebula/NebulaUIPlayerExtension.java

@@ -82,7 +82,6 @@ public SWTUIElement select(SWTUIPlayer p, PlayerSelectionFilter f) {
 					}
 					return new GridCell(item, p, column);
 				}
-
 			}
 
 		case Custom:

modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.impl/src/org/eclipse/rcptt/tesla/nebula/NebulaUIProcessor.java

@@ -141,7 +141,9 @@ public PreExecuteStatus preExecute(Command command, PreExecuteStatus previousSta
 			SelectData data = ((SelectCommand) command).getData();
 			SWTUIElement parent = getMapper().get(data.getParent());
 
-			GridScrollingHelper.scrollGridFor(data, parent);
+			if (!GridScrollingHelper.scrollGridFor(data, parent)) {
+				return new PreExecuteStatus(false);
+			}
 		}
 		// for SetSelectionEx see SelectingParts.mouseActions
 		else if (command instanceof SetSelectionRange) {

modules/nebula/plugins/org.eclipse.rcptt.tesla.nebula.impl/src/org/eclipse/rcptt/tesla/nebula/grid/GridScrollingHelper.java

@@ -36,18 +36,29 @@ public static void scrollGridFor(NebulaUIElement grid, List<String> path) {
 		showItemIfHidden(item);
 	}
 
-	public static void scrollGridFor(SelectData data, SWTUIElement parent) {
+	public static boolean scrollGridFor(SelectData data, SWTUIElement parent) {
 		Widget parentWidget = unwrapWidget(parent);
 
 		// TODO implement it for whole item selection case (e.g. select "Item #3")
 
-		if (parentWidget instanceof GridItem) {
-			GridItem item = (GridItem) unwrapWidget(parent);
-			showItemIfHidden(item);
+		if (parentWidget instanceof Grid grid) {
+			GridItem item = (GridItem) NebulaViewers.searchGridItem(
+					(NebulaUIElement) parent, data.getPath());
+			if (!showItemIfHidden(item)) {
+				return false;
+			}
+			if (data.getKind().contentEquals(NebulaElementKinds.ITEM_CELL)) {
+				ItemCell cell = ItemCell.from(data, item, data.getIndex());
+				return showColumnIfHidden(cell.column); // scroll horizontally to the column
+			}
+		} else if (parentWidget instanceof GridItem item) {
+			if (!showItemIfHidden(item)) {
+				return false;
+			}
 
 			if (data.getKind().contentEquals(NebulaElementKinds.ITEM_CELL)) {
 				ItemCell cell = ItemCell.from(data, item, data.getIndex());
-				showColumnIfHidden(cell.column); // scroll horizontally to the column
+				return showColumnIfHidden(cell.column); // scroll horizontally to the column
 			}
 		}
 		else if (data.getKind().contentEquals(NebulaElementKinds.EMPTY_AREA)) {
@@ -57,33 +68,39 @@ else if (data.getKind().contentEquals(NebulaElementKinds.EMPTY_AREA)) {
 			if (!area.top) {
 				// scroll grid to bottom to see the empty area
 				grid.setTopIndex(grid.getItemCount() - 1);
+				return false;
 			}
 
 			// scroll horizontally
-			if (area.column != null)
-				showColumnIfHidden(area.column); // to see the column
+			if (area.column != null) 
+				return showColumnIfHidden(area.column); // to see the column
 			else if (!area.left)
-				grid.showColumn(NebulaViewers.getGridLastColumn(grid)); // to see an empty area on the right
+				return showColumnIfHidden(NebulaViewers.getGridLastColumn(grid)); // to see an empty area on the right
 		}
+		return true;
 	}
 
 	//
 
-	public static void showItemIfHidden(GridItem item) {
-		if (NebulaViewers.getItemBounds(item) == null) {
+	public static boolean showItemIfHidden(GridItem item) {
+		if (NebulaViewers.getItemBounds(item) == null || !item.isVisible()) {
 			Grid grid = item.getParent();
-
-			// scroll grid vertically to see the item
-			grid.setTopIndex(grid.getIndexOfItem(item));
+			grid.showItem(item);
+			return false;
 		}
+		
+		return true;
 	}
 
-	public static void showColumnIfHidden(GridColumn column) {
+	public static boolean showColumnIfHidden(GridColumn column) {
 		Grid grid = column.getParent();
 		Rectangle bounds = NebulaViewers.getColumnHeaderBounds(column);
 
-		if (bounds == null || bounds.x > grid.getBounds().width)
+		if (bounds == null || bounds.x > grid.getBounds().width) {
 			grid.showColumn(column);
+			return false;
+		}
+		return true;
 	}
 
 	public static void showPartIfHidden(ItemPart part) {