Skip to content
Snippets Groups Projects
Commit 38ab6bde authored by Andreas Bayha's avatar Andreas Bayha
Browse files

TreeTabelViewer: Fixed missing context menu for editable cells.


CellFactories for editable cells did not yet add the context menu. This
is now done, when style() is used for the cell.

Issue-ref: 4256
Issue-URL: af3#4256

Signed-off-by: default avatarAndreas Bayha <bayha@fortiss.org>
parent f6384cc5
No related branches found
No related tags found
1 merge request!1854256
...@@ -5,7 +5,7 @@ DynamicTextFieldTreeTableCell.java 62fa0c08b11d87e0eed41f84be85505c2740e75d GREE ...@@ -5,7 +5,7 @@ DynamicTextFieldTreeTableCell.java 62fa0c08b11d87e0eed41f84be85505c2740e75d GREE
DynamicTreeContentProviderBase.java 91896b1fb5104d126544c44c1ff8c30f2a13a8d6 GREEN DynamicTreeContentProviderBase.java 91896b1fb5104d126544c44c1ff8c30f2a13a8d6 GREEN
DynamicTreeItem.java 7e81ea98038b5eca90df583e0268d4e8f37aaf25 GREEN DynamicTreeItem.java 7e81ea98038b5eca90df583e0268d4e8f37aaf25 GREEN
DynamicTreeItemBase.java d883066ecc181120302ca32f328538de7a45b093 GREEN DynamicTreeItemBase.java d883066ecc181120302ca32f328538de7a45b093 GREEN
DynamicTreeTableUIProviderBase.java 29aa753793ab90676d45e5b76b11f7b46ce02a97 GREEN DynamicTreeTableUIProviderBase.java 360df9d5114c5d4a391a7a7afe70a5b8ad584490 YELLOW
DynamicTreeTableViewer.java 77e9995a3bee37d57578dad9434a53c702128efa YELLOW DynamicTreeTableViewer.java 77e9995a3bee37d57578dad9434a53c702128efa YELLOW
DynamicTreeUIProviderBase.java 82d3c051213f0147f4c67ad247a08696cee73110 GREEN DynamicTreeUIProviderBase.java 82d3c051213f0147f4c67ad247a08696cee73110 GREEN
DynamicTreeViewer.java 33066062a82101cf28410e4d04f85bb9c24251db GREEN DynamicTreeViewer.java 33066062a82101cf28410e4d04f85bb9c24251db GREEN
......
...@@ -322,6 +322,8 @@ public abstract class DynamicTreeTableUIProviderBase<T> { ...@@ -322,6 +322,8 @@ public abstract class DynamicTreeTableUIProviderBase<T> {
final Node icon = getIconNode(data, columnIndex); final Node icon = getIconNode(data, columnIndex);
cell.setGraphic(icon); cell.setGraphic(icon);
cell.setStyle(getCellStyle(data, columnIndex)); cell.setStyle(getCellStyle(data, columnIndex));
addContextMenuToCell(cell, columnIndex);
} else { } else {
// reset icon for cases, in which a row was styled before, but became empty by now. // reset icon for cases, in which a row was styled before, but became empty by now.
cell.setGraphic(null); cell.setGraphic(null);
...@@ -585,7 +587,7 @@ public abstract class DynamicTreeTableUIProviderBase<T> { ...@@ -585,7 +587,7 @@ public abstract class DynamicTreeTableUIProviderBase<T> {
* @param columnIndex * @param columnIndex
* The column index of the given {@code cell}. * The column index of the given {@code cell}.
*/ */
private void addContextMenuToCell(TreeTableCell<T, String> cell, int columnIndex) { private void addContextMenuToCell(TreeTableCell<T, ?> cell, int columnIndex) {
ContextMenu menu; ContextMenu menu;
T data = cell.getTreeTableRow().getItem(); T data = cell.getTreeTableRow().getItem();
...@@ -603,7 +605,7 @@ public abstract class DynamicTreeTableUIProviderBase<T> { ...@@ -603,7 +605,7 @@ public abstract class DynamicTreeTableUIProviderBase<T> {
* {@link DynamicTreeViewer} due to the absence of proper selection interfaces in * {@link DynamicTreeViewer} due to the absence of proper selection interfaces in
* JFX. * JFX.
*/ */
private void addContextMenuHandler(TreeTableCell<T, String> cell, ContextMenu menu, T element) { private void addContextMenuHandler(TreeTableCell<T, ?> cell, ContextMenu menu, T element) {
cell.getTreeTableView().addEventHandler(MouseEvent.MOUSE_RELEASED, e -> { cell.getTreeTableView().addEventHandler(MouseEvent.MOUSE_RELEASED, e -> {
if(e.getButton() == MouseButton.SECONDARY) { if(e.getButton() == MouseButton.SECONDARY) {
TreeItem<T> selected = TreeItem<T> selected =
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment