Merge remote-tracking branch 'origin/fbp/release' into fbp/release

# Conflicts: # designer-base/src/main/java/com/fr/design/dialog/BasicScrollPane.java
5 months ago · cdaa5528b2
1 changed files with 1 additions and 0 deletions
--- a/designer-base/src/main/java/com/fr/design/dialog/BasicScrollPane.java
+++ b/designer-base/src/main/java/com/fr/design/dialog/BasicScrollPane.java
@ -5,6 +5,7 @@ import com.fr.design.gui.iscrollbar.UIScrollBar;

 import javax.swing.JPanel;
 import javax.swing.JScrollBar;
+import javax.swing.SwingUtilities;
 import java.awt.AWTEvent;
 import java.awt.Color;
 import java.awt.Component;