MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-293835 ui: workaround issue with recursive 'JLayeredPane.remove' call on LaF switch on Linux

Browse Source 
To fix the issue, avoid calling `setContentPane` directly. Use a Wrapper panel.

GitOrigin-RevId: 01a309da24650abcc91e5d129eb4fdccdb7ebe94
This commit is contained in:
Aleksey Pivovarov
2022-05-13 19:40:35 +00:00
committed by intellij-monorepo-bot
parent 1889dd96b4
commit 0aeee8ba1c
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java
+8 -3
View File
@@ -41,6 +41,7 @@ import com.intellij.ui.components.JBTextField;
import com.intellij.ui.components.labels.ActionLink;
import com.intellij.ui.components.panels.NonOpaquePanel;
import com.intellij.ui.components.panels.VerticalLayout;
import com.intellij.ui.components.panels.Wrapper;
import com.intellij.ui.mac.touchbar.Touchbar;
import com.intellij.ui.mac.touchbar.TouchbarActionCustomizations;
import com.intellij.ui.scale.JBUIScale;
@@ -78,6 +79,7 @@ public class FlatWelcomeFrame extends JFrame implements IdeFrame, Disposable, Ac
public static final int DEFAULT_HEIGHT = USE_TABBED_WELCOME_SCREEN ? 650 : 460;
public static final int MAX_DEFAULT_WIDTH = 800;
private final AbstractWelcomeScreen myScreen;
private final Wrapper myContent;
private WelcomeBalloonLayoutImpl myBalloonLayout;
private boolean myDisposed;
private DefaultFrameHeader myHeader;
@@ -89,15 +91,18 @@ public class FlatWelcomeFrame extends JFrame implements IdeFrame, Disposable, Ac
myBalloonLayout = new WelcomeBalloonLayoutImpl(rootPane, JBUI.insets(8));
myScreen = USE_TABBED_WELCOME_SCREEN ? new TabbedWelcomeScreen() : new FlatWelcomeScreen();
myContent = new Wrapper();
setContentPane(myContent);
if (IdeFrameDecorator.isCustomDecorationActive()) {
myHeader = new DefaultFrameHeader(this);
setContentPane(CustomFrameDialogContent.getCustomContentHolder(this, myScreen.getWelcomePanel(), myHeader));
myContent.setContent(CustomFrameDialogContent.getCustomContentHolder(this, myScreen.getWelcomePanel(), myHeader));
}
else {
if (USE_TABBED_WELCOME_SCREEN && SystemInfoRt.isMac) {
rootPane.setJMenuBar(new WelcomeFrameMenuBar().setFrame(this));
}
setContentPane(myScreen.getWelcomePanel());
myContent.setContent(myScreen.getWelcomePanel());
}
IdeGlassPaneImpl glassPane = new IdeGlassPaneImpl(rootPane);
@@ -178,7 +183,7 @@ public class FlatWelcomeFrame extends JFrame implements IdeFrame, Disposable, Ac
if (USE_TABBED_WELCOME_SCREEN && SystemInfoRt.isMac) {
rootPane.setJMenuBar(new WelcomeFrameMenuBar().setFrame(this));
}
setContentPane(myScreen.getWelcomePanel());
myContent.setContent(myScreen.getWelcomePanel());
}
if (USE_TABBED_WELCOME_SCREEN) {
JBDimension defaultSize = JBUI.size(MAX_DEFAULT_WIDTH, defaultHeight);