github
/
darklaf
mirror of https://github.com/weisJ/darklaf.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fixed popup flickering when opened.

pull/154/head
weisj 5 years ago
parent
9b7b08791d
commit
55ea6ec481
1 changed files with 75 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 78
      core/src/main/java/com/github/weisj/darklaf/ui/DarkPopupFactory.java

78
core/src/main/java/com/github/weisj/darklaf/ui/DarkPopupFactory.java
Unescape View File

@ -28,7 +28,6 @@ import java.awt.*;
import javax.swing.*;
import com.github.weisj.darklaf.graphics.PaintUtil;
import com.github.weisj.darklaf.platform.DecorationsHandler;
import com.github.weisj.darklaf.ui.rootpane.DarkRootPaneUI;
import com.github.weisj.darklaf.util.DarkUIUtil;
@ -47,55 +46,70 @@ public class DarkPopupFactory extends PopupFactory {
@Override
public Popup getPopup(final Component owner, final Component contents,
final int x, final int y) throws IllegalArgumentException {
if (heavyWeightParent == null) {
JComponent box = Box.createHorizontalBox();
super.getPopup(null, box, 0, 0);
heavyWeightParent = new HeavyWeightParent(DarkUIUtil.getWindow(box));
}
boolean isJComponent = contents instanceof JComponent;
Popup popup = super.getPopup(owner, contents, x, y);
boolean isMediumWeight = popup.getClass().getSimpleName().endsWith("MediumWeightPopup");
boolean isLightWeight = popup.getClass().getSimpleName().endsWith("LightWeightPopup");
boolean forceHeavy = isJComponent
String popupClassName = popup.getClass().getSimpleName();
boolean isLightWeight = popupClassName.endsWith("LightWeightPopup");
boolean isMediumWeight = !isLightWeight && popupClassName.endsWith("MediumWeightPopup");
boolean forceHeavy = (isMediumWeight || isLightWeight) && isJComponent
&& Boolean.TRUE.equals(((JComponent) contents).getClientProperty(KEY_FORCE_HEAVYWEIGHT));
boolean isFocusable = isJComponent
&& Boolean.TRUE.equals(((JComponent) contents).getClientProperty(KEY_FOCUSABLE_POPUP));
boolean startHidden = isJComponent
&& Boolean.TRUE.equals(((JComponent) contents).getClientProperty(KEY_START_HIDDEN));
if (forceHeavy && (isMediumWeight || isLightWeight)) {
if (forceHeavy) {
// null owner forces a heavyweight popup.
popup = super.getPopup(heavyWeightParent, contents, x, y);
popup = super.getPopup(getHeavyWeightParent(), contents, x, y);
}
if (isMediumWeight) {
JRootPane rootPane = SwingUtilities.getRootPane(contents);
// Prevents decorations from being reinstalled.
if (rootPane != null) rootPane.putClientProperty(DarkRootPaneUI.KEY_NO_DECORATIONS_UPDATE, true);
}
Window window = SwingUtilities.getWindowAncestor(contents);
if (window != null && !isMediumWeight) {
boolean isFocusable = isJComponent
&& Boolean.TRUE.equals(((JComponent) contents).getClientProperty(KEY_FOCUSABLE_POPUP));
boolean startHidden = isJComponent
&& Boolean.TRUE.equals(((JComponent) contents).getClientProperty(KEY_START_HIDDEN));
setupWindow(window, contents, isJComponent, isFocusable, startHidden);
}
return popup;
}
protected void setupWindow(final Window window, final Component contents, final boolean isJComponent,
final boolean isFocusable, final boolean startHidden) {
boolean noDecorations = isJComponent
&& Boolean.TRUE.equals(((JComponent) contents).getClientProperty(KEY_NO_DECORATION));
boolean opaque = isJComponent
&& Boolean.TRUE.equals(((JComponent) contents).getClientProperty(KEY_OPAQUE));
setupWindowBackground(window, opaque);
setupWindowFocusableState(isFocusable, window);
setupWindowDecorations(window, noDecorations);
setupWindowOpacity(contents, startHidden, window);
}
protected void setupWindowBackground(final Window window, final boolean opaque) {
// Sometimes the background is java.awt.SystemColor[i=7]
// It results in a flash of white background, that is repainted with
// the proper popup background later.
// That is why we set window background explicitly.
Window window = SwingUtilities.getWindowAncestor(contents);
if (window != null) {
boolean noDecorations = (isJComponent
&& Boolean.TRUE.equals(((JComponent) contents).getClientProperty(KEY_NO_DECORATION)));
boolean opaque = isJComponent
&& Boolean.TRUE.equals(((JComponent) contents).getClientProperty(KEY_OPAQUE));
if (window instanceof RootPaneContainer) {
JRootPane rootPane = ((RootPaneContainer) window).getRootPane();
rootPane.setOpaque(opaque);
if (opaque) {
window.setBackground(rootPane.getBackground());
} else {
rootPane.setBackground(PaintUtil.TRANSPARENT_COLOR);
rootPane.setOpaque(false);
window.setBackground(getTranslucentPopupBackground());
}
}
}
protected void setupWindowFocusableState(final boolean isFocusable, final Window window) {
if (isFocusable && !window.getFocusableWindowState()) {
window.dispose();
window.setFocusableWindowState(true);
}
}
protected void setupWindowDecorations(final Window window, final boolean noDecorations) {
if (DecorationsHandler.getSharedInstance().isCustomDecorationSupported()) {
if (noDecorations) {
DecorationsHandler.getSharedInstance().uninstallPopupWindow(window);
@ -103,14 +117,30 @@ public class DarkPopupFactory extends PopupFactory {
DecorationsHandler.getSharedInstance().installPopupWindow(window);
}
}
}
protected void setupWindowOpacity(final Component contents, final boolean startHidden, final Window window) {
if (startHidden) {
try {
if (contents instanceof JComponent) {
((JComponent) contents).putClientProperty(KEY_MAKE_VISIBLE, true);
}
window.setOpacity(0);
} catch (Exception ignored) {}
}
}
return popup;
protected HeavyWeightParent getHeavyWeightParent() {
if (heavyWeightParent == null) {
JComponent box = Box.createHorizontalBox();
super.getPopup(null, box, 0, 0);
heavyWeightParent = new HeavyWeightParent(DarkUIUtil.getWindow(box));
}
return heavyWeightParent;
}
protected Color getTranslucentPopupBackground() {
return UIManager.getColor("PopupMenu.translucentBackground");
}
private static class HeavyWeightParent extends JComponent {

Write Preview
Loading…
Cancel
Save