Skip to content

Commit 83a73cf

Browse files
committed
Fixes #3654. Show default icon for components without icon annotation.
1 parent f1fe098 commit 83a73cf

File tree

1 file changed

+15
-12
lines changed

1 file changed

+15
-12
lines changed

OMEdit/OMEditGUI/Component/Component.cpp

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -498,18 +498,21 @@ bool Component::hasShapeAnnotation(Component *pComponent)
498498
return iconAnnotationFound;
499499
}
500500
}
501-
foreach (Component *pChildComponent, pComponent->getComponentsList()) {
502-
iconAnnotationFound = hasShapeAnnotation(pChildComponent);
503-
if (iconAnnotationFound) {
504-
return iconAnnotationFound;
505-
}
506-
foreach (Component *pInheritedComponent, pChildComponent->getInheritedComponentsList()) {
507-
iconAnnotationFound = hasShapeAnnotation(pInheritedComponent);
508-
if (iconAnnotationFound) {
509-
return iconAnnotationFound;
510-
}
511-
}
512-
}
501+
/* Ticket #3654
502+
* Don't check components because if it has components and no shapes then it looks empty.
503+
*/
504+
// foreach (Component *pChildComponent, pComponent->getComponentsList()) {
505+
// iconAnnotationFound = hasShapeAnnotation(pChildComponent);
506+
// if (iconAnnotationFound) {
507+
// return iconAnnotationFound;
508+
// }
509+
// foreach (Component *pInheritedComponent, pChildComponent->getInheritedComponentsList()) {
510+
// iconAnnotationFound = hasShapeAnnotation(pInheritedComponent);
511+
// if (iconAnnotationFound) {
512+
// return iconAnnotationFound;
513+
// }
514+
// }
515+
// }
513516
return iconAnnotationFound;
514517
}
515518

0 commit comments

Comments
 (0)