|
|
@ -23,6 +23,7 @@ import com.fr.design.mainframe.EditingMouseListener; |
|
|
|
import com.fr.design.mainframe.FormDesigner; |
|
|
|
import com.fr.design.mainframe.FormDesigner; |
|
|
|
import com.fr.design.mainframe.NoSupportAuthorityEdit; |
|
|
|
import com.fr.design.mainframe.NoSupportAuthorityEdit; |
|
|
|
import com.fr.design.mainframe.WidgetPropertyPane; |
|
|
|
import com.fr.design.mainframe.WidgetPropertyPane; |
|
|
|
|
|
|
|
import com.fr.design.mainframe.loghandler.LogMessageBar; |
|
|
|
import com.fr.design.plugin.DesignerPluginContext; |
|
|
|
import com.fr.design.plugin.DesignerPluginContext; |
|
|
|
import com.fr.design.utils.gui.LayoutUtils; |
|
|
|
import com.fr.design.utils.gui.LayoutUtils; |
|
|
|
import com.fr.form.ui.Widget; |
|
|
|
import com.fr.form.ui.Widget; |
|
|
@ -33,6 +34,7 @@ import com.fr.stable.StringUtils; |
|
|
|
|
|
|
|
|
|
|
|
import javax.swing.BorderFactory; |
|
|
|
import javax.swing.BorderFactory; |
|
|
|
import javax.swing.JComponent; |
|
|
|
import javax.swing.JComponent; |
|
|
|
|
|
|
|
import javax.swing.JFrame; |
|
|
|
import javax.swing.JPanel; |
|
|
|
import javax.swing.JPanel; |
|
|
|
import javax.swing.SwingUtilities; |
|
|
|
import javax.swing.SwingUtilities; |
|
|
|
import javax.swing.border.Border; |
|
|
|
import javax.swing.border.Border; |
|
|
@ -776,6 +778,10 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo |
|
|
|
if (popup == null) { |
|
|
|
if (popup == null) { |
|
|
|
popup = new SelectedPopupDialog(this, designer); |
|
|
|
popup = new SelectedPopupDialog(this, designer); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
JFrame frame = LogMessageBar.getInstance().getLogFrame(); |
|
|
|
|
|
|
|
if (frame!= null && frame.isActive()) { |
|
|
|
|
|
|
|
return; |
|
|
|
|
|
|
|
} |
|
|
|
int creatorRightX = (int) ((bounds.x + bounds.width + SelectedPopupDialog.OFFSET_X) * designer.getScale()); |
|
|
|
int creatorRightX = (int) ((bounds.x + bounds.width + SelectedPopupDialog.OFFSET_X) * designer.getScale()); |
|
|
|
int creatorRightY = (int) (bounds.y * designer.getScale()); |
|
|
|
int creatorRightY = (int) (bounds.y * designer.getScale()); |
|
|
|
int formDesignerWidth = designer.getWidth(); |
|
|
|
int formDesignerWidth = designer.getWidth(); |
|
|
|