mirror of
https://github.com/JFormDesigner/FlatLaf.git
synced 2025-12-07 06:20:53 +03:00
FlatInspector: improved inspecting parent levels: Ctrl adds 1 level, Shift adds 2 levels and Alt adds 4 levels; no longer limit inspecting to content pane
This commit is contained in:
@@ -71,7 +71,7 @@ public class FlatInspector
|
|||||||
private Component lastComponent;
|
private Component lastComponent;
|
||||||
private int lastX;
|
private int lastX;
|
||||||
private int lastY;
|
private int lastY;
|
||||||
private boolean inspectParent;
|
private int inspectParentLevel;
|
||||||
|
|
||||||
private JComponent highlightFigure;
|
private JComponent highlightFigure;
|
||||||
private JToolTip tip;
|
private JToolTip tip;
|
||||||
@@ -112,7 +112,9 @@ public class FlatInspector
|
|||||||
public void mouseMoved( MouseEvent e ) {
|
public void mouseMoved( MouseEvent e ) {
|
||||||
lastX = e.getX();
|
lastX = e.getX();
|
||||||
lastY = e.getY();
|
lastY = e.getY();
|
||||||
inspectParent = e.isShiftDown();
|
inspectParentLevel = (e.isControlDown() ? 1 : 0)
|
||||||
|
+ (e.isShiftDown() ? 2 : 0)
|
||||||
|
+ (e.isAltDown() ? 4 : 0);
|
||||||
inspect( lastX, lastY );
|
inspect( lastX, lastY );
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -157,10 +159,9 @@ public class FlatInspector
|
|||||||
Container contentPane = rootPane.getContentPane();
|
Container contentPane = rootPane.getContentPane();
|
||||||
Point pt = SwingUtilities.convertPoint( rootPane.getGlassPane(), x, y, contentPane );
|
Point pt = SwingUtilities.convertPoint( rootPane.getGlassPane(), x, y, contentPane );
|
||||||
Component c = SwingUtilities.getDeepestComponentAt( contentPane, pt.x, pt.y );
|
Component c = SwingUtilities.getDeepestComponentAt( contentPane, pt.x, pt.y );
|
||||||
if( inspectParent && c != null && c != contentPane )
|
for( int i = 0; i < inspectParentLevel && c != null; i++ ) {
|
||||||
c = c.getParent();
|
c = c.getParent();
|
||||||
if( c == contentPane || (c != null && c.getParent() == contentPane) )
|
}
|
||||||
c = null;
|
|
||||||
|
|
||||||
if( c == lastComponent )
|
if( c == lastComponent )
|
||||||
return;
|
return;
|
||||||
@@ -300,6 +301,9 @@ public class FlatInspector
|
|||||||
text += "Left-to-right: " + c.getComponentOrientation().isLeftToRight() + '\n';
|
text += "Left-to-right: " + c.getComponentOrientation().isLeftToRight() + '\n';
|
||||||
text += "Parent: " + c.getParent().getClass().getName();
|
text += "Parent: " + c.getParent().getClass().getName();
|
||||||
|
|
||||||
|
if( inspectParentLevel > 0 )
|
||||||
|
text += "\n\nParent level: " + inspectParentLevel;
|
||||||
|
|
||||||
return text;
|
return text;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user