Browse Source

Pull request #10735: REPORT-85293【启动优化】起始页新增加载进度条视觉效果确认

Merge in DESIGN/design from ~HARRISON/design:release/11.0 to release/11.0

* commit '295d9a8c411fce8f4ba0486de3ce25faebcea422':
  REPORT-85293【启动优化】起始页新增加载进度条视觉效果确认 ProgressDialog 用错了,这个只能是使用的时候才创建 不然大小有问题
newui
Harrison-刘珂 2 years ago
parent
commit
cfe68d3f84
  1. 4
      designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java
  2. 11
      designer-base/src/main/java/com/fr/startup/ui/StartupPageWindow.java

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

@ -21,8 +21,8 @@ import java.awt.Frame;
/** /**
* 加载进度弹窗 * 加载进度弹窗
* <em>使用注意点:</em> * <em>使用注意点:</em>
* 1-需要等到 父frame 启动好之后才能启动进度条 * 必须到使用时再初始化不要作为属性存在
* 2-或者到使用时再初始化不要作为属性存在 * 因为涉及到 大小/位置 相对于 parent 的相对判断
* {@link com.fr.design.gui.iprogressbar.ProgressDialogTest} * {@link com.fr.design.gui.iprogressbar.ProgressDialogTest}
*/ */
public class ProgressDialog extends UIDialog { public class ProgressDialog extends UIDialog {

11
designer-base/src/main/java/com/fr/startup/ui/StartupPageWindow.java

@ -81,8 +81,6 @@ public class StartupPageWindow extends JFrame {
private JPanel body; private JPanel body;
private StartupLoadingPanel loadingPanel;
public StartupPageWindow(StartupPageModel pageModel) { public StartupPageWindow(StartupPageModel pageModel) {
patchUIAction(pageModel); patchUIAction(pageModel);
@ -102,9 +100,6 @@ public class StartupPageWindow extends JFrame {
setFullScreen(); setFullScreen();
// 必须放最后
// 见 https://work.fineres.com/browse/REPORT-85293
loadingPanel = new StartupLoadingPanel(this);
} }
private void initCenter(StartupPageModel pageModel) { private void initCenter(StartupPageModel pageModel) {
@ -232,9 +227,12 @@ public class StartupPageWindow extends JFrame {
private void enterWorkspace(Runnable action) { private void enterWorkspace(Runnable action) {
UIUtil.invokeAndWaitIfNeeded(() -> { UIUtil.invokeAndWaitIfNeeded(() -> {
// 必须直接初始化
// 见 https://work.fineres.com/browse/REPORT-85293
StartupLoadingPanel loadingPanel = new StartupLoadingPanel(this);
loadingPanel.show(); loadingPanel.show();
setEnabled(false); setEnabled(false);
});
SwingWorker<Void, Void> task = new SwingWorker<Void, Void>() { SwingWorker<Void, Void> task = new SwingWorker<Void, Void>() {
@Override @Override
@ -271,6 +269,7 @@ public class StartupPageWindow extends JFrame {
} }
}; };
task.execute(); task.execute();
});
} }
private JPanel generateRecentOpenPanel(StartupPageModel pageModel) { private JPanel generateRecentOpenPanel(StartupPageModel pageModel) {

Loading…
Cancel
Save