From adcddeb94440e3c32d0b15b497f3b3bd68dca2ea Mon Sep 17 00:00:00 2001
From: Sergey Malenkov <sergey.malenkov@jetbrains.com>
Date: Thu, 22 Dec 2016 21:18:39 +0300
Subject: [PATCH] use utility methods to apply insets

---
 .../intellij/ui/components/panels/HorizontalLayout.java   | 6 +++---
 .../com/intellij/ui/components/panels/VerticalLayout.java | 6 +++---
 platform/util/src/com/intellij/util/ui/ScrollUtil.java    | 8 ++------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/platform/platform-api/src/com/intellij/ui/components/panels/HorizontalLayout.java b/platform/platform-api/src/com/intellij/ui/components/panels/HorizontalLayout.java
index 3ef57e09fd1b..bbec27cdb9cd 100644
--- a/platform/platform-api/src/com/intellij/ui/components/panels/HorizontalLayout.java
+++ b/platform/platform-api/src/com/intellij/ui/components/panels/HorizontalLayout.java
@@ -15,6 +15,8 @@
  */
 package com.intellij.ui.components.panels;
 
+import com.intellij.util.ui.JBInsets;
+
 import javax.swing.SwingConstants;
 import java.awt.Component;
 import java.awt.Container;
@@ -247,9 +249,7 @@ public final class HorizontalLayout implements LayoutManager2 {
         int rightWidth = right == null ? 0 : right.width;
         result.width += Math.abs(leftWidth - rightWidth);
       }
-      Insets insets = container.getInsets();
-      result.width += insets.left + insets.right;
-      result.height += insets.top + insets.bottom;
+      JBInsets.addTo(result, container.getInsets());
       return result;
     }
   }
diff --git a/platform/platform-api/src/com/intellij/ui/components/panels/VerticalLayout.java b/platform/platform-api/src/com/intellij/ui/components/panels/VerticalLayout.java
index 3372ed8bb895..144708dbfb0e 100644
--- a/platform/platform-api/src/com/intellij/ui/components/panels/VerticalLayout.java
+++ b/platform/platform-api/src/com/intellij/ui/components/panels/VerticalLayout.java
@@ -15,6 +15,8 @@
  */
 package com.intellij.ui.components.panels;
 
+import com.intellij.util.ui.JBInsets;
+
 import javax.swing.SwingConstants;
 import java.awt.Component;
 import java.awt.Container;
@@ -247,9 +249,7 @@ public final class VerticalLayout implements LayoutManager2 {
         int bottomHeight = bottom == null ? 0 : bottom.height;
         result.width += Math.abs(topHeight - bottomHeight);
       }
-      Insets insets = container.getInsets();
-      result.width += insets.left + insets.right;
-      result.height += insets.top + insets.bottom;
+      JBInsets.addTo(result, container.getInsets());
       return result;
     }
   }
diff --git a/platform/util/src/com/intellij/util/ui/ScrollUtil.java b/platform/util/src/com/intellij/util/ui/ScrollUtil.java
index 8d17612ca34e..19b70f1c5f32 100644
--- a/platform/util/src/com/intellij/util/ui/ScrollUtil.java
+++ b/platform/util/src/com/intellij/util/ui/ScrollUtil.java
@@ -101,12 +101,8 @@ public class ScrollUtil {
     visible.x = r.x - (visible.width - r.width) / 2;
     visible.y = r.y - (visible.height - r.height) / 2;
 
-    final Rectangle bounds = c.getBounds();
-    final Insets i = withInsets ? new Insets(0, 0, 0, 0) : c.getInsets();
-    bounds.x = i.left;
-    bounds.y = i.top;
-    bounds.width -= i.left + i.right;
-    bounds.height -= i.top + i.bottom;
+    Rectangle bounds = new Rectangle(c.getWidth(), c.getHeight());
+    if (!withInsets) JBInsets.removeFrom(bounds, c.getInsets());
 
     if (visible.x < bounds.x) {
       visible.x = bounds.x;