fix position sub icons of multiLayerIcon

Evolveum · Feb 6, 2019 · f45344c · f45344c
1 parent 6e28043
commit f45344c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/...-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/AjaxCompositedIconButton.java b/...-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/AjaxCompositedIconButton.java
@@ -46,7 +46,17 @@ public AjaxCompositedIconButton(String id, CompositedIcon icon, IModel<String> t
 
         this.title = title;
         this.icon =icon;
+
+        add(AttributeAppender.append("class", new IModel<String>() {
+
+            private static final long serialVersionUID = 1L;
 
+            @Override
+            public String getObject() {
+                return " position-relative ";
+            }
+        }));
+
         add(AttributeAppender.append("class", new IModel<String>() {
 
             private static final long serialVersionUID = 1L;

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/MultifunctionalButton.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/MultifunctionalButton.java
@@ -86,8 +86,8 @@ public void onClick(AjaxRequestTarget target) {
 
                 CompositedIconBuilder additionalButtonBuilder = new CompositedIconBuilder();
                 additionalButtonBuilder.setBasicIcon(WebComponentUtil.getIconCssClass(additionalButtonDisplayType), IconCssStyle.IN_ROW_STYLE)
-                        .appendColorHtmlValue(WebComponentUtil.getIconColor(additionalButtonDisplayType));
-//                    .appendLayerIcon(GuiStyleConstants.CLASS_PLUS_CIRCLE, IconCssStyle.BOTTOM_RIGHT_STYLE, GuiStyleConstants.GREEN_COLOR);
+                        .appendColorHtmlValue(WebComponentUtil.getIconColor(additionalButtonDisplayType))
+                    .appendLayerIcon(GuiStyleConstants.CLASS_PLUS_CIRCLE, IconCssStyle.BOTTOM_RIGHT_STYLE, GuiStyleConstants.GREEN_COLOR);
 
                 AjaxCompositedIconButton additionalButton = new AjaxCompositedIconButton(buttonsPanel.newChildId(), additionalButtonBuilder.build(),
                         Model.of(WebComponentUtil.getDisplayTypeTitle(additionalButtonDisplayType))) {
@@ -106,9 +106,8 @@ public void onClick(AjaxRequestTarget target) {
             DisplayType defaultObjectButtonDisplayType = getDefaultObjectButtonDisplayType();
             CompositedIconBuilder defaultObjectButtonBuilder = new CompositedIconBuilder();
             defaultObjectButtonBuilder.setBasicIcon(WebComponentUtil.getIconCssClass(defaultObjectButtonDisplayType), IconCssStyle.IN_ROW_STYLE)
-                .appendColorHtmlValue(WebComponentUtil.getIconColor(defaultObjectButtonDisplayType));
-            //TODO fix style for circle image
-//                    .appendLayerIcon(GuiStyleConstants.CLASS_PLUS_CIRCLE, IconCssStyle.BOTTOM_RIGHT_STYLE, GuiStyleConstants.GREEN_COLOR);
+                .appendColorHtmlValue(WebComponentUtil.getIconColor(defaultObjectButtonDisplayType))
+                    .appendLayerIcon(GuiStyleConstants.CLASS_PLUS_CIRCLE, IconCssStyle.BOTTOM_RIGHT_STYLE, GuiStyleConstants.GREEN_COLOR);
 
             AjaxCompositedIconButton defaultButton = new AjaxCompositedIconButton(buttonsPanel.newChildId(),
                     defaultObjectButtonBuilder.build(),

diff --git a/gui/admin-gui/src/main/resources/static/less/midpoint-theme.less b/gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
@@ -1460,4 +1460,8 @@ th.countLabel{
 
 .buttons-panel-marging{
 	margin: 10px;
+}
+
+.position-relative{
+	position: relative;
 }