Merge branch '4135' into 'master'

Kernel: Enable icons in editable DynamicTreeTable cells

See merge request !142

org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/.ratings

@@ -5,7 +5,7 @@ DynamicTextFieldTreeTableCell.java de24117e6f785b328f1ff62383626a0b4b54e8ff GREE
 DynamicTreeContentProviderBase.java 91896b1fb5104d126544c44c1ff8c30f2a13a8d6 GREEN
 DynamicTreeItem.java 7486071d20e896d6ca9a9101bf105caccf3656d0 GREEN
 DynamicTreeItemBase.java d883066ecc181120302ca32f328538de7a45b093 GREEN
-DynamicTreeTableUIProviderBase.java a4cd60795d114984f7fd255f273fc39937889f22 GREEN
+DynamicTreeTableUIProviderBase.java 668fb957d5c0c0f67d6bfd0b8d1130bc58997e3f GREEN
 DynamicTreeTableViewer.java ead6f6671e9cb6b14632940bf440cba7e81fcd98 GREEN
 DynamicTreeUIProviderBase.java 82d3c051213f0147f4c67ad247a08696cee73110 GREEN
 DynamicTreeViewer.java 545f1ca10b7b3cad171b294a4b447875da45c9ed GREEN

org.fortiss.tooling.common.ui/src/org/fortiss/tooling/common/ui/javafx/control/treetableview/DynamicTreeTableUIProviderBase.java

@@ -296,6 +296,9 @@ public abstract class DynamicTreeTableUIProviderBase<T> {
 					String colorStr = colorToRgbaString(bgColor, alpha);
 					cell.setStyle("-fx-background-color: " + colorStr);
 				}
+
+				final Node icon = getIconNode(data, columnIndex);
+				cell.setGraphic(icon);
 			}
 		}
 	}
@@ -409,6 +412,13 @@ public abstract class DynamicTreeTableUIProviderBase<T> {
 			});
 		}
 
+		/** {@inheritDoc} */
+		@Override
+		public void updateItem(String item, boolean empty) {
+			super.updateItem(item, empty);
+			styleCell(this, this.columnIndex);
+		}
+
 		/** {@inheritDoc} */
 		@Override
 		public void cancelEdit() {
@@ -456,10 +466,8 @@ public abstract class DynamicTreeTableUIProviderBase<T> {
 					super.updateItem(item, empty);
 
 					ContextMenu menu = null;
-					Node icon = null;
 					if(!empty && item != null) {
 						T data = this.getTreeTableRow().getItem();
-						icon = getIconNode(data, colIndex);
 
 						menu = createContextMenu(data, colIndex);
 						if(IS_OS_LINUX && menu != null) {
@@ -472,7 +480,7 @@ public abstract class DynamicTreeTableUIProviderBase<T> {
 							this.setStyle(style);
 						}
 					}
-					this.setGraphic(icon);
+
 					this.setContextMenu(menu);
 					styleCell(this, colIndex);
 				}