From 26fea303611f9ee1efabe8ac63f8c4c09b0573fc Mon Sep 17 00:00:00 2001
From: Maciej Barelkowski <maciej.barelkowski@camunda.com>
Date: Thu, 7 Jul 2022 16:02:48 +0200
Subject: [PATCH] fix: properly size icons in distribute/align

---
 assets/bpmn-js.css                            |  9 +++---
 .../AlignElementsMenuProviderSpec.js          | 28 +++++++++++++++++++
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/assets/bpmn-js.css b/assets/bpmn-js.css
index 0b6ba32d7a..c9f3b9e09b 100644
--- a/assets/bpmn-js.css
+++ b/assets/bpmn-js.css
@@ -129,15 +129,14 @@
 }
 
 [data-popup="align-elements"] .djs-popup-body .entry {
-  height: 20px;
-  width: 20px;
-
   padding: 6px 8px;
 }
 
 [data-popup="align-elements"] .djs-popup-body .entry img {
-  height: 100%;
-  width: 100%;
+  display: block;
+
+  height: 20px;
+  width: 20px;
 }
 
 [data-popup="align-elements"] .bjs-align-elements-menu-entry {
diff --git a/test/spec/features/align-elements/AlignElementsMenuProviderSpec.js b/test/spec/features/align-elements/AlignElementsMenuProviderSpec.js
index d03a37682b..a4f0a29b83 100644
--- a/test/spec/features/align-elements/AlignElementsMenuProviderSpec.js
+++ b/test/spec/features/align-elements/AlignElementsMenuProviderSpec.js
@@ -78,6 +78,34 @@ describe('features/align-elements - popup menu', function() {
       expect(popupMenu.isOpen()).to.be.false;
     })
   );
+
+
+  it('should properly size icons even with border-box', inject(function(elementRegistry, popupMenu, canvas) {
+
+    // given
+    var container = canvas.getContainer();
+    var elements = [
+      elementRegistry.get('EndEvent_lane'),
+      elementRegistry.get('Task_lane'),
+      elementRegistry.get('SubProcess_lane')
+    ];
+
+    // when
+    container.style['box-sizing'] = 'border-box';
+    popupMenu.open(elements, 'align-elements', {
+      x: 0,
+      y: 0
+    });
+
+    // then
+    var entry = getEntry('align-elements-left'),
+        icon = domQuery('img', entry);
+
+    var bbox = icon.getBoundingClientRect();
+
+    expect(bbox.width).to.eql(20);
+    expect(bbox.height).to.eql(20);
+  }));
 });