MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

xdebugger: update evaluation popup size on tree expansion IDEA-269295

Browse Source 
GitOrigin-RevId: 1728fea6bb790ed35699fe5101c81f40d50183c7
This commit is contained in:
Viktor Shatrov
2021-07-14 15:54:10 +00:00
committed by intellij-monorepo-bot
parent 0ccfddf062
commit 987e0ec5e5
2 changed files with 30 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/common/DebuggerTreeWithHistoryPopup.java
+2 -15
View File
@@ -30,7 +30,7 @@ import javax.swing.tree.TreePath;
import java.awt.*;
import java.util.List;
import static com.intellij.xdebugger.impl.inline.XDebuggerTreeInlayPopup.updateDebugPopupBounds;
import static com.intellij.xdebugger.impl.inline.XDebuggerTreeInlayPopup.setAutoResize;
final class DebuggerTreeWithHistoryPopup<D> extends DebuggerTreeWithHistoryContainer<D> {
@NonNls private final static String DIMENSION_SERVICE_KEY = "DebuggerActiveHint";
@@ -123,20 +123,7 @@ final class DebuggerTreeWithHistoryPopup<D> extends DebuggerTreeWithHistoryConta
return;
}
myPopup.show(new RelativePoint(myEditor.getContentComponent(), myPoint));
((XDebuggerTree)tree).addTreeListener(new XDebuggerTreeListener() {
@Override
public void childrenLoaded(@NotNull XDebuggerTreeNode node,
@NotNull List<? extends XValueContainerNode<?>> children,
boolean last) {
if (last) {
updateDebugPopupBounds(tree, myToolbar, myPopup);
((XDebuggerTree)tree).removeTreeListener(this);
}
}
});
updateDebugPopupBounds(tree, myToolbar, myPopup);
setAutoResize(tree, myToolbar, myPopup);
}
private void resize(final TreePath path, JTree tree) {
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/inline/XDebuggerTreeInlayPopup.java
+28 -21
View File
@@ -286,20 +286,7 @@ public class XDebuggerTreeInlayPopup<D> {
}
myPopup.setSize(new Dimension(0, 0));
myPopup.show(new RelativePoint(myEditor.getContentComponent(), myPoint));
((XDebuggerTree)tree).addTreeListener(new XDebuggerTreeListener() {
@Override
public void childrenLoaded(@NotNull XDebuggerTreeNode node,
@NotNull List<? extends XValueContainerNode<?>> children,
boolean last) {
if (last) {
updateDebugPopupBounds(tree, myToolbar, myPopup);
((XDebuggerTree)tree).removeTreeListener(this);
}
}
});
updateDebugPopupBounds(tree, myToolbar, myPopup);
setAutoResize(tree, myToolbar, myPopup);
}
private void resize(final TreePath path, JTree tree) {
@@ -322,22 +309,42 @@ public class XDebuggerTreeInlayPopup<D> {
popupWindow.repaint();
}
public static void updateDebugPopupBounds(final Tree tree, JComponent toolbar, JBPopup popup) {
public static void setAutoResize(Tree tree, JComponent myToolbar, JBPopup myPopup) {
final boolean[] canShrink = {true};
((XDebuggerTree)tree).addTreeListener(new XDebuggerTreeListener() {
@Override
public void childrenLoaded(@NotNull XDebuggerTreeNode node,
@NotNull List<? extends XValueContainerNode<?>> children,
boolean last) {
if (last) {
updateDebugPopupBounds(tree, myToolbar, myPopup, canShrink[0]);
canShrink[0] = false;
}
}
});
updateDebugPopupBounds(tree, myToolbar, myPopup, canShrink[0]);
}
public static void updateDebugPopupBounds(final Tree tree, JComponent toolbar, JBPopup popup, boolean canShrink) {
final Window popupWindow = SwingUtilities.windowForComponent(popup.getContent());
final Dimension size = tree.getPreferredSize();
final Point location = popupWindow.getLocation();
int hMargin = JBUI.scale(150);
int width = Math.max(size.width, toolbar.getPreferredSize().width) + hMargin;
int maxWidth = JBUI.scale(600);
int row = Math.min(12, tree.getRowCount() - 1);
Rectangle bounds = tree.getRowBounds(row);
int hMargin = JBUI.scale(30);
int vMargin = JBUI.scale(30);
int width = Math.max(size.width, toolbar.getPreferredSize().width) + hMargin;
Rectangle bounds = tree.getRowBounds(tree.getRowCount() - 1);
int height = toolbar.getHeight() + vMargin + (bounds == null ? 0 : bounds.y + bounds.height);
int maxWidth = ScreenUtil.getScreenRectangle(toolbar).width / 2;
int maxHeight = ScreenUtil.getScreenRectangle(toolbar).height / 2;
final Rectangle targetBounds = new Rectangle(location.x,
location.y,
Math.min(width, maxWidth),
height);
Math.min(height, maxHeight));
if (!canShrink) {
targetBounds.width = Math.max(targetBounds.width, popupWindow.getWidth());
targetBounds.height = Math.max(targetBounds.height, popupWindow.getHeight());
}
ScreenUtil.cropRectangleToFitTheScreen(targetBounds);
popupWindow.setBounds(targetBounds);
popupWindow.validate();