Browse Source

Proper z-order for title pane. [windows]

pull/139/head
weisj 5 years ago
parent
commit
10b30bd896
  1. 16
      windows/src/main/java/com/github/weisj/darklaf/platform/windows/ui/WindowsTitlePane.java

16
windows/src/main/java/com/github/weisj/darklaf/platform/windows/ui/WindowsTitlePane.java

@ -268,19 +268,14 @@ public class WindowsTitlePane extends CustomTitlePane {
add(minimizeButton); add(minimizeButton);
add(maximizeToggleButton); add(maximizeToggleButton);
add(closeButton); add(closeButton);
setComponentZOrder(closeButton, 0);
setComponentZOrder(maximizeToggleButton, 1);
setComponentZOrder(minimizeButton, 2);
setComponentZOrder(windowIconButton, 3);
setComponentZOrder(titleLabel, 4);
addMenuBar(getRootPane().getJMenuBar()); addMenuBar(getRootPane().getJMenuBar());
} }
protected boolean isDialog(final int decorationStyle) {
return decorationStyle == JRootPane.PLAIN_DIALOG ||
decorationStyle == JRootPane.INFORMATION_DIALOG ||
decorationStyle == JRootPane.ERROR_DIALOG ||
decorationStyle == JRootPane.COLOR_CHOOSER_DIALOG ||
decorationStyle == JRootPane.FILE_CHOOSER_DIALOG ||
decorationStyle == JRootPane.QUESTION_DIALOG ||
decorationStyle == JRootPane.WARNING_DIALOG;
}
protected void addMenuBar(final JMenuBar menuBar) { protected void addMenuBar(final JMenuBar menuBar) {
if (menuBar != null) { if (menuBar != null) {
this.menuBar = menuBar; this.menuBar = menuBar;
@ -288,6 +283,7 @@ public class WindowsTitlePane extends CustomTitlePane {
menuBar.setPreferredSize(new Dimension(0, 0)); menuBar.setPreferredSize(new Dimension(0, 0));
menuBar.setOpaque(false); menuBar.setOpaque(false);
add(menuBar); add(menuBar);
setComponentZOrder(menuBar, 5);
} }
} }

Loading…
Cancel
Save