summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Rohrberg2017-05-29 03:19:44 -0400
committerTimo Rohrberg2017-05-29 03:19:44 -0400
commite42976028b65c6674fbfb9b0382b216f8950b0e0 (patch)
tree0764191523621ce451108025dea177c64f25f37c
parent917d687a206cd890187dea42060bf3a2920a8ae7 (diff)
parentb3a0d43c56e411682765d7fc3ffec36f9cacc06d (diff)
downloadorg.eclipse.riena-master.zip
org.eclipse.riena-master.tar.gz
org.eclipse.riena-master.tar.xz
Merge branch 'develop' (belongs to release 20170523_6_2_0_stable).HEADv20170523_6_2_0_stablemaster
-rw-r--r--org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/TreeRidgetLabelProvider.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/TreeRidgetLabelProvider.java b/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/TreeRidgetLabelProvider.java
index 96da5af..5c53624 100644
--- a/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/TreeRidgetLabelProvider.java
+++ b/org.eclipse.riena.ui.ridgets.swt/src/org/eclipse/riena/internal/ui/ridgets/swt/TreeRidgetLabelProvider.java
@@ -235,6 +235,7 @@ public final class TreeRidgetLabelProvider extends TableRidgetLabelProvider impl
private Image getImageForNode(final Object element, final boolean isExpanded) {
String imageKey = null;
+ IconSize iconSize = IconSize.NONE;
// First try to get the image key from the attributes.
if (imageAttribute != null && openImageAttribute != null) {
@@ -257,13 +258,12 @@ public final class TreeRidgetLabelProvider extends TableRidgetLabelProvider impl
if (lnfResource instanceof ImageLnfResource) {
final ImageLnfResource imageResource = (ImageLnfResource) lnfResource;
imageKey = imageResource.getImagePath();
+ iconSize = imageResource.getIconSize();
}
}
- // By default load the image in IconSize.NONE ...
- IconSize iconSize = IconSize.NONE;
+ // If it's a SubModuleNode, take the IconSize from Lnf constant EMBEDDED_TITLEBAR_ICON_SIZE.
if (isSubModuleNode(element.getClass())) {
- // ... unless it's a SubModuleNode, then take the IconSize from the Lnf configuration.
iconSize = (IconSize) LnfManager.getLnf().getSetting(LnfKeyConstants.EMBEDDED_TITLEBAR_ICON_SIZE);
}
@@ -280,6 +280,7 @@ public final class TreeRidgetLabelProvider extends TableRidgetLabelProvider impl
private Image getImageForLeaf(final Object element) {
String imageKey = null;
+ IconSize iconSize = IconSize.NONE;
// First try to get the image key from the attributes.
if (imageAttribute != null) {
@@ -296,13 +297,12 @@ public final class TreeRidgetLabelProvider extends TableRidgetLabelProvider impl
if (lnfResource instanceof ImageLnfResource) {
final ImageLnfResource imageResource = (ImageLnfResource) lnfResource;
imageKey = imageResource.getImagePath();
+ iconSize = imageResource.getIconSize();
}
}
- // By default load the image in IconSize.NONE ...
- IconSize iconSize = IconSize.NONE;
+ // If it's a SubModuleNode, take the IconSize from Lnf constant EMBEDDED_TITLEBAR_ICON_SIZE.
if (isSubModuleNode(element.getClass())) {
- // ... unless it's a SubModuleNode, then take the IconSize from the Lnf configuration.
iconSize = (IconSize) LnfManager.getLnf().getSetting(LnfKeyConstants.EMBEDDED_TITLEBAR_ICON_SIZE);
}