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

YELLOW


Issue-Ref: 4135
Issue-Url: #4135

Signed-off-by: default avatarAndreas Bayha <bayha@fortiss.org>
parent 880aa7f5
No related branches found
No related tags found
1 merge request!142Kernel: Enable icons in editable DynamicTreeTable cells
Pipeline #30978 failed
This commit is part of merge request !142. Comments created here will be created in the context of that merge request.
...@@ -5,7 +5,7 @@ DynamicTextFieldTreeTableCell.java de24117e6f785b328f1ff62383626a0b4b54e8ff GREE ...@@ -5,7 +5,7 @@ DynamicTextFieldTreeTableCell.java de24117e6f785b328f1ff62383626a0b4b54e8ff GREE
DynamicTreeContentProviderBase.java 91896b1fb5104d126544c44c1ff8c30f2a13a8d6 GREEN DynamicTreeContentProviderBase.java 91896b1fb5104d126544c44c1ff8c30f2a13a8d6 GREEN
DynamicTreeItem.java 7486071d20e896d6ca9a9101bf105caccf3656d0 GREEN DynamicTreeItem.java 7486071d20e896d6ca9a9101bf105caccf3656d0 GREEN
DynamicTreeItemBase.java d883066ecc181120302ca32f328538de7a45b093 GREEN DynamicTreeItemBase.java d883066ecc181120302ca32f328538de7a45b093 GREEN
DynamicTreeTableUIProviderBase.java dc571c193e02e538c399fdac4b6b4b69e01f88da RED DynamicTreeTableUIProviderBase.java 668fb957d5c0c0f67d6bfd0b8d1130bc58997e3f YELLOW
DynamicTreeTableViewer.java ead6f6671e9cb6b14632940bf440cba7e81fcd98 GREEN DynamicTreeTableViewer.java ead6f6671e9cb6b14632940bf440cba7e81fcd98 GREEN
DynamicTreeUIProviderBase.java 82d3c051213f0147f4c67ad247a08696cee73110 GREEN DynamicTreeUIProviderBase.java 82d3c051213f0147f4c67ad247a08696cee73110 GREEN
DynamicTreeViewer.java 545f1ca10b7b3cad171b294a4b447875da45c9ed GREEN DynamicTreeViewer.java 545f1ca10b7b3cad171b294a4b447875da45c9ed GREEN
......
...@@ -466,10 +466,8 @@ public abstract class DynamicTreeTableUIProviderBase<T> { ...@@ -466,10 +466,8 @@ public abstract class DynamicTreeTableUIProviderBase<T> {
super.updateItem(item, empty); super.updateItem(item, empty);
ContextMenu menu = null; ContextMenu menu = null;
Node icon = null;
if(!empty && item != null) { if(!empty && item != null) {
T data = this.getTreeTableRow().getItem(); T data = this.getTreeTableRow().getItem();
icon = getIconNode(data, colIndex);
menu = createContextMenu(data, colIndex); menu = createContextMenu(data, colIndex);
if(IS_OS_LINUX && menu != null) { if(IS_OS_LINUX && menu != null) {
...@@ -482,8 +480,7 @@ public abstract class DynamicTreeTableUIProviderBase<T> { ...@@ -482,8 +480,7 @@ public abstract class DynamicTreeTableUIProviderBase<T> {
this.setStyle(style); this.setStyle(style);
} }
} }
// TODO (SB): Remove next line since it is performed styleCell() now?
this.setGraphic(icon);
this.setContextMenu(menu); this.setContextMenu(menu);
styleCell(this, colIndex); styleCell(this, colIndex);
} }
......
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