Browse Source

REPORT-35568 参数面板,添加多个控件,撤销,会出现一个蓝色的框线 撤回另一个任务的代码

feature/big-screen
Henry.Wang 4 years ago
parent
commit
4644b3d208
  1. 5
      designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java
  2. 14
      designer-base/src/main/java/com/fr/start/server/FineEmbedServerMonitor.java

5
designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java

@ -96,9 +96,4 @@ public class ProgressDialog extends UIDialog {
public void updateLoadingText(String text) {
this.text.setText(text);
}
public void updateLoadingText(String text, FRFont font) {
this.text.setFont(font);
this.text.setText(text);
}
}

14
designer-base/src/main/java/com/fr/start/server/FineEmbedServerMonitor.java

@ -7,11 +7,7 @@ import com.fr.event.Event;
import com.fr.event.EventDispatcher;
import com.fr.event.Listener;
import com.fr.event.Null;
import com.fr.general.FRFont;
import com.fr.general.GeneralContext;
import javax.swing.plaf.ColorUIResource;
import java.util.Locale;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
@ -90,14 +86,8 @@ public class FineEmbedServerMonitor {
}
if (!DesignerContext.getDesignerFrame().getProgressDialog().isVisible()) {
DesignerContext.getDesignerFrame().showProgressDialog();
String text = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading_Embed_Server");
//如果为韩文则改变字体
if (GeneralContext.getLocale().equals(Locale.KOREA)) {
FRFont font = FRFont.getInstance().applySize(14).applyForeground(new ColorUIResource(333334)).applyName("Dialog");
DesignerContext.getDesignerFrame().getProgressDialog().updateLoadingText(text, font);
} else {
DesignerContext.getDesignerFrame().getProgressDialog().updateLoadingText(text);
}
DesignerContext.getDesignerFrame().getProgressDialog()
.updateLoadingText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading_Embed_Server"));
}
DesignerContext.getDesignerFrame().updateProgress(getProgress());
}

Loading…
Cancel
Save