Common positioning code for Routing Info Icon

ebu · Nov 3, 2023 · e14ba77 · e14ba77
1 parent 0a282ca
commit e14ba77
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/ear-production-suite-plugins/plugins/direct_speakers/src/value_box_main.hpp b/ear-production-suite-plugins/plugins/direct_speakers/src/value_box_main.hpp
@@ -98,11 +98,7 @@ class ValueBoxMain : public Component {
     auto routingLabelArea = routingArea.withWidth(labelWidth_);
     routingLabel_->setBounds(routingLabelArea);
     if (routingInfoIcon_->isVisible()) {
-      auto routingInfoArea = routingArea.removeFromRight(13).withTrimmedTop(
-          1);  // Trimming 1 to get an odd height. Icon is odd height too, so
-               // ensures an integer number of pixels padding top and bottom to
-               // avoid blurring through anti-aliasing.
-      routingInfoIcon_->setBounds(routingInfoArea);
+      placeRoutingInfoIconRight(routingArea, routingInfoIcon_.get());
       routingArea.removeFromRight(marginSmall_);
     }
     auto routingComboBoxArea =

diff --git a/ear-production-suite-plugins/plugins/hoa/src/value_box_main.hpp b/ear-production-suite-plugins/plugins/hoa/src/value_box_main.hpp
@@ -114,8 +114,7 @@ class ValueBoxMain : public Component {
     auto routingLabelArea = routingArea.withWidth(labelWidth_);
     routingLabel_->setBounds(routingLabelArea);
     if (routingInfoIcon_->isVisible()) {
-      auto routingInfoArea = routingArea.removeFromRight(13).withTrimmedTop(1);  // Trimming 1 to get an odd height. Icon is odd height too, so ensures an integer number of pixels padding top and bottom to avoid blurring through anti-aliasing.
-      routingInfoIcon_->setBounds(routingInfoArea);
+      placeRoutingInfoIconRight(routingArea, routingInfoIcon_.get());
       routingArea.removeFromRight(marginSmall_);
     }
     auto routingComboBoxArea =

diff --git a/ear-production-suite-plugins/plugins/object/src/value_box_main.hpp b/ear-production-suite-plugins/plugins/object/src/value_box_main.hpp
@@ -87,8 +87,7 @@ class ValueBoxMain : public Component {
     auto routingLabelArea = routingArea.withWidth(labelWidth_);
     routingLabel_->setBounds(routingLabelArea);
     if (routingInfoIcon_->isVisible()) {
-      auto routingInfoArea = routingArea.removeFromRight(13).withTrimmedTop(1); // Trimming 1 to get an odd height. Icon is odd height too, so ensures an integer number of pixels padding top and bottom to avoid blurring through anti-aliasing. 
-      routingInfoIcon_->setBounds(routingInfoArea);
+      placeRoutingInfoIconRight(routingArea, routingInfoIcon_.get());
       routingArea.removeFromRight(marginSmall_);
     }
     auto routingComboBoxArea =

diff --git a/shared/components/routing_info_icon.hpp b/shared/components/routing_info_icon.hpp
@@ -21,6 +21,16 @@ namespace ui {
         return std::move(routingIcon);
     }
 
+    inline void placeRoutingInfoIconRight(juce::Rectangle<int>& area, ImageComponent* routingInfoIcon) {
+        auto routingInfoArea = area.removeFromRight(13);
+        // Need an odd height to avoid blurring through anti-aliasing
+        // (since icon is odd height too, so ensures integer padding when centring vertically)
+        if (routingInfoArea.getHeight() % 2 == 0) {
+            routingInfoArea.removeFromTop(1);
+        }
+        routingInfoIcon->setBounds(routingInfoArea);
+    }
+
 }  // namespace ui
 }  // namespace plugin
 }  // namespace ear