From 996d1be0d74cbba1ecbf0ce0953e3c9c97f97f5d Mon Sep 17 00:00:00 2001 From: "Egor.Ushakov" Date: Tue, 23 May 2017 19:38:22 +0300 Subject: [PATCH] better position for inplace editor - subtract border right inset --- .../xdebugger/impl/ui/tree/SetValueInplaceEditor.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/SetValueInplaceEditor.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/SetValueInplaceEditor.java index 0fc445f3436e..45684d75cf48 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/SetValueInplaceEditor.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/SetValueInplaceEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2016 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,6 +32,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; +import javax.swing.border.Border; import java.awt.*; /** @@ -57,7 +58,8 @@ public class SetValueInplaceEditor extends XDebuggerTreeInplaceEditor { if (presentation != null) { XValuePresentationUtil.appendSeparator(nameLabel, presentation.getSeparator()); } - myNameOffset = nameLabel.getPreferredSize().width; + Border border = nameLabel.getMyBorder(); + myNameOffset = nameLabel.getPreferredSize().width - (border != null ? border.getBorderInsets(nameLabel).right : 0); myEditorPanel = JBUI.Panels.simplePanel(myExpressionEditor.getComponent()); }