Attachment #205300 for bug #361052

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 361052
Collapse All | Expand All




	private boolean columnInVisibleArea(Rectangle clientArea, ViewerRow row, int colIndex) {
		return row.getBounds(colIndex).x >= clientArea.x;
	}
	
	public ViewerCell getFocusCell() {
		ViewerCell cell = super.getFocusCell();
		Table t = (Table) getViewer().getControl();

		// It is possible that the selection has changed under the hood
		if (cell != null) {
			if (t.getSelection().length == 1
					&& t.getSelection()[0] != cell.getItem()) {
				setFocusCell(getViewer().getViewerRowFromItem(
						t.getSelection()[0]).getCell(cell.getColumnIndex()));
			}
		}

		return super.getFocusCell();
	}

// RAP [if]	361052: Focused cell is not highlighted if navigating with CTRL + Arrow Up/Down
//	        https://bugs.eclipse.org/bugs/show_bug.cgi?id=361052
//	public ViewerCell getFocusCell() {
//		ViewerCell cell = super.getFocusCell();
//		Table t = (Table) getViewer().getControl();
//
//		// It is possible that the selection has changed under the hood
//		if (cell != null) {
//			if (t.getSelection().length == 1
//					&& t.getSelection()[0] != cell.getItem()) {
//				setFocusCell(getViewer().getViewerRowFromItem(
//						t.getSelection()[0]).getCell(cell.getColumnIndex()));
//			}
//		}
//
//		return super.getFocusCell();
//	}
// RAPEND
}

Lines 144-156 Link Here

(-)js/org/eclipse/rwt/AsyncKeyEventUtil.js (-7 / +9 lines)
144	var result = false;	144	var result = false;
145	if( qx.core.Variant.isSet( "qx.client", "gecko" ) ) {	145	if( qx.core.Variant.isSet( "qx.client", "gecko" ) ) {
146	var tagName = domEvent.target.tagName.toLowerCase();	146	var tagName = domEvent.target.tagName.toLowerCase();
147	// Check for CTRL key fixes bug 282837	147	if( tagName == "input" \|\| tagName == "textarea" ) {
148	if( domEvent.ctrlKey ) {	148	// Check for CTRL key fixes bug 282837
149	result = true;	149	if( domEvent.ctrlKey ) {
150	} else if( tagName == "input" \|\| tagName == "textarea" ) {	150	result = true;
151	for( var i = 0; !result && i < this._untrustedKeyCodes.length; i++ ) {	151	} else {
152	if( this._untrustedKeyCodes[ i ] === keyCode ) {	152	for( var i = 0; !result && i < this._untrustedKeyCodes.length; i++ ) {
153	result = true;	153	if( this._untrustedKeyCodes[ i ] === keyCode ) {
		154	result = true;
		155	}
154	}	156	}
155	}	157	}
156	}	158	}

Return to bug 361052

Lines 88-108 Link Here

(-)src/org/eclipse/jface/viewers/TableViewerFocusCellManager.java (-16 / +18 lines)
88	private boolean columnInVisibleArea(Rectangle clientArea, ViewerRow row, int colIndex) {	88	private boolean columnInVisibleArea(Rectangle clientArea, ViewerRow row, int colIndex) {
89	return row.getBounds(colIndex).x >= clientArea.x;	89	return row.getBounds(colIndex).x >= clientArea.x;
90	}	90	}
91
92	public ViewerCell getFocusCell() {
93	ViewerCell cell = super.getFocusCell();
94	Table t = (Table) getViewer().getControl();
95
96	// It is possible that the selection has changed under the hood
97	if (cell != null) {
98	if (t.getSelection().length == 1
99	&& t.getSelection()[0] != cell.getItem()) {
100	setFocusCell(getViewer().getViewerRowFromItem(
101	t.getSelection()[0]).getCell(cell.getColumnIndex()));
102	}
103	}
104
105	return super.getFocusCell();
106	}
107		91
		92	// RAP [if] 361052: Focused cell is not highlighted if navigating with CTRL + Arrow Up/Down
		93	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=361052
		94	// public ViewerCell getFocusCell() {
		95	// ViewerCell cell = super.getFocusCell();
		96	// Table t = (Table) getViewer().getControl();
		97	//
		98	// // It is possible that the selection has changed under the hood
		99	// if (cell != null) {
		100	// if (t.getSelection().length == 1
		101	// && t.getSelection()[0] != cell.getItem()) {
		102	// setFocusCell(getViewer().getViewerRowFromItem(
		103	// t.getSelection()[0]).getCell(cell.getColumnIndex()));
		104	// }
		105	// }
		106	//
		107	// return super.getFocusCell();
		108	// }
		109	// RAPEND
108	}	110	}