mirror of
https://github.com/JFormDesigner/FlatLaf.git
synced 2026-02-11 14:37:13 -06:00
Compare commits
31 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5729c20386 | ||
|
|
a4d70d8095 | ||
|
|
8fcce349d5 | ||
|
|
5a94676a3a | ||
|
|
f32d72ee62 | ||
|
|
e35fc8620c | ||
|
|
277c288952 | ||
|
|
240b08e55c | ||
|
|
fe7f345661 | ||
|
|
c8db01c958 | ||
|
|
f456185f7d | ||
|
|
801b555835 | ||
|
|
eee177e64b | ||
|
|
63639f8e96 | ||
|
|
de1b0b1bb6 | ||
|
|
bbdd7fc2b4 | ||
|
|
6addb5c4b4 | ||
|
|
b47e0c88d6 | ||
|
|
d06993d940 | ||
|
|
d31f167b9e | ||
|
|
f12ee6c167 | ||
|
|
983b341f33 | ||
|
|
f3e6642f05 | ||
|
|
0a63990d21 | ||
|
|
6909bb4b03 | ||
|
|
620aa8bcee | ||
|
|
d13ddeb944 | ||
|
|
1b5da0e1d1 | ||
|
|
7a2d0e7fcb | ||
|
|
477c3b6b1e | ||
|
|
ed91aa4648 |
38
CHANGELOG.md
38
CHANGELOG.md
@@ -1,13 +1,47 @@
|
|||||||
FlatLaf Change Log
|
FlatLaf Change Log
|
||||||
==================
|
==================
|
||||||
|
|
||||||
|
## 1.1.2
|
||||||
|
|
||||||
|
#### New features and improvements
|
||||||
|
|
||||||
|
- Native window decorations: Added API to check whether current platform
|
||||||
|
supports window decorations (`FlatLaf.supportsNativeWindowDecorations()`) and
|
||||||
|
to toggle window decorations of all windows
|
||||||
|
(`FlatLaf.setUseNativeWindowDecorations(boolean)`).
|
||||||
|
- Native window decorations: Support changing title bar background and
|
||||||
|
foreground colors per window. (set client properties
|
||||||
|
`JRootPane.titleBarBackground` and `JRootPane.titleBarForeground` on root pane
|
||||||
|
to a `java.awt.Color`).
|
||||||
|
|
||||||
|
#### Fixed bugs
|
||||||
|
|
||||||
|
- Native window decorations: Fixed loading of native library when using Java
|
||||||
|
Platform Module System (JPMS) for application. (issue #289)
|
||||||
|
- Native window decorations: Removed superfluous pixel-line at top of screen
|
||||||
|
when window is maximized. (issue #296)
|
||||||
|
- Window decorations: Fixed random window title bar background in cases were
|
||||||
|
background is not filled by custom window or root pane components and unified
|
||||||
|
background is enabled.
|
||||||
|
- IntelliJ Themes: Fixed window title bar background if unified background is
|
||||||
|
enabled.
|
||||||
|
- IntelliJ Themes: Fixed system colors.
|
||||||
|
- Button and ToggleButton: Do not paint background of disabled (and unselected)
|
||||||
|
toolBar buttons. (issue #292; regression since fixing #112)
|
||||||
|
- ComboBox and Spinner: Fixed too wide arrow button if component is higher than
|
||||||
|
preferred. (issue #302)
|
||||||
|
- SplitPane: `JSplitPane.setContinuousLayout(false)` did not work. (issue #301)
|
||||||
|
- TabbedPane: Fixed NPE when creating/modifying in another thread. (issue #299)
|
||||||
|
- Fixed crash when running in Webswing. (issue #290)
|
||||||
|
|
||||||
|
|
||||||
## 1.1.1
|
## 1.1.1
|
||||||
|
|
||||||
#### New features and improvements
|
#### New features and improvements
|
||||||
|
|
||||||
- Native window decorations: Support disabling native window decorations per
|
- Native window decorations: Support disabling native window decorations per
|
||||||
window. (set client property `JRootPane.useWindowDecorations` to `false` on
|
window. (set client property `JRootPane.useWindowDecorations` on root pane to
|
||||||
root pane).
|
`false`).
|
||||||
- Support running on WinPE. (issue #279)
|
- Support running on WinPE. (issue #279)
|
||||||
|
|
||||||
#### Fixed bugs
|
#### Fixed bugs
|
||||||
|
|||||||
@@ -104,6 +104,7 @@ Buzz
|
|||||||
----
|
----
|
||||||
|
|
||||||
- [What others say about FlatLaf on Twitter](https://twitter.com/search?f=live&q=flatlaf)
|
- [What others say about FlatLaf on Twitter](https://twitter.com/search?f=live&q=flatlaf)
|
||||||
|
- [FlatLaf 1.0 announcement on Reddit](https://www.reddit.com/r/java/comments/lsbcwe/flatlaf_10_swing_look_and_feel/)
|
||||||
- [FlatLaf announcement on Reddit](https://www.reddit.com/r/java/comments/dl0hu3/flatlaf_flat_look_and_feel/)
|
- [FlatLaf announcement on Reddit](https://www.reddit.com/r/java/comments/dl0hu3/flatlaf_flat_look_and_feel/)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
val releaseVersion = "1.1.1"
|
val releaseVersion = "1.1.2"
|
||||||
val developmentVersion = "1.2-SNAPSHOT"
|
val developmentVersion = "1.2-SNAPSHOT"
|
||||||
|
|
||||||
version = if( java.lang.Boolean.getBoolean( "release" ) ) releaseVersion else developmentVersion
|
version = if( java.lang.Boolean.getBoolean( "release" ) ) releaseVersion else developmentVersion
|
||||||
|
|||||||
@@ -233,10 +233,14 @@ public interface FlatClientProperties
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Specifies whether FlatLaf native window decorations should be used
|
* Specifies whether FlatLaf native window decorations should be used
|
||||||
* when creating {@code JFrame} or {@code JDialog}.
|
* for {@code JFrame} or {@code JDialog}.
|
||||||
* <p>
|
* <p>
|
||||||
* Setting this to {@code false} disables using FlatLaf native window decorations
|
* Setting this enables/disables using FlatLaf native window decorations
|
||||||
* for the window that contains the root pane. Needs to be set before showing the window.
|
* for the window that contains the root pane.
|
||||||
|
* <p>
|
||||||
|
* This client property has lower priority than system property
|
||||||
|
* {@link FlatSystemProperties#USE_WINDOW_DECORATIONS}, but higher priority
|
||||||
|
* than UI default {@code TitlePane.useWindowDecorations}.
|
||||||
* <p>
|
* <p>
|
||||||
* (requires Window 10)
|
* (requires Window 10)
|
||||||
* <p>
|
* <p>
|
||||||
@@ -248,8 +252,15 @@ public interface FlatClientProperties
|
|||||||
String USE_WINDOW_DECORATIONS = "JRootPane.useWindowDecorations";
|
String USE_WINDOW_DECORATIONS = "JRootPane.useWindowDecorations";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Specifies whether the menu bar is embedded into the title pane if custom
|
* Specifies whether the menu bar is embedded into the window title pane
|
||||||
* window decorations are enabled. Default is {@code true}.
|
* if window decorations are enabled.
|
||||||
|
* <p>
|
||||||
|
* Setting this enables/disables embedding
|
||||||
|
* for the window that contains the root pane.
|
||||||
|
* <p>
|
||||||
|
* This client property has lower priority than system property
|
||||||
|
* {@link FlatSystemProperties#MENUBAR_EMBEDDED}, but higher priority
|
||||||
|
* than UI default {@code TitlePane.menuBarEmbedded}.
|
||||||
* <p>
|
* <p>
|
||||||
* (requires Window 10)
|
* (requires Window 10)
|
||||||
* <p>
|
* <p>
|
||||||
@@ -258,6 +269,26 @@ public interface FlatClientProperties
|
|||||||
*/
|
*/
|
||||||
String MENU_BAR_EMBEDDED = "JRootPane.menuBarEmbedded";
|
String MENU_BAR_EMBEDDED = "JRootPane.menuBarEmbedded";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Background color of window title bar (requires enabled window decorations).
|
||||||
|
* <p>
|
||||||
|
* <strong>Component</strong> {@link javax.swing.JRootPane}<br>
|
||||||
|
* <strong>Value type</strong> {@link java.awt.Color}
|
||||||
|
*
|
||||||
|
* @since 1.1.2
|
||||||
|
*/
|
||||||
|
String TITLE_BAR_BACKGROUND = "JRootPane.titleBarBackground";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Foreground color of window title bar (requires enabled window decorations).
|
||||||
|
* <p>
|
||||||
|
* <strong>Component</strong> {@link javax.swing.JRootPane}<br>
|
||||||
|
* <strong>Value type</strong> {@link java.awt.Color}
|
||||||
|
*
|
||||||
|
* @since 1.1.2
|
||||||
|
*/
|
||||||
|
String TITLE_BAR_FOREGROUND = "JRootPane.titleBarForeground";
|
||||||
|
|
||||||
//---- JScrollBar / JScrollPane -------------------------------------------
|
//---- JScrollBar / JScrollPane -------------------------------------------
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -46,6 +46,7 @@ import javax.swing.JDialog;
|
|||||||
import javax.swing.JFrame;
|
import javax.swing.JFrame;
|
||||||
import javax.swing.LookAndFeel;
|
import javax.swing.LookAndFeel;
|
||||||
import javax.swing.PopupFactory;
|
import javax.swing.PopupFactory;
|
||||||
|
import javax.swing.RootPaneContainer;
|
||||||
import javax.swing.SwingUtilities;
|
import javax.swing.SwingUtilities;
|
||||||
import javax.swing.UIDefaults;
|
import javax.swing.UIDefaults;
|
||||||
import javax.swing.UIDefaults.ActiveValue;
|
import javax.swing.UIDefaults.ActiveValue;
|
||||||
@@ -59,6 +60,7 @@ import javax.swing.text.StyleContext;
|
|||||||
import javax.swing.text.html.HTMLEditorKit;
|
import javax.swing.text.html.HTMLEditorKit;
|
||||||
import com.formdev.flatlaf.ui.FlatNativeWindowBorder;
|
import com.formdev.flatlaf.ui.FlatNativeWindowBorder;
|
||||||
import com.formdev.flatlaf.ui.FlatPopupFactory;
|
import com.formdev.flatlaf.ui.FlatPopupFactory;
|
||||||
|
import com.formdev.flatlaf.ui.FlatRootPaneUI;
|
||||||
import com.formdev.flatlaf.util.GrayFilter;
|
import com.formdev.flatlaf.util.GrayFilter;
|
||||||
import com.formdev.flatlaf.util.LoggingFacade;
|
import com.formdev.flatlaf.util.LoggingFacade;
|
||||||
import com.formdev.flatlaf.util.MultiResolutionImageSupport;
|
import com.formdev.flatlaf.util.MultiResolutionImageSupport;
|
||||||
@@ -157,7 +159,7 @@ public abstract class FlatLaf
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public boolean getSupportsWindowDecorations() {
|
public boolean getSupportsWindowDecorations() {
|
||||||
if( SystemInfo.isProjector || SystemInfo.isWinPE )
|
if( SystemInfo.isProjector || SystemInfo.isWebswing || SystemInfo.isWinPE )
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if( SystemInfo.isWindows_10_orLater &&
|
if( SystemInfo.isWindows_10_orLater &&
|
||||||
@@ -443,12 +445,17 @@ public abstract class FlatLaf
|
|||||||
FontUIResource uiFont = null;
|
FontUIResource uiFont = null;
|
||||||
|
|
||||||
if( SystemInfo.isWindows ) {
|
if( SystemInfo.isWindows ) {
|
||||||
|
Font winFont = (Font) Toolkit.getDefaultToolkit().getDesktopProperty( "win.messagebox.font" );
|
||||||
|
if( winFont != null ) {
|
||||||
|
if( SystemInfo.isWinPE ) {
|
||||||
// on WinPE use "win.defaultGUI.font", which is usually Tahoma,
|
// on WinPE use "win.defaultGUI.font", which is usually Tahoma,
|
||||||
// because Segoe UI font is not available on WinPE
|
// because Segoe UI font is not available on WinPE
|
||||||
Font winFont = (Font) Toolkit.getDefaultToolkit().getDesktopProperty(
|
Font winPEFont = (Font) Toolkit.getDefaultToolkit().getDesktopProperty( "win.defaultGUI.font" );
|
||||||
SystemInfo.isWinPE ? "win.defaultGUI.font" : "win.messagebox.font" );
|
if( winPEFont != null )
|
||||||
if( winFont != null )
|
uiFont = createCompositeFont( winPEFont.getFamily(), winPEFont.getStyle(), winFont.getSize() );
|
||||||
|
} else
|
||||||
uiFont = createCompositeFont( winFont.getFamily(), winFont.getStyle(), winFont.getSize() );
|
uiFont = createCompositeFont( winFont.getFamily(), winFont.getStyle(), winFont.getSize() );
|
||||||
|
}
|
||||||
|
|
||||||
} else if( SystemInfo.isMacOS ) {
|
} else if( SystemInfo.isMacOS ) {
|
||||||
String fontName;
|
String fontName;
|
||||||
@@ -710,6 +717,79 @@ public abstract class FlatLaf
|
|||||||
} );
|
} );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns whether native window decorations are supported on current platform.
|
||||||
|
* <p>
|
||||||
|
* This requires Windows 10, but may be disabled if running in special environments
|
||||||
|
* (JetBrains Projector, Webswing or WinPE) or if loading native library fails.
|
||||||
|
* If system property {@link FlatSystemProperties#USE_WINDOW_DECORATIONS} is set to
|
||||||
|
* {@code false}, then this method also returns {@code false}.
|
||||||
|
*
|
||||||
|
* @since 1.1.2
|
||||||
|
*/
|
||||||
|
public static boolean supportsNativeWindowDecorations() {
|
||||||
|
return SystemInfo.isWindows_10_orLater && FlatNativeWindowBorder.isSupported();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns whether native window decorations are enabled.
|
||||||
|
*
|
||||||
|
* @since 1.1.2
|
||||||
|
*/
|
||||||
|
public static boolean isUseNativeWindowDecorations() {
|
||||||
|
return UIManager.getBoolean( "TitlePane.useWindowDecorations" );
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets whether native window decorations are enabled.
|
||||||
|
* <p>
|
||||||
|
* Existing frames and dialogs will be updated.
|
||||||
|
*
|
||||||
|
* @since 1.1.2
|
||||||
|
*/
|
||||||
|
public static void setUseNativeWindowDecorations( boolean enabled ) {
|
||||||
|
UIManager.put( "TitlePane.useWindowDecorations", enabled );
|
||||||
|
|
||||||
|
if( !(UIManager.getLookAndFeel() instanceof FlatLaf) )
|
||||||
|
return;
|
||||||
|
|
||||||
|
// update existing frames and dialogs
|
||||||
|
for( Window w : Window.getWindows() ) {
|
||||||
|
if( isDisplayableFrameOrDialog( w ) )
|
||||||
|
FlatRootPaneUI.updateNativeWindowBorder( ((RootPaneContainer)w).getRootPane() );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Revalidate and repaint all displayable frames and dialogs.
|
||||||
|
*
|
||||||
|
* @since 1.1.2
|
||||||
|
*/
|
||||||
|
public static void revalidateAndRepaintAllFramesAndDialogs() {
|
||||||
|
for( Window w : Window.getWindows() ) {
|
||||||
|
if( isDisplayableFrameOrDialog( w ) ) {
|
||||||
|
w.revalidate();
|
||||||
|
w.repaint();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Repaint all displayable frames and dialogs.
|
||||||
|
*
|
||||||
|
* @since 1.1.2
|
||||||
|
*/
|
||||||
|
public static void repaintAllFramesAndDialogs() {
|
||||||
|
for( Window w : Window.getWindows() ) {
|
||||||
|
if( isDisplayableFrameOrDialog( w ) )
|
||||||
|
w.repaint();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean isDisplayableFrameOrDialog( Window w ) {
|
||||||
|
return w.isDisplayable() && (w instanceof JFrame || w instanceof JDialog);
|
||||||
|
}
|
||||||
|
|
||||||
public static boolean isShowMnemonics() {
|
public static boolean isShowMnemonics() {
|
||||||
return MnemonicHandler.isShowMnemonics();
|
return MnemonicHandler.isShowMnemonics();
|
||||||
}
|
}
|
||||||
@@ -753,6 +833,10 @@ public abstract class FlatLaf
|
|||||||
public Object createValue( UIDefaults table ) {
|
public Object createValue( UIDefaults table ) {
|
||||||
Font defaultFont = UIManager.getFont( "defaultFont" );
|
Font defaultFont = UIManager.getFont( "defaultFont" );
|
||||||
|
|
||||||
|
// fallback (to avoid NPE in case that this is used in another Laf)
|
||||||
|
if( defaultFont == null )
|
||||||
|
defaultFont = UIManager.getFont( "Label.font" );
|
||||||
|
|
||||||
if( lastDefaultFont != defaultFont ) {
|
if( lastDefaultFont != defaultFont ) {
|
||||||
lastDefaultFont = defaultFont;
|
lastDefaultFont = defaultFont;
|
||||||
|
|
||||||
|
|||||||
@@ -16,6 +16,8 @@
|
|||||||
|
|
||||||
package com.formdev.flatlaf;
|
package com.formdev.flatlaf;
|
||||||
|
|
||||||
|
import com.formdev.flatlaf.util.UIScale;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Defines/documents own system properties used in FlatLaf.
|
* Defines/documents own system properties used in FlatLaf.
|
||||||
*
|
*
|
||||||
@@ -32,6 +34,8 @@ public interface FlatSystemProperties
|
|||||||
* To replace the Java 9+ system scale factor, use system property "sun.java2d.uiScale",
|
* To replace the Java 9+ system scale factor, use system property "sun.java2d.uiScale",
|
||||||
* which has the same syntax as this one.
|
* which has the same syntax as this one.
|
||||||
* <p>
|
* <p>
|
||||||
|
* Since FlatLaf 1.1.2: Scale factors less then 100% are allowed.
|
||||||
|
* <p>
|
||||||
* <strong>Allowed Values</strong> e.g. {@code 1.5}, {@code 1.5x}, {@code 150%} or {@code 144dpi} (96dpi is 100%)<br>
|
* <strong>Allowed Values</strong> e.g. {@code 1.5}, {@code 1.5x}, {@code 150%} or {@code 144dpi} (96dpi is 100%)<br>
|
||||||
*/
|
*/
|
||||||
String UI_SCALE = "flatlaf.uiScale";
|
String UI_SCALE = "flatlaf.uiScale";
|
||||||
@@ -44,6 +48,17 @@ public interface FlatSystemProperties
|
|||||||
*/
|
*/
|
||||||
String UI_SCALE_ENABLED = "flatlaf.uiScale.enabled";
|
String UI_SCALE_ENABLED = "flatlaf.uiScale.enabled";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Specifies whether values smaller than 100% are allowed for the user scale factor
|
||||||
|
* (see {@link UIScale#getUserScaleFactor()}).
|
||||||
|
* <p>
|
||||||
|
* <strong>Allowed Values</strong> {@code false} and {@code true}<br>
|
||||||
|
* <strong>Default</strong> {@code false}
|
||||||
|
*
|
||||||
|
* @since 1.1.2
|
||||||
|
*/
|
||||||
|
String UI_SCALE_ALLOW_SCALE_DOWN = "flatlaf.uiScale.allowScaleDown";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Specifies whether Ubuntu font should be used on Ubuntu Linux.
|
* Specifies whether Ubuntu font should be used on Ubuntu Linux.
|
||||||
* By default, if not running in a JetBrains Runtime, the Liberation Sans font
|
* By default, if not running in a JetBrains Runtime, the Liberation Sans font
|
||||||
@@ -55,13 +70,16 @@ public interface FlatSystemProperties
|
|||||||
String USE_UBUNTU_FONT = "flatlaf.useUbuntuFont";
|
String USE_UBUNTU_FONT = "flatlaf.useUbuntuFont";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Specifies whether FlatLaf native window decorations should be used
|
* Specifies whether native window decorations should be used
|
||||||
* when creating {@code JFrame} or {@code JDialog}.
|
* when creating {@code JFrame} or {@code JDialog}.
|
||||||
* <p>
|
* <p>
|
||||||
* Setting this to {@code true} forces using FlatLaf native window decorations
|
* Setting this to {@code true} forces using native window decorations
|
||||||
* even if they are not enabled by the application.
|
* even if they are not enabled by the application.<br>
|
||||||
|
* Setting this to {@code false} disables using native window decorations.
|
||||||
* <p>
|
* <p>
|
||||||
* Setting this to {@code false} disables using FlatLaf native window decorations.
|
* This system property has higher priority than client property
|
||||||
|
* {@link FlatClientProperties#USE_WINDOW_DECORATIONS} and
|
||||||
|
* UI default {@code TitlePane.useWindowDecorations}.
|
||||||
* <p>
|
* <p>
|
||||||
* (requires Window 10)
|
* (requires Window 10)
|
||||||
* <p>
|
* <p>
|
||||||
@@ -77,26 +95,32 @@ public interface FlatSystemProperties
|
|||||||
* <a href="https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime">JetBrains Runtime</a>
|
* <a href="https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime">JetBrains Runtime</a>
|
||||||
* (based on OpenJDK).
|
* (based on OpenJDK).
|
||||||
* <p>
|
* <p>
|
||||||
* Setting this to {@code true} forces using JetBrains Runtime custom window decorations
|
|
||||||
* even if they are not enabled by the application.
|
|
||||||
* <p>
|
|
||||||
* Setting this to {@code false} disables using JetBrains Runtime custom window decorations.
|
* Setting this to {@code false} disables using JetBrains Runtime custom window decorations.
|
||||||
|
* Then FlatLaf native window decorations are used.
|
||||||
|
* <p>
|
||||||
|
* (requires Window 10)
|
||||||
|
* <p>
|
||||||
|
* <strong>Allowed Values</strong> {@code false} and {@code true}<br>
|
||||||
|
* <strong>Default</strong> true
|
||||||
|
*/
|
||||||
|
String USE_JETBRAINS_CUSTOM_DECORATIONS = "flatlaf.useJetBrainsCustomDecorations";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Specifies whether the menu bar is embedded into the window title pane
|
||||||
|
* if window decorations are enabled.
|
||||||
|
* <p>
|
||||||
|
* Setting this to {@code true} forces embedding.<br>
|
||||||
|
* Setting this to {@code false} disables embedding.
|
||||||
|
* <p>
|
||||||
|
* This system property has higher priority than client property
|
||||||
|
* {@link FlatClientProperties#MENU_BAR_EMBEDDED} and
|
||||||
|
* UI default {@code TitlePane.menuBarEmbedded}.
|
||||||
* <p>
|
* <p>
|
||||||
* (requires Window 10)
|
* (requires Window 10)
|
||||||
* <p>
|
* <p>
|
||||||
* <strong>Allowed Values</strong> {@code false} and {@code true}<br>
|
* <strong>Allowed Values</strong> {@code false} and {@code true}<br>
|
||||||
* <strong>Default</strong> none
|
* <strong>Default</strong> none
|
||||||
*/
|
*/
|
||||||
String USE_JETBRAINS_CUSTOM_DECORATIONS = "flatlaf.useJetBrainsCustomDecorations";
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Specifies whether menubar is embedded into custom window decorations.
|
|
||||||
* <p>
|
|
||||||
* (requires Window 10)
|
|
||||||
* <p>
|
|
||||||
* <strong>Allowed Values</strong> {@code false} and {@code true}<br>
|
|
||||||
* <strong>Default</strong> {@code true}
|
|
||||||
*/
|
|
||||||
String MENUBAR_EMBEDDED = "flatlaf.menuBarEmbedded";
|
String MENUBAR_EMBEDDED = "flatlaf.menuBarEmbedded";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2021 FormDev Software GmbH
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* https://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.formdev.flatlaf.resources;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The only purpose of this file is to add a .class file to this package to make it non-empty.
|
||||||
|
* Otherwise the compiler outputs a warning because this package is opend in module-info.java.
|
||||||
|
* Also when using --patch-module (e.g. from an IDE), an error would occur for empty packages.
|
||||||
|
*
|
||||||
|
* @author Karl Tauber
|
||||||
|
*/
|
||||||
|
interface EmptyPackage
|
||||||
|
{
|
||||||
|
}
|
||||||
@@ -388,41 +388,35 @@ public class FlatButtonUI
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected Color getBackground( JComponent c ) {
|
protected Color getBackground( JComponent c ) {
|
||||||
if( ((AbstractButton)c).isSelected() ) {
|
|
||||||
// in toolbar use same colors for disabled and enabled because
|
|
||||||
// we assume that toolbar icon is shown disabled
|
|
||||||
boolean toolBarButton = isToolBarButton( c );
|
boolean toolBarButton = isToolBarButton( c );
|
||||||
|
|
||||||
|
// selected state
|
||||||
|
if( ((AbstractButton)c).isSelected() ) {
|
||||||
|
// in toolbar use same background colors for disabled and enabled because
|
||||||
|
// we assume that toolbar icon is shown disabled
|
||||||
return buttonStateColor( c,
|
return buttonStateColor( c,
|
||||||
toolBarButton ? toolbarSelectedBackground : selectedBackground,
|
toolBarButton ? toolbarSelectedBackground : selectedBackground,
|
||||||
toolBarButton ? toolbarSelectedBackground : disabledSelectedBackground,
|
toolBarButton ? toolbarSelectedBackground : disabledSelectedBackground,
|
||||||
null, null,
|
null,
|
||||||
|
null,
|
||||||
toolBarButton ? toolbarPressedBackground : pressedBackground );
|
toolBarButton ? toolbarPressedBackground : pressedBackground );
|
||||||
}
|
}
|
||||||
|
|
||||||
if( !c.isEnabled() )
|
|
||||||
return disabledBackground;
|
|
||||||
|
|
||||||
// toolbar button
|
// toolbar button
|
||||||
if( isToolBarButton( c ) ) {
|
if( toolBarButton ) {
|
||||||
ButtonModel model = ((AbstractButton)c).getModel();
|
|
||||||
if( model.isPressed() )
|
|
||||||
return toolbarPressedBackground;
|
|
||||||
if( model.isRollover() )
|
|
||||||
return toolbarHoverBackground;
|
|
||||||
|
|
||||||
// use component background if explicitly set
|
|
||||||
Color bg = c.getBackground();
|
Color bg = c.getBackground();
|
||||||
if( isCustomBackground( bg ) )
|
return buttonStateColor( c,
|
||||||
return bg;
|
isCustomBackground( bg ) ? bg : null,
|
||||||
|
null,
|
||||||
// do not paint background
|
null,
|
||||||
return null;
|
toolbarHoverBackground,
|
||||||
|
toolbarPressedBackground );
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean def = isDefaultButton( c );
|
boolean def = isDefaultButton( c );
|
||||||
return buttonStateColor( c,
|
return buttonStateColor( c,
|
||||||
getBackgroundBase( c, def ),
|
getBackgroundBase( c, def ),
|
||||||
null,
|
disabledBackground,
|
||||||
isCustomBackground( c.getBackground() ) ? null : (def ? defaultFocusedBackground : focusedBackground),
|
isCustomBackground( c.getBackground() ) ? null : (def ? defaultFocusedBackground : focusedBackground),
|
||||||
def ? defaultHoverBackground : hoverBackground,
|
def ? defaultHoverBackground : hoverBackground,
|
||||||
def ? defaultPressedBackground : pressedBackground );
|
def ? defaultPressedBackground : pressedBackground );
|
||||||
@@ -444,16 +438,18 @@ public class FlatButtonUI
|
|||||||
public static Color buttonStateColor( Component c, Color enabledColor, Color disabledColor,
|
public static Color buttonStateColor( Component c, Color enabledColor, Color disabledColor,
|
||||||
Color focusedColor, Color hoverColor, Color pressedColor )
|
Color focusedColor, Color hoverColor, Color pressedColor )
|
||||||
{
|
{
|
||||||
AbstractButton b = (c instanceof AbstractButton) ? (AbstractButton) c : null;
|
|
||||||
|
|
||||||
if( !c.isEnabled() )
|
if( !c.isEnabled() )
|
||||||
return disabledColor;
|
return disabledColor;
|
||||||
|
|
||||||
if( pressedColor != null && b != null && b.getModel().isPressed() )
|
if( c instanceof AbstractButton ) {
|
||||||
|
ButtonModel model = ((AbstractButton)c).getModel();
|
||||||
|
|
||||||
|
if( pressedColor != null && model.isPressed() )
|
||||||
return pressedColor;
|
return pressedColor;
|
||||||
|
|
||||||
if( hoverColor != null && b != null && b.getModel().isRollover() )
|
if( hoverColor != null && model.isRollover() )
|
||||||
return hoverColor;
|
return hoverColor;
|
||||||
|
}
|
||||||
|
|
||||||
if( focusedColor != null && isFocusPainted( c ) && FlatUIUtils.isPermanentFocusOwner( c ) )
|
if( focusedColor != null && isFocusPainted( c ) && FlatUIUtils.isPermanentFocusOwner( c ) )
|
||||||
return focusedColor;
|
return focusedColor;
|
||||||
|
|||||||
@@ -243,6 +243,23 @@ public class FlatComboBoxUI
|
|||||||
public void layoutContainer( Container parent ) {
|
public void layoutContainer( Container parent ) {
|
||||||
super.layoutContainer( parent );
|
super.layoutContainer( parent );
|
||||||
|
|
||||||
|
if( arrowButton != null ) {
|
||||||
|
Insets insets = getInsets();
|
||||||
|
int buttonWidth = parent.getPreferredSize().height - insets.top - insets.bottom;
|
||||||
|
if( buttonWidth != arrowButton.getWidth() ) {
|
||||||
|
// set width of arrow button to preferred height of combobox
|
||||||
|
int xOffset = comboBox.getComponentOrientation().isLeftToRight()
|
||||||
|
? arrowButton.getWidth() - buttonWidth
|
||||||
|
: 0;
|
||||||
|
arrowButton.setBounds( arrowButton.getX() + xOffset, arrowButton.getY(),
|
||||||
|
buttonWidth, arrowButton.getHeight() );
|
||||||
|
|
||||||
|
// update editor bounds
|
||||||
|
if( editor != null )
|
||||||
|
editor.setBounds( rectangleForCurrentValue() );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if( editor != null && padding != null ) {
|
if( editor != null && padding != null ) {
|
||||||
// fix editor bounds by subtracting padding
|
// fix editor bounds by subtracting padding
|
||||||
editor.setBounds( FlatUIUtils.subtractInsets( editor.getBounds(), padding ) );
|
editor.setBounds( FlatUIUtils.subtractInsets( editor.getBounds(), padding ) );
|
||||||
|
|||||||
@@ -16,6 +16,7 @@
|
|||||||
|
|
||||||
package com.formdev.flatlaf.ui;
|
package com.formdev.flatlaf.ui;
|
||||||
|
|
||||||
|
import java.awt.Color;
|
||||||
import java.awt.Graphics;
|
import java.awt.Graphics;
|
||||||
import java.awt.Window;
|
import java.awt.Window;
|
||||||
import java.awt.event.ActionEvent;
|
import java.awt.event.ActionEvent;
|
||||||
@@ -53,8 +54,6 @@ import com.formdev.flatlaf.util.SystemInfo;
|
|||||||
public class FlatMenuBarUI
|
public class FlatMenuBarUI
|
||||||
extends BasicMenuBarUI
|
extends BasicMenuBarUI
|
||||||
{
|
{
|
||||||
protected boolean unifiedBackground;
|
|
||||||
|
|
||||||
public static ComponentUI createUI( JComponent c ) {
|
public static ComponentUI createUI( JComponent c ) {
|
||||||
return new FlatMenuBarUI();
|
return new FlatMenuBarUI();
|
||||||
}
|
}
|
||||||
@@ -69,8 +68,6 @@ public class FlatMenuBarUI
|
|||||||
super.installDefaults();
|
super.installDefaults();
|
||||||
|
|
||||||
LookAndFeel.installProperty( menuBar, "opaque", false );
|
LookAndFeel.installProperty( menuBar, "opaque", false );
|
||||||
|
|
||||||
unifiedBackground = UIManager.getBoolean( "TitlePane.unifiedBackground" );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -88,34 +85,39 @@ public class FlatMenuBarUI
|
|||||||
@Override
|
@Override
|
||||||
public void update( Graphics g, JComponent c ) {
|
public void update( Graphics g, JComponent c ) {
|
||||||
// paint background
|
// paint background
|
||||||
if( isFillBackground( c ) ) {
|
Color background = getBackground( c );
|
||||||
g.setColor( c.getBackground() );
|
if( background != null ) {
|
||||||
|
g.setColor( background );
|
||||||
g.fillRect( 0, 0, c.getWidth(), c.getHeight() );
|
g.fillRect( 0, 0, c.getWidth(), c.getHeight() );
|
||||||
}
|
}
|
||||||
|
|
||||||
paint( g, c );
|
paint( g, c );
|
||||||
}
|
}
|
||||||
|
|
||||||
protected boolean isFillBackground( JComponent c ) {
|
protected Color getBackground( JComponent c ) {
|
||||||
|
Color background = c.getBackground();
|
||||||
|
|
||||||
// paint background if opaque or if having custom background color
|
// paint background if opaque or if having custom background color
|
||||||
if( c.isOpaque() || !(c.getBackground() instanceof UIResource) )
|
if( c.isOpaque() || !(background instanceof UIResource) )
|
||||||
return true;
|
return background;
|
||||||
|
|
||||||
// paint background if menu bar is not the "main" menu bar
|
// paint background if menu bar is not the "main" menu bar
|
||||||
JRootPane rootPane = SwingUtilities.getRootPane( c );
|
JRootPane rootPane = SwingUtilities.getRootPane( c );
|
||||||
if( rootPane == null || !(rootPane.getParent() instanceof Window) || rootPane.getJMenuBar() != c )
|
if( rootPane == null || !(rootPane.getParent() instanceof Window) || rootPane.getJMenuBar() != c )
|
||||||
return true;
|
return background;
|
||||||
|
|
||||||
// do not paint background for unified title pane
|
// use parent background for unified title pane
|
||||||
if( unifiedBackground )
|
// (not storing value of "TitlePane.unifiedBackground" in class to allow changing at runtime)
|
||||||
return false;
|
if( UIManager.getBoolean( "TitlePane.unifiedBackground" ) &&
|
||||||
|
FlatNativeWindowBorder.hasCustomDecoration( (Window) rootPane.getParent() ) )
|
||||||
|
background = FlatUIUtils.getParentBackground( c );
|
||||||
|
|
||||||
// paint background in full screen mode
|
// paint background in full screen mode
|
||||||
if( FlatUIUtils.isFullScreen( rootPane ) )
|
if( FlatUIUtils.isFullScreen( rootPane ) )
|
||||||
return true;
|
return background;
|
||||||
|
|
||||||
// do not paint background if menu bar is embedded into title pane
|
// do not paint background if menu bar is embedded into title pane
|
||||||
return !FlatRootPaneUI.isMenuBarEmbedded( rootPane );
|
return FlatRootPaneUI.isMenuBarEmbedded( rootPane ) ? null : background;
|
||||||
}
|
}
|
||||||
|
|
||||||
//---- class TakeFocus ----------------------------------------------------
|
//---- class TakeFocus ----------------------------------------------------
|
||||||
|
|||||||
@@ -41,9 +41,22 @@ import com.formdev.flatlaf.util.SystemInfo;
|
|||||||
*/
|
*/
|
||||||
public class FlatNativeWindowBorder
|
public class FlatNativeWindowBorder
|
||||||
{
|
{
|
||||||
|
// can use window decorations if:
|
||||||
|
// - on Windows 10
|
||||||
|
// - not when running in JetBrains Projector, Webswing or WinPE
|
||||||
|
// - not disabled via system property
|
||||||
|
private static final boolean canUseWindowDecorations =
|
||||||
|
SystemInfo.isWindows_10_orLater &&
|
||||||
|
!SystemInfo.isProjector &&
|
||||||
|
!SystemInfo.isWebswing &&
|
||||||
|
!SystemInfo.isWinPE &&
|
||||||
|
FlatSystemProperties.getBoolean( FlatSystemProperties.USE_WINDOW_DECORATIONS, true );
|
||||||
|
|
||||||
// check this field before using class JBRCustomDecorations to avoid unnecessary loading of that class
|
// check this field before using class JBRCustomDecorations to avoid unnecessary loading of that class
|
||||||
private static final boolean canUseJBRCustomDecorations
|
private static final boolean canUseJBRCustomDecorations =
|
||||||
= SystemInfo.isJetBrainsJVM_11_orLater && SystemInfo.isWindows_10_orLater;
|
canUseWindowDecorations &&
|
||||||
|
SystemInfo.isJetBrainsJVM_11_orLater &&
|
||||||
|
FlatSystemProperties.getBoolean( FlatSystemProperties.USE_JETBRAINS_CUSTOM_DECORATIONS, true );
|
||||||
|
|
||||||
private static Boolean supported;
|
private static Boolean supported;
|
||||||
private static Provider nativeProvider;
|
private static Provider nativeProvider;
|
||||||
@@ -72,7 +85,7 @@ public class FlatNativeWindowBorder
|
|||||||
// It could be also be a window that is currently hidden, but may be shown later.
|
// It could be also be a window that is currently hidden, but may be shown later.
|
||||||
Window window = SwingUtilities.windowForComponent( rootPane );
|
Window window = SwingUtilities.windowForComponent( rootPane );
|
||||||
if( window != null && window.isDisplayable() )
|
if( window != null && window.isDisplayable() )
|
||||||
install( window, FlatSystemProperties.USE_WINDOW_DECORATIONS );
|
install( window );
|
||||||
|
|
||||||
// Install FlatLaf native window border, which must be done late,
|
// Install FlatLaf native window border, which must be done late,
|
||||||
// when the native window is already created, because it needs access to the window.
|
// when the native window is already created, because it needs access to the window.
|
||||||
@@ -81,7 +94,7 @@ public class FlatNativeWindowBorder
|
|||||||
PropertyChangeListener ancestorListener = e -> {
|
PropertyChangeListener ancestorListener = e -> {
|
||||||
Object newValue = e.getNewValue();
|
Object newValue = e.getNewValue();
|
||||||
if( newValue instanceof Window )
|
if( newValue instanceof Window )
|
||||||
install( (Window) newValue, FlatSystemProperties.USE_WINDOW_DECORATIONS );
|
install( (Window) newValue );
|
||||||
else if( newValue == null && e.getOldValue() instanceof Window )
|
else if( newValue == null && e.getOldValue() instanceof Window )
|
||||||
uninstall( (Window) e.getOldValue() );
|
uninstall( (Window) e.getOldValue() );
|
||||||
};
|
};
|
||||||
@@ -89,7 +102,7 @@ public class FlatNativeWindowBorder
|
|||||||
return ancestorListener;
|
return ancestorListener;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void install( Window window, String systemPropertyKey ) {
|
static void install( Window window ) {
|
||||||
if( hasCustomDecoration( window ) )
|
if( hasCustomDecoration( window ) )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -99,16 +112,10 @@ public class FlatNativeWindowBorder
|
|||||||
|
|
||||||
if( window instanceof JFrame ) {
|
if( window instanceof JFrame ) {
|
||||||
JFrame frame = (JFrame) window;
|
JFrame frame = (JFrame) window;
|
||||||
|
JRootPane rootPane = frame.getRootPane();
|
||||||
|
|
||||||
// check whether disabled via client property
|
// check whether disabled via system property, client property or UI default
|
||||||
if( !FlatClientProperties.clientPropertyBoolean( frame.getRootPane(), FlatClientProperties.USE_WINDOW_DECORATIONS, true ) )
|
if( !useWindowDecorations( rootPane ) )
|
||||||
return;
|
|
||||||
|
|
||||||
// do not enable native window border if JFrame should use system window decorations
|
|
||||||
// and if not forced to use FlatLaf/JBR native window decorations
|
|
||||||
if( !JFrame.isDefaultLookAndFeelDecorated() &&
|
|
||||||
!UIManager.getBoolean( "TitlePane.useWindowDecorations" ) &&
|
|
||||||
!FlatSystemProperties.getBoolean( systemPropertyKey, false ) )
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// do not enable native window border if frame is undecorated
|
// do not enable native window border if frame is undecorated
|
||||||
@@ -119,20 +126,14 @@ public class FlatNativeWindowBorder
|
|||||||
setHasCustomDecoration( frame, true );
|
setHasCustomDecoration( frame, true );
|
||||||
|
|
||||||
// enable Swing window decoration
|
// enable Swing window decoration
|
||||||
frame.getRootPane().setWindowDecorationStyle( JRootPane.FRAME );
|
rootPane.setWindowDecorationStyle( JRootPane.FRAME );
|
||||||
|
|
||||||
} else if( window instanceof JDialog ) {
|
} else if( window instanceof JDialog ) {
|
||||||
JDialog dialog = (JDialog) window;
|
JDialog dialog = (JDialog) window;
|
||||||
|
JRootPane rootPane = dialog.getRootPane();
|
||||||
|
|
||||||
// check whether disabled via client property
|
// check whether disabled via system property, client property or UI default
|
||||||
if( !FlatClientProperties.clientPropertyBoolean( dialog.getRootPane(), FlatClientProperties.USE_WINDOW_DECORATIONS, true ) )
|
if( !useWindowDecorations( rootPane ) )
|
||||||
return;
|
|
||||||
|
|
||||||
// do not enable native window border if JDialog should use system window decorations
|
|
||||||
// and if not forced to use FlatLaf/JBR native window decorations
|
|
||||||
if( !JDialog.isDefaultLookAndFeelDecorated() &&
|
|
||||||
!UIManager.getBoolean( "TitlePane.useWindowDecorations" ) &&
|
|
||||||
!FlatSystemProperties.getBoolean( systemPropertyKey, false ) )
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// do not enable native window border if dialog is undecorated
|
// do not enable native window border if dialog is undecorated
|
||||||
@@ -143,7 +144,7 @@ public class FlatNativeWindowBorder
|
|||||||
setHasCustomDecoration( dialog, true );
|
setHasCustomDecoration( dialog, true );
|
||||||
|
|
||||||
// enable Swing window decoration
|
// enable Swing window decoration
|
||||||
dialog.getRootPane().setWindowDecorationStyle( JRootPane.PLAIN_DIALOG );
|
rootPane.setWindowDecorationStyle( JRootPane.PLAIN_DIALOG );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -153,12 +154,15 @@ public class FlatNativeWindowBorder
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if( !isSupported() )
|
||||||
|
return;
|
||||||
|
|
||||||
// remove listener
|
// remove listener
|
||||||
if( data instanceof PropertyChangeListener )
|
if( data instanceof PropertyChangeListener )
|
||||||
rootPane.removePropertyChangeListener( "ancestor", (PropertyChangeListener) data );
|
rootPane.removePropertyChangeListener( "ancestor", (PropertyChangeListener) data );
|
||||||
|
|
||||||
// do not uninstall when switching to another FlatLaf theme
|
// do not uninstall when switching to another FlatLaf theme and if still enabled
|
||||||
if( UIManager.getLookAndFeel() instanceof FlatLaf )
|
if( UIManager.getLookAndFeel() instanceof FlatLaf && useWindowDecorations( rootPane ) )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// uninstall native window border
|
// uninstall native window border
|
||||||
@@ -188,6 +192,14 @@ public class FlatNativeWindowBorder
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static boolean useWindowDecorations( JRootPane rootPane ) {
|
||||||
|
return FlatUIUtils.getBoolean( rootPane,
|
||||||
|
FlatSystemProperties.USE_WINDOW_DECORATIONS,
|
||||||
|
FlatClientProperties.USE_WINDOW_DECORATIONS,
|
||||||
|
"TitlePane.useWindowDecorations",
|
||||||
|
false );
|
||||||
|
}
|
||||||
|
|
||||||
public static boolean hasCustomDecoration( Window window ) {
|
public static boolean hasCustomDecoration( Window window ) {
|
||||||
if( canUseJBRCustomDecorations )
|
if( canUseJBRCustomDecorations )
|
||||||
return JBRCustomDecorations.hasCustomDecoration( window );
|
return JBRCustomDecorations.hasCustomDecoration( window );
|
||||||
@@ -238,16 +250,7 @@ public class FlatNativeWindowBorder
|
|||||||
return;
|
return;
|
||||||
supported = false;
|
supported = false;
|
||||||
|
|
||||||
// requires Windows 10
|
if( !canUseWindowDecorations )
|
||||||
if( !SystemInfo.isWindows_10_orLater )
|
|
||||||
return;
|
|
||||||
|
|
||||||
// do not use when running in JetBrains Projector or WinPE
|
|
||||||
if( SystemInfo.isProjector || SystemInfo.isWinPE )
|
|
||||||
return;
|
|
||||||
|
|
||||||
// check whether disabled via system property
|
|
||||||
if( !FlatSystemProperties.getBoolean( FlatSystemProperties.USE_WINDOW_DECORATIONS, true ) )
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -70,7 +70,7 @@ public class FlatPopupFactory
|
|||||||
|
|
||||||
boolean forceHeavyWeight = isOptionEnabled( owner, contents, FlatClientProperties.POPUP_FORCE_HEAVY_WEIGHT, "Popup.forceHeavyWeight" );
|
boolean forceHeavyWeight = isOptionEnabled( owner, contents, FlatClientProperties.POPUP_FORCE_HEAVY_WEIGHT, "Popup.forceHeavyWeight" );
|
||||||
|
|
||||||
if( !isOptionEnabled( owner, contents, FlatClientProperties.POPUP_DROP_SHADOW_PAINTED, "Popup.dropShadowPainted" ) || SystemInfo.isProjector )
|
if( !isOptionEnabled( owner, contents, FlatClientProperties.POPUP_DROP_SHADOW_PAINTED, "Popup.dropShadowPainted" ) || SystemInfo.isProjector || SystemInfo.isWebswing )
|
||||||
return new NonFlashingPopup( getPopupForScreenOfOwner( owner, contents, x, y, forceHeavyWeight ), contents );
|
return new NonFlashingPopup( getPopupForScreenOfOwner( owner, contents, x, y, forceHeavyWeight ), contents );
|
||||||
|
|
||||||
// macOS and Linux adds drop shadow to heavy weight popups
|
// macOS and Linux adds drop shadow to heavy weight popups
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ public class FlatRootPaneUI
|
|||||||
else
|
else
|
||||||
installBorder();
|
installBorder();
|
||||||
|
|
||||||
nativeWindowBorderData = FlatNativeWindowBorder.install( rootPane );
|
installNativeWindowBorder();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void installBorder() {
|
protected void installBorder() {
|
||||||
@@ -110,8 +110,7 @@ public class FlatRootPaneUI
|
|||||||
public void uninstallUI( JComponent c ) {
|
public void uninstallUI( JComponent c ) {
|
||||||
super.uninstallUI( c );
|
super.uninstallUI( c );
|
||||||
|
|
||||||
FlatNativeWindowBorder.uninstall( rootPane, nativeWindowBorderData );
|
uninstallNativeWindowBorder();
|
||||||
|
|
||||||
uninstallClientDecorations();
|
uninstallClientDecorations();
|
||||||
rootPane = null;
|
rootPane = null;
|
||||||
}
|
}
|
||||||
@@ -137,6 +136,34 @@ public class FlatRootPaneUI
|
|||||||
c.putClientProperty( "jetbrains.awt.windowDarkAppearance", FlatLaf.isLafDark() );
|
c.putClientProperty( "jetbrains.awt.windowDarkAppearance", FlatLaf.isLafDark() );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @since 1.1.2
|
||||||
|
*/
|
||||||
|
protected void installNativeWindowBorder() {
|
||||||
|
nativeWindowBorderData = FlatNativeWindowBorder.install( rootPane );
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @since 1.1.2
|
||||||
|
*/
|
||||||
|
protected void uninstallNativeWindowBorder() {
|
||||||
|
FlatNativeWindowBorder.uninstall( rootPane, nativeWindowBorderData );
|
||||||
|
nativeWindowBorderData = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @since 1.1.2
|
||||||
|
*/
|
||||||
|
public static void updateNativeWindowBorder( JRootPane rootPane ) {
|
||||||
|
RootPaneUI rui = rootPane.getUI();
|
||||||
|
if( !(rui instanceof FlatRootPaneUI) )
|
||||||
|
return;
|
||||||
|
|
||||||
|
FlatRootPaneUI ui = (FlatRootPaneUI) rui;
|
||||||
|
ui.uninstallNativeWindowBorder();
|
||||||
|
ui.installNativeWindowBorder();
|
||||||
|
}
|
||||||
|
|
||||||
protected void installClientDecorations() {
|
protected void installClientDecorations() {
|
||||||
boolean isNativeWindowBorderSupported = FlatNativeWindowBorder.isSupported();
|
boolean isNativeWindowBorderSupported = FlatNativeWindowBorder.isSupported();
|
||||||
|
|
||||||
@@ -218,6 +245,10 @@ public class FlatRootPaneUI
|
|||||||
installBorder();
|
installBorder();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case FlatClientProperties.USE_WINDOW_DECORATIONS:
|
||||||
|
updateNativeWindowBorder( rootPane );
|
||||||
|
break;
|
||||||
|
|
||||||
case FlatClientProperties.MENU_BAR_EMBEDDED:
|
case FlatClientProperties.MENU_BAR_EMBEDDED:
|
||||||
if( titlePane != null ) {
|
if( titlePane != null ) {
|
||||||
titlePane.menuBarChanged();
|
titlePane.menuBarChanged();
|
||||||
@@ -225,6 +256,12 @@ public class FlatRootPaneUI
|
|||||||
rootPane.repaint();
|
rootPane.repaint();
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case FlatClientProperties.TITLE_BAR_BACKGROUND:
|
||||||
|
case FlatClientProperties.TITLE_BAR_FOREGROUND:
|
||||||
|
if( titlePane != null )
|
||||||
|
titlePane.titleBarColorsChanged();
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -375,8 +375,8 @@ public class FlatSpinnerUI
|
|||||||
Rectangle editorRect = new Rectangle( r );
|
Rectangle editorRect = new Rectangle( r );
|
||||||
Rectangle buttonsRect = new Rectangle( r );
|
Rectangle buttonsRect = new Rectangle( r );
|
||||||
|
|
||||||
// make button area square
|
// make button area square (if spinner has preferred height)
|
||||||
int buttonsWidth = r.height;
|
int buttonsWidth = parent.getPreferredSize().height - insets.top - insets.bottom;
|
||||||
buttonsRect.width = buttonsWidth;
|
buttonsRect.width = buttonsWidth;
|
||||||
|
|
||||||
if( parent.getComponentOrientation().isLeftToRight() ) {
|
if( parent.getComponentOrientation().isLeftToRight() ) {
|
||||||
|
|||||||
@@ -46,10 +46,13 @@ import com.formdev.flatlaf.util.UIScale;
|
|||||||
* @uiDefault SplitPaneDivider.border Border
|
* @uiDefault SplitPaneDivider.border Border
|
||||||
* @uiDefault SplitPaneDivider.draggingColor Color only used if continuousLayout is false
|
* @uiDefault SplitPaneDivider.draggingColor Color only used if continuousLayout is false
|
||||||
*
|
*
|
||||||
|
* <!-- JSplitPane -->
|
||||||
|
*
|
||||||
|
* @uiDefault SplitPane.continuousLayout boolean
|
||||||
|
*
|
||||||
* <!-- FlatSplitPaneUI -->
|
* <!-- FlatSplitPaneUI -->
|
||||||
*
|
*
|
||||||
* @uiDefault Component.arrowType String chevron (default) or triangle
|
* @uiDefault Component.arrowType String chevron (default) or triangle
|
||||||
* @uiDefault SplitPane.continuousLayout boolean
|
|
||||||
* @uiDefault SplitPaneDivider.oneTouchArrowColor Color
|
* @uiDefault SplitPaneDivider.oneTouchArrowColor Color
|
||||||
* @uiDefault SplitPaneDivider.oneTouchHoverArrowColor Color
|
* @uiDefault SplitPaneDivider.oneTouchHoverArrowColor Color
|
||||||
* @uiDefault SplitPaneDivider.oneTouchPressedArrowColor Color
|
* @uiDefault SplitPaneDivider.oneTouchPressedArrowColor Color
|
||||||
@@ -65,7 +68,6 @@ public class FlatSplitPaneUI
|
|||||||
extends BasicSplitPaneUI
|
extends BasicSplitPaneUI
|
||||||
{
|
{
|
||||||
protected String arrowType;
|
protected String arrowType;
|
||||||
private Boolean continuousLayout;
|
|
||||||
protected Color oneTouchArrowColor;
|
protected Color oneTouchArrowColor;
|
||||||
protected Color oneTouchHoverArrowColor;
|
protected Color oneTouchHoverArrowColor;
|
||||||
protected Color oneTouchPressedArrowColor;
|
protected Color oneTouchPressedArrowColor;
|
||||||
@@ -85,8 +87,6 @@ public class FlatSplitPaneUI
|
|||||||
oneTouchPressedArrowColor = UIManager.getColor( "SplitPaneDivider.oneTouchPressedArrowColor" );
|
oneTouchPressedArrowColor = UIManager.getColor( "SplitPaneDivider.oneTouchPressedArrowColor" );
|
||||||
|
|
||||||
super.installDefaults();
|
super.installDefaults();
|
||||||
|
|
||||||
continuousLayout = (Boolean) UIManager.get( "SplitPane.continuousLayout" );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -98,11 +98,6 @@ public class FlatSplitPaneUI
|
|||||||
oneTouchPressedArrowColor = null;
|
oneTouchPressedArrowColor = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isContinuousLayout() {
|
|
||||||
return super.isContinuousLayout() || (continuousLayout != null && Boolean.TRUE.equals( continuousLayout ));
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BasicSplitPaneDivider createDefaultDivider() {
|
public BasicSplitPaneDivider createDefaultDivider() {
|
||||||
return new FlatSplitPaneDivider( this );
|
return new FlatSplitPaneDivider( this );
|
||||||
|
|||||||
@@ -722,6 +722,13 @@ public class FlatTabbedPaneUI
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected Insets getRealTabAreaInsets( int tabPlacement ) {
|
protected Insets getRealTabAreaInsets( int tabPlacement ) {
|
||||||
|
// this is to avoid potential NPE in ensureSelectedTabIsVisible()
|
||||||
|
// (see https://github.com/JFormDesigner/FlatLaf/issues/299)
|
||||||
|
// but now should actually never occur because added more checks to
|
||||||
|
// ensureSelectedTabIsVisibleLater() and ensureSelectedTabIsVisible()
|
||||||
|
if( tabAreaInsets == null )
|
||||||
|
tabAreaInsets = new Insets( 0, 0, 0, 0 );
|
||||||
|
|
||||||
Insets currentTabAreaInsets = super.getTabAreaInsets( tabPlacement );
|
Insets currentTabAreaInsets = super.getTabAreaInsets( tabPlacement );
|
||||||
Insets insets = (Insets) currentTabAreaInsets.clone();
|
Insets insets = (Insets) currentTabAreaInsets.clone();
|
||||||
|
|
||||||
@@ -1386,13 +1393,18 @@ public class FlatTabbedPaneUI
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected void ensureSelectedTabIsVisibleLater() {
|
protected void ensureSelectedTabIsVisibleLater() {
|
||||||
|
// do nothing if not yet displayable or if not invoked from dispatch thread,
|
||||||
|
// which may be the case when creating/modifying in another thread
|
||||||
|
if( !tabPane.isDisplayable() || !EventQueue.isDispatchThread() )
|
||||||
|
return;
|
||||||
|
|
||||||
EventQueue.invokeLater( () -> {
|
EventQueue.invokeLater( () -> {
|
||||||
ensureSelectedTabIsVisible();
|
ensureSelectedTabIsVisible();
|
||||||
} );
|
} );
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void ensureSelectedTabIsVisible() {
|
protected void ensureSelectedTabIsVisible() {
|
||||||
if( tabPane == null || tabViewport == null )
|
if( tabPane == null || tabViewport == null || !tabPane.isDisplayable() )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
ensureCurrentLayout();
|
ensureCurrentLayout();
|
||||||
|
|||||||
@@ -16,6 +16,7 @@
|
|||||||
|
|
||||||
package com.formdev.flatlaf.ui;
|
package com.formdev.flatlaf.ui;
|
||||||
|
|
||||||
|
import static com.formdev.flatlaf.FlatClientProperties.*;
|
||||||
import java.awt.BorderLayout;
|
import java.awt.BorderLayout;
|
||||||
import java.awt.Color;
|
import java.awt.Color;
|
||||||
import java.awt.Component;
|
import java.awt.Component;
|
||||||
@@ -105,7 +106,6 @@ public class FlatTitlePane
|
|||||||
protected final Color embeddedForeground = UIManager.getColor( "TitlePane.embeddedForeground" );
|
protected final Color embeddedForeground = UIManager.getColor( "TitlePane.embeddedForeground" );
|
||||||
protected final Color borderColor = UIManager.getColor( "TitlePane.borderColor" );
|
protected final Color borderColor = UIManager.getColor( "TitlePane.borderColor" );
|
||||||
|
|
||||||
protected final boolean unifiedBackground = UIManager.getBoolean( "TitlePane.unifiedBackground" );
|
|
||||||
protected final Dimension iconSize = UIManager.getDimension( "TitlePane.iconSize" );
|
protected final Dimension iconSize = UIManager.getDimension( "TitlePane.iconSize" );
|
||||||
protected final int buttonMaximizedHeight = UIManager.getInt( "TitlePane.buttonMaximizedHeight" );
|
protected final int buttonMaximizedHeight = UIManager.getInt( "TitlePane.buttonMaximizedHeight" );
|
||||||
protected final boolean centerTitle = UIManager.getBoolean( "TitlePane.centerTitle" );
|
protected final boolean centerTitle = UIManager.getBoolean( "TitlePane.centerTitle" );
|
||||||
@@ -266,10 +266,17 @@ public class FlatTitlePane
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected void activeChanged( boolean active ) {
|
protected void activeChanged( boolean active ) {
|
||||||
boolean hasEmbeddedMenuBar = hasVisibleEmbeddedMenuBar( rootPane.getJMenuBar() );
|
Color background = clientPropertyColor( rootPane, TITLE_BAR_BACKGROUND, null );
|
||||||
Color background = FlatUIUtils.nonUIResource( active ? activeBackground : inactiveBackground );
|
Color foreground = clientPropertyColor( rootPane, TITLE_BAR_FOREGROUND, null );
|
||||||
Color foreground = FlatUIUtils.nonUIResource( active ? activeForeground : inactiveForeground );
|
Color titleForeground = foreground;
|
||||||
Color titleForeground = (hasEmbeddedMenuBar && active) ? FlatUIUtils.nonUIResource( embeddedForeground ) : foreground;
|
if( background == null )
|
||||||
|
background = FlatUIUtils.nonUIResource( active ? activeBackground : inactiveBackground );
|
||||||
|
if( foreground == null ) {
|
||||||
|
foreground = FlatUIUtils.nonUIResource( active ? activeForeground : inactiveForeground );
|
||||||
|
titleForeground = (active && hasVisibleEmbeddedMenuBar( rootPane.getJMenuBar() ))
|
||||||
|
? FlatUIUtils.nonUIResource( embeddedForeground )
|
||||||
|
: foreground;
|
||||||
|
}
|
||||||
|
|
||||||
setBackground( background );
|
setBackground( background );
|
||||||
titleLabel.setForeground( titleForeground );
|
titleLabel.setForeground( titleForeground );
|
||||||
@@ -430,9 +437,11 @@ public class FlatTitlePane
|
|||||||
*/
|
*/
|
||||||
protected boolean isMenuBarEmbedded() {
|
protected boolean isMenuBarEmbedded() {
|
||||||
// not storing value of "TitlePane.menuBarEmbedded" in class to allow changing at runtime
|
// not storing value of "TitlePane.menuBarEmbedded" in class to allow changing at runtime
|
||||||
return UIManager.getBoolean( "TitlePane.menuBarEmbedded" ) &&
|
return FlatUIUtils.getBoolean( rootPane,
|
||||||
FlatClientProperties.clientPropertyBoolean( rootPane, FlatClientProperties.MENU_BAR_EMBEDDED, true ) &&
|
FlatSystemProperties.MENUBAR_EMBEDDED,
|
||||||
FlatSystemProperties.getBoolean( FlatSystemProperties.MENUBAR_EMBEDDED, true );
|
FlatClientProperties.MENU_BAR_EMBEDDED,
|
||||||
|
"TitlePane.menuBarEmbedded",
|
||||||
|
false );
|
||||||
}
|
}
|
||||||
|
|
||||||
protected Rectangle getMenuBarBounds() {
|
protected Rectangle getMenuBarBounds() {
|
||||||
@@ -479,6 +488,11 @@ public class FlatTitlePane
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected void titleBarColorsChanged() {
|
||||||
|
activeChanged( window == null || window.isActive() );
|
||||||
|
repaint();
|
||||||
|
}
|
||||||
|
|
||||||
protected void menuBarChanged() {
|
protected void menuBarChanged() {
|
||||||
menuBarPlaceholder.invalidate();
|
menuBarPlaceholder.invalidate();
|
||||||
|
|
||||||
@@ -523,11 +537,13 @@ debug*/
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void paintComponent( Graphics g ) {
|
protected void paintComponent( Graphics g ) {
|
||||||
if( !unifiedBackground ) {
|
// not storing value of "TitlePane.unifiedBackground" in class to allow changing at runtime
|
||||||
g.setColor( getBackground() );
|
g.setColor( (UIManager.getBoolean( "TitlePane.unifiedBackground" ) &&
|
||||||
|
clientPropertyColor( rootPane, TITLE_BAR_BACKGROUND, null ) == null)
|
||||||
|
? FlatUIUtils.getParentBackground( this )
|
||||||
|
: getBackground() );
|
||||||
g.fillRect( 0, 0, getWidth(), getHeight() );
|
g.fillRect( 0, 0, getWidth(), getHeight() );
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
protected void repaintWindowBorder() {
|
protected void repaintWindowBorder() {
|
||||||
int width = rootPane.getWidth();
|
int width = rootPane.getWidth();
|
||||||
@@ -803,7 +819,7 @@ debug*/
|
|||||||
} else if( borderColor != null && (rootPane.getJMenuBar() == null || !rootPane.getJMenuBar().isVisible()) )
|
} else if( borderColor != null && (rootPane.getJMenuBar() == null || !rootPane.getJMenuBar().isVisible()) )
|
||||||
insets.bottom += UIScale.scale( 1 );
|
insets.bottom += UIScale.scale( 1 );
|
||||||
|
|
||||||
if( hasNativeCustomDecoration() )
|
if( hasNativeCustomDecoration() && !isWindowMaximized( c ) )
|
||||||
insets = FlatUIUtils.addInsets( insets, WindowTopBorder.getInstance().getBorderInsets() );
|
insets = FlatUIUtils.addInsets( insets, WindowTopBorder.getInstance().getBorderInsets() );
|
||||||
|
|
||||||
return insets;
|
return insets;
|
||||||
@@ -822,7 +838,7 @@ debug*/
|
|||||||
FlatUIUtils.paintFilledRectangle( g, borderColor, x, y + height - lineHeight, width, lineHeight );
|
FlatUIUtils.paintFilledRectangle( g, borderColor, x, y + height - lineHeight, width, lineHeight );
|
||||||
}
|
}
|
||||||
|
|
||||||
if( hasNativeCustomDecoration() )
|
if( hasNativeCustomDecoration() && !isWindowMaximized( c ) )
|
||||||
WindowTopBorder.getInstance().paintBorder( c, g, x, y, width, height );
|
WindowTopBorder.getInstance().paintBorder( c, g, x, y, width, height );
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -830,6 +846,12 @@ debug*/
|
|||||||
JMenuBar menuBar = rootPane.getJMenuBar();
|
JMenuBar menuBar = rootPane.getJMenuBar();
|
||||||
return hasVisibleEmbeddedMenuBar( menuBar ) ? menuBar.getBorder() : null;
|
return hasVisibleEmbeddedMenuBar( menuBar ) ? menuBar.getBorder() : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected boolean isWindowMaximized( Component c ) {
|
||||||
|
return window instanceof Frame
|
||||||
|
? (((Frame)window).getExtendedState() & Frame.MAXIMIZED_BOTH) != 0
|
||||||
|
: false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//---- class FlatTitleLabelUI ---------------------------------------------
|
//---- class FlatTitleLabelUI ---------------------------------------------
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ import javax.swing.border.CompoundBorder;
|
|||||||
import javax.swing.plaf.ComponentUI;
|
import javax.swing.plaf.ComponentUI;
|
||||||
import javax.swing.plaf.UIResource;
|
import javax.swing.plaf.UIResource;
|
||||||
import com.formdev.flatlaf.FlatClientProperties;
|
import com.formdev.flatlaf.FlatClientProperties;
|
||||||
|
import com.formdev.flatlaf.FlatSystemProperties;
|
||||||
import com.formdev.flatlaf.util.DerivedColor;
|
import com.formdev.flatlaf.util.DerivedColor;
|
||||||
import com.formdev.flatlaf.util.Graphics2DProxy;
|
import com.formdev.flatlaf.util.Graphics2DProxy;
|
||||||
import com.formdev.flatlaf.util.HiDPIUtils;
|
import com.formdev.flatlaf.util.HiDPIUtils;
|
||||||
@@ -140,6 +141,25 @@ public class FlatUIUtils
|
|||||||
return (value instanceof Number) ? ((Number)value).floatValue() : defaultValue;
|
return (value instanceof Number) ? ((Number)value).floatValue() : defaultValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @since 1.1.2
|
||||||
|
*/
|
||||||
|
public static boolean getBoolean( JComponent c, String systemPropertyKey,
|
||||||
|
String clientPropertyKey, String uiKey, boolean defaultValue )
|
||||||
|
{
|
||||||
|
// check whether forced to true/false via system property
|
||||||
|
Boolean value = FlatSystemProperties.getBooleanStrict( systemPropertyKey, null );
|
||||||
|
if( value != null )
|
||||||
|
return value;
|
||||||
|
|
||||||
|
// check whether forced to true/false via client property
|
||||||
|
value = FlatClientProperties.clientPropertyBooleanStrict( c, clientPropertyKey, null );
|
||||||
|
if( value != null )
|
||||||
|
return value;
|
||||||
|
|
||||||
|
return getUIBoolean( uiKey, defaultValue );
|
||||||
|
}
|
||||||
|
|
||||||
public static boolean isChevron( String arrowType ) {
|
public static boolean isChevron( String arrowType ) {
|
||||||
return !"triangle".equals( arrowType );
|
return !"triangle".equals( arrowType );
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -103,8 +103,7 @@ class FlatWindowsNativeWindowBorder
|
|||||||
if( SystemInfo.isX86_64 )
|
if( SystemInfo.isX86_64 )
|
||||||
libraryName += "_64";
|
libraryName += "_64";
|
||||||
|
|
||||||
nativeLibrary = new NativeLibrary( libraryName,
|
nativeLibrary = new NativeLibrary( libraryName, null, true );
|
||||||
FlatWindowsNativeWindowBorder.class.getClassLoader(), true );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// check whether native library was successfully loaded
|
// check whether native library was successfully loaded
|
||||||
|
|||||||
@@ -36,7 +36,6 @@ import javax.swing.SwingUtilities;
|
|||||||
import javax.swing.UIManager;
|
import javax.swing.UIManager;
|
||||||
import javax.swing.plaf.BorderUIResource;
|
import javax.swing.plaf.BorderUIResource;
|
||||||
import com.formdev.flatlaf.FlatLaf;
|
import com.formdev.flatlaf.FlatLaf;
|
||||||
import com.formdev.flatlaf.FlatSystemProperties;
|
|
||||||
import com.formdev.flatlaf.util.LoggingFacade;
|
import com.formdev.flatlaf.util.LoggingFacade;
|
||||||
import com.formdev.flatlaf.util.HiDPIUtils;
|
import com.formdev.flatlaf.util.HiDPIUtils;
|
||||||
import com.formdev.flatlaf.util.SystemInfo;
|
import com.formdev.flatlaf.util.SystemInfo;
|
||||||
@@ -73,7 +72,7 @@ public class JBRCustomDecorations
|
|||||||
// check whether root pane already has a parent, which is the case when switching LaF
|
// check whether root pane already has a parent, which is the case when switching LaF
|
||||||
Window window = SwingUtilities.windowForComponent( rootPane );
|
Window window = SwingUtilities.windowForComponent( rootPane );
|
||||||
if( window != null ) {
|
if( window != null ) {
|
||||||
FlatNativeWindowBorder.install( window, FlatSystemProperties.USE_JETBRAINS_CUSTOM_DECORATIONS );
|
FlatNativeWindowBorder.install( window );
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -89,7 +88,7 @@ public class JBRCustomDecorations
|
|||||||
|
|
||||||
Container parent = e.getChangedParent();
|
Container parent = e.getChangedParent();
|
||||||
if( parent instanceof Window )
|
if( parent instanceof Window )
|
||||||
FlatNativeWindowBorder.install( (Window) parent, FlatSystemProperties.USE_JETBRAINS_CUSTOM_DECORATIONS );
|
FlatNativeWindowBorder.install( (Window) parent );
|
||||||
|
|
||||||
// remove listener since it is actually not possible to uninstall JBR decorations
|
// remove listener since it is actually not possible to uninstall JBR decorations
|
||||||
// use invokeLater to remove listener to avoid that listener
|
// use invokeLater to remove listener to avoid that listener
|
||||||
@@ -165,10 +164,6 @@ public class JBRCustomDecorations
|
|||||||
if( !SystemInfo.isJetBrainsJVM_11_orLater || !SystemInfo.isWindows_10_orLater )
|
if( !SystemInfo.isJetBrainsJVM_11_orLater || !SystemInfo.isWindows_10_orLater )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// check whether disabled via system property
|
|
||||||
if( !FlatSystemProperties.getBoolean( FlatSystemProperties.USE_JETBRAINS_CUSTOM_DECORATIONS, true ) )
|
|
||||||
return;
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
Class<?> awtAcessorClass = Class.forName( "sun.awt.AWTAccessor" );
|
Class<?> awtAcessorClass = Class.forName( "sun.awt.AWTAccessor" );
|
||||||
Class<?> compAccessorClass = Class.forName( "sun.awt.AWTAccessor$ComponentAccessor" );
|
Class<?> compAccessorClass = Class.forName( "sun.awt.AWTAccessor$ComponentAccessor" );
|
||||||
|
|||||||
@@ -42,9 +42,15 @@ public class NativeLibrary
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Load native library from given classloader.
|
* Load native library from given classloader.
|
||||||
|
* <p>
|
||||||
|
* Note regarding Java Platform Module System (JPMS):
|
||||||
|
* If classloader is {@code null}, the library can be only loaded from the module
|
||||||
|
* that contains this class.
|
||||||
|
* If classloader is not {@code null}, then the package that contains the library
|
||||||
|
* must be specified as "open" in module-info.java of the module that contains the library.
|
||||||
*
|
*
|
||||||
* @param libraryName resource name of the native library (without "lib" prefix and without extension)
|
* @param libraryName resource name of the native library (without "lib" prefix and without extension)
|
||||||
* @param classLoader the classloader used to locate the library
|
* @param classLoader the classloader used to locate the library, or {@code null}
|
||||||
* @param supported whether the native library is supported on the current platform
|
* @param supported whether the native library is supported on the current platform
|
||||||
*/
|
*/
|
||||||
public NativeLibrary( String libraryName, ClassLoader classLoader, boolean supported ) {
|
public NativeLibrary( String libraryName, ClassLoader classLoader, boolean supported ) {
|
||||||
@@ -68,7 +74,9 @@ public class NativeLibrary
|
|||||||
libraryName = decorateLibraryName( libraryName );
|
libraryName = decorateLibraryName( libraryName );
|
||||||
|
|
||||||
// find library
|
// find library
|
||||||
URL libraryUrl = classLoader.getResource( libraryName );
|
URL libraryUrl = (classLoader != null)
|
||||||
|
? classLoader.getResource( libraryName )
|
||||||
|
: NativeLibrary.class.getResource( "/" + libraryName );
|
||||||
if( libraryUrl == null ) {
|
if( libraryUrl == null ) {
|
||||||
log( "Library '" + libraryName + "' not found", null );
|
log( "Library '" + libraryName + "' not found", null );
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -56,6 +56,7 @@ public class SystemInfo
|
|||||||
|
|
||||||
// other
|
// other
|
||||||
/** @since 1.1 */ public static final boolean isProjector;
|
/** @since 1.1 */ public static final boolean isProjector;
|
||||||
|
/** @since 1.1.2 */ public static final boolean isWebswing;
|
||||||
/** @since 1.1.1 */ public static final boolean isWinPE;
|
/** @since 1.1.1 */ public static final boolean isWinPE;
|
||||||
|
|
||||||
static {
|
static {
|
||||||
@@ -92,6 +93,7 @@ public class SystemInfo
|
|||||||
|
|
||||||
// other
|
// other
|
||||||
isProjector = Boolean.getBoolean( "org.jetbrains.projector.server.enable" );
|
isProjector = Boolean.getBoolean( "org.jetbrains.projector.server.enable" );
|
||||||
|
isWebswing = (System.getProperty( "webswing.rootDir" ) != null);
|
||||||
isWinPE = isWindows && "X:\\Windows\\System32".equalsIgnoreCase( System.getProperty( "user.dir" ) );
|
isWinPE = isWindows && "X:\\Windows\\System32".equalsIgnoreCase( System.getProperty( "user.dir" ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -180,7 +180,7 @@ public class UIScale
|
|||||||
// apply custom scale factor specified in system property "flatlaf.uiScale"
|
// apply custom scale factor specified in system property "flatlaf.uiScale"
|
||||||
float customScaleFactor = getCustomScaleFactor();
|
float customScaleFactor = getCustomScaleFactor();
|
||||||
if( customScaleFactor > 0 ) {
|
if( customScaleFactor > 0 ) {
|
||||||
setUserScaleFactor( customScaleFactor );
|
setUserScaleFactor( customScaleFactor, false );
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -230,7 +230,7 @@ public class UIScale
|
|||||||
} else
|
} else
|
||||||
newScaleFactor = computeScaleFactor( font );
|
newScaleFactor = computeScaleFactor( font );
|
||||||
|
|
||||||
setUserScaleFactor( newScaleFactor );
|
setUserScaleFactor( newScaleFactor, true );
|
||||||
}
|
}
|
||||||
|
|
||||||
private static float computeScaleFactor( Font font ) {
|
private static float computeScaleFactor( Font font ) {
|
||||||
@@ -274,7 +274,7 @@ public class UIScale
|
|||||||
if( scaleFactor == fontScaleFactor )
|
if( scaleFactor == fontScaleFactor )
|
||||||
return font;
|
return font;
|
||||||
|
|
||||||
int newFontSize = Math.round( (font.getSize() / fontScaleFactor) * scaleFactor );
|
int newFontSize = Math.max( Math.round( (font.getSize() / fontScaleFactor) * scaleFactor ), 1 );
|
||||||
return new FontUIResource( font.deriveFont( (float) newFontSize ) );
|
return new FontUIResource( font.deriveFont( (float) newFontSize ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -322,11 +322,18 @@ public class UIScale
|
|||||||
/**
|
/**
|
||||||
* Sets the user scale factor.
|
* Sets the user scale factor.
|
||||||
*/
|
*/
|
||||||
private static void setUserScaleFactor( float scaleFactor ) {
|
private static void setUserScaleFactor( float scaleFactor, boolean normalize ) {
|
||||||
if( scaleFactor <= 1f )
|
if( normalize ) {
|
||||||
scaleFactor = 1f;
|
if( scaleFactor < 1f ) {
|
||||||
else // round scale factor to 1/4
|
scaleFactor = FlatSystemProperties.getBoolean( FlatSystemProperties.UI_SCALE_ALLOW_SCALE_DOWN, false )
|
||||||
|
? Math.round( scaleFactor * 10f ) / 10f // round small scale factor to 1/10
|
||||||
|
: 1f;
|
||||||
|
} else if( scaleFactor > 1f ) // round scale factor to 1/4
|
||||||
scaleFactor = Math.round( scaleFactor * 4f ) / 4f;
|
scaleFactor = Math.round( scaleFactor * 4f ) / 4f;
|
||||||
|
}
|
||||||
|
|
||||||
|
// minimum scale factor
|
||||||
|
scaleFactor = Math.max( scaleFactor, 0.1f );
|
||||||
|
|
||||||
float oldScaleFactor = UIScale.scaleFactor;
|
float oldScaleFactor = UIScale.scaleFactor;
|
||||||
UIScale.scaleFactor = scaleFactor;
|
UIScale.scaleFactor = scaleFactor;
|
||||||
|
|||||||
@@ -22,6 +22,28 @@
|
|||||||
# - https://www.formdev.com/flatlaf/how-to-customize/
|
# - https://www.formdev.com/flatlaf/how-to-customize/
|
||||||
#
|
#
|
||||||
|
|
||||||
|
#---- system colors ----
|
||||||
|
|
||||||
|
# fix (most) system colors because they are usually not set in .json files
|
||||||
|
desktop = lazy(TextField.background)
|
||||||
|
activeCaptionText = lazy(TextField.foreground)
|
||||||
|
inactiveCaptionText = lazy(TextField.foreground)
|
||||||
|
window = lazy(Panel.background)
|
||||||
|
windowBorder = lazy(TextField.foreground)
|
||||||
|
windowText = lazy(TextField.foreground)
|
||||||
|
menu = lazy(Menu.background)
|
||||||
|
menuText = lazy(Menu.foreground)
|
||||||
|
text = lazy(TextField.background)
|
||||||
|
textText = lazy(TextField.foreground)
|
||||||
|
textHighlight = lazy(TextField.selectionBackground)
|
||||||
|
textHighlightText = lazy(TextField.selectionForeground)
|
||||||
|
textInactiveText = lazy(TextField.inactiveForeground)
|
||||||
|
control = lazy(Panel.background)
|
||||||
|
controlText = lazy(TextField.foreground)
|
||||||
|
info = lazy(ToolTip.background)
|
||||||
|
infoText = lazy(ToolTip.foreground)
|
||||||
|
|
||||||
|
|
||||||
#---- Button ----
|
#---- Button ----
|
||||||
|
|
||||||
Button.startBackground = $Button.background
|
Button.startBackground = $Button.background
|
||||||
|
|||||||
@@ -24,7 +24,6 @@ import java.util.prefs.Preferences;
|
|||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import javax.swing.text.DefaultEditorKit;
|
import javax.swing.text.DefaultEditorKit;
|
||||||
import javax.swing.text.StyleContext;
|
import javax.swing.text.StyleContext;
|
||||||
import com.formdev.flatlaf.FlatClientProperties;
|
|
||||||
import com.formdev.flatlaf.FlatLaf;
|
import com.formdev.flatlaf.FlatLaf;
|
||||||
import com.formdev.flatlaf.demo.HintManager.Hint;
|
import com.formdev.flatlaf.demo.HintManager.Hint;
|
||||||
import com.formdev.flatlaf.demo.extras.*;
|
import com.formdev.flatlaf.demo.extras.*;
|
||||||
@@ -35,8 +34,8 @@ import com.formdev.flatlaf.extras.FlatUIDefaultsInspector;
|
|||||||
import com.formdev.flatlaf.extras.components.FlatButton;
|
import com.formdev.flatlaf.extras.components.FlatButton;
|
||||||
import com.formdev.flatlaf.extras.components.FlatButton.ButtonType;
|
import com.formdev.flatlaf.extras.components.FlatButton.ButtonType;
|
||||||
import com.formdev.flatlaf.extras.FlatSVGUtils;
|
import com.formdev.flatlaf.extras.FlatSVGUtils;
|
||||||
import com.formdev.flatlaf.ui.FlatNativeWindowBorder;
|
|
||||||
import com.formdev.flatlaf.ui.JBRCustomDecorations;
|
import com.formdev.flatlaf.ui.JBRCustomDecorations;
|
||||||
|
import com.formdev.flatlaf.util.SystemInfo;
|
||||||
import net.miginfocom.layout.ConstraintParser;
|
import net.miginfocom.layout.ConstraintParser;
|
||||||
import net.miginfocom.layout.LC;
|
import net.miginfocom.layout.LC;
|
||||||
import net.miginfocom.layout.UnitValue;
|
import net.miginfocom.layout.UnitValue;
|
||||||
@@ -144,35 +143,21 @@ class DemoFrame
|
|||||||
private void windowDecorationsChanged() {
|
private void windowDecorationsChanged() {
|
||||||
boolean windowDecorations = windowDecorationsCheckBoxMenuItem.isSelected();
|
boolean windowDecorations = windowDecorationsCheckBoxMenuItem.isSelected();
|
||||||
|
|
||||||
// change window decoration of demo main frame
|
// change window decoration of all frames and dialogs
|
||||||
if( FlatNativeWindowBorder.isSupported() ) {
|
FlatLaf.setUseNativeWindowDecorations( windowDecorations );
|
||||||
FlatNativeWindowBorder.setHasCustomDecoration( this, windowDecorations );
|
|
||||||
getRootPane().setWindowDecorationStyle( windowDecorations ? JRootPane.FRAME : JRootPane.NONE );
|
|
||||||
} else {
|
|
||||||
dispose();
|
|
||||||
setUndecorated( windowDecorations );
|
|
||||||
getRootPane().setWindowDecorationStyle( windowDecorations ? JRootPane.FRAME : JRootPane.NONE );
|
|
||||||
setVisible( true );
|
|
||||||
}
|
|
||||||
menuBarEmbeddedCheckBoxMenuItem.setEnabled( windowDecorations );
|
|
||||||
|
|
||||||
// enable/disable window decoration for later created frames/dialogs
|
menuBarEmbeddedCheckBoxMenuItem.setEnabled( windowDecorations );
|
||||||
UIManager.put( "TitlePane.useWindowDecorations", windowDecorations );
|
unifiedTitleBarMenuItem.setEnabled( windowDecorations );
|
||||||
}
|
}
|
||||||
|
|
||||||
private void menuBarEmbeddedChanged() {
|
private void menuBarEmbeddedChanged() {
|
||||||
getRootPane().putClientProperty( FlatClientProperties.MENU_BAR_EMBEDDED,
|
UIManager.put( "TitlePane.menuBarEmbedded", menuBarEmbeddedCheckBoxMenuItem.isSelected() );
|
||||||
menuBarEmbeddedCheckBoxMenuItem.isSelected() ? null : false );
|
FlatLaf.revalidateAndRepaintAllFramesAndDialogs();
|
||||||
|
|
||||||
// alternative method for all frames and menu bars in an application
|
|
||||||
// UIManager.put( "TitlePane.menuBarEmbedded", menuBarEmbeddedCheckBoxMenuItem.isSelected() );
|
|
||||||
// revalidate();
|
|
||||||
// repaint();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void unifiedTitleBar() {
|
private void unifiedTitleBar() {
|
||||||
UIManager.put( "TitlePane.unifiedBackground", unifiedTitleBarMenuItem.isSelected() );
|
UIManager.put( "TitlePane.unifiedBackground", unifiedTitleBarMenuItem.isSelected() );
|
||||||
FlatLaf.updateUI();
|
FlatLaf.repaintAllFramesAndDialogs();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void underlineMenuSelection() {
|
private void underlineMenuSelection() {
|
||||||
@@ -280,7 +265,7 @@ class DemoFrame
|
|||||||
// add font sizes
|
// add font sizes
|
||||||
fontMenu.addSeparator();
|
fontMenu.addSeparator();
|
||||||
ArrayList<String> sizes = new ArrayList<>( Arrays.asList(
|
ArrayList<String> sizes = new ArrayList<>( Arrays.asList(
|
||||||
"10", "12", "14", "16", "18", "20", "24", "28" ) );
|
"10", "11", "12", "14", "16", "18", "20", "24", "28" ) );
|
||||||
if( !sizes.contains( currentSize ) )
|
if( !sizes.contains( currentSize ) )
|
||||||
sizes.add( currentSize );
|
sizes.add( currentSize );
|
||||||
sizes.sort( String.CASE_INSENSITIVE_ORDER );
|
sizes.sort( String.CASE_INSENSITIVE_ORDER );
|
||||||
@@ -602,7 +587,7 @@ class DemoFrame
|
|||||||
optionsMenu.add(menuBarEmbeddedCheckBoxMenuItem);
|
optionsMenu.add(menuBarEmbeddedCheckBoxMenuItem);
|
||||||
|
|
||||||
//---- unifiedTitleBarMenuItem ----
|
//---- unifiedTitleBarMenuItem ----
|
||||||
unifiedTitleBarMenuItem.setText("Unified Title Bar");
|
unifiedTitleBarMenuItem.setText("Unified window title bar");
|
||||||
unifiedTitleBarMenuItem.addActionListener(e -> unifiedTitleBar());
|
unifiedTitleBarMenuItem.addActionListener(e -> unifiedTitleBar());
|
||||||
optionsMenu.add(unifiedTitleBarMenuItem);
|
optionsMenu.add(unifiedTitleBarMenuItem);
|
||||||
|
|
||||||
@@ -748,10 +733,20 @@ class DemoFrame
|
|||||||
copyMenuItem.addActionListener( new DefaultEditorKit.CopyAction() );
|
copyMenuItem.addActionListener( new DefaultEditorKit.CopyAction() );
|
||||||
pasteMenuItem.addActionListener( new DefaultEditorKit.PasteAction() );
|
pasteMenuItem.addActionListener( new DefaultEditorKit.PasteAction() );
|
||||||
|
|
||||||
boolean supportsWindowDecorations = UIManager.getLookAndFeel()
|
if( FlatLaf.supportsNativeWindowDecorations() ) {
|
||||||
.getSupportsWindowDecorations() || FlatNativeWindowBorder.isSupported();
|
if( JBRCustomDecorations.isSupported() ) {
|
||||||
windowDecorationsCheckBoxMenuItem.setEnabled( supportsWindowDecorations && !JBRCustomDecorations.isSupported() );
|
// If the JetBrains Runtime is used, it forces the use of it's own custom
|
||||||
menuBarEmbeddedCheckBoxMenuItem.setEnabled( supportsWindowDecorations );
|
// window decoration, which can not disabled.
|
||||||
|
windowDecorationsCheckBoxMenuItem.setEnabled( false );
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
unsupported( windowDecorationsCheckBoxMenuItem );
|
||||||
|
unsupported( menuBarEmbeddedCheckBoxMenuItem );
|
||||||
|
unsupported( unifiedTitleBarMenuItem );
|
||||||
|
}
|
||||||
|
|
||||||
|
if( SystemInfo.isMacOS )
|
||||||
|
unsupported( underlineMenuSelectionMenuItem );
|
||||||
|
|
||||||
// remove contentPanel bottom insets
|
// remove contentPanel bottom insets
|
||||||
MigLayout layout = (MigLayout) contentPanel.getLayout();
|
MigLayout layout = (MigLayout) contentPanel.getLayout();
|
||||||
@@ -766,6 +761,12 @@ class DemoFrame
|
|||||||
layout.setLayoutConstraints( lc );
|
layout.setLayoutConstraints( lc );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void unsupported( JCheckBoxMenuItem menuItem ) {
|
||||||
|
menuItem.setEnabled( false );
|
||||||
|
menuItem.setSelected( false );
|
||||||
|
menuItem.setToolTipText( "Not supported on your system." );
|
||||||
|
}
|
||||||
|
|
||||||
// JFormDesigner - Variables declaration - DO NOT MODIFY //GEN-BEGIN:variables
|
// JFormDesigner - Variables declaration - DO NOT MODIFY //GEN-BEGIN:variables
|
||||||
private JMenu fontMenu;
|
private JMenu fontMenu;
|
||||||
private JMenu optionsMenu;
|
private JMenu optionsMenu;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
JFDML JFormDesigner: "7.0.3.1.342" Java: "15" encoding: "UTF-8"
|
JFDML JFormDesigner: "7.0.3.1.342" Java: "16" encoding: "UTF-8"
|
||||||
|
|
||||||
new FormModel {
|
new FormModel {
|
||||||
contentType: "form/swing"
|
contentType: "form/swing"
|
||||||
@@ -362,7 +362,7 @@ new FormModel {
|
|||||||
} )
|
} )
|
||||||
add( new FormComponent( "javax.swing.JCheckBoxMenuItem" ) {
|
add( new FormComponent( "javax.swing.JCheckBoxMenuItem" ) {
|
||||||
name: "unifiedTitleBarMenuItem"
|
name: "unifiedTitleBarMenuItem"
|
||||||
"text": "Unified Title Bar"
|
"text": "Unified window title bar"
|
||||||
auxiliary() {
|
auxiliary() {
|
||||||
"JavaCodeGenerator.variableLocal": false
|
"JavaCodeGenerator.variableLocal": false
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2021 FormDev Software GmbH
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* https://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.formdev.flatlaf.extras.resources;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The only purpose of this file is to add a .class file to this package to make it non-empty.
|
||||||
|
* Otherwise the compiler outputs a warning because this package is opend in module-info.java.
|
||||||
|
* Also when using --patch-module (e.g. from an IDE), an error would occur for empty packages.
|
||||||
|
*
|
||||||
|
* @author Karl Tauber
|
||||||
|
*/
|
||||||
|
interface EmptyPackage
|
||||||
|
{
|
||||||
|
}
|
||||||
@@ -21,6 +21,7 @@ import java.util.HashMap;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import javax.swing.LookAndFeel;
|
import javax.swing.LookAndFeel;
|
||||||
import javax.swing.UIDefaults;
|
import javax.swing.UIDefaults;
|
||||||
|
import javax.swing.UIManager;
|
||||||
import javax.swing.UIDefaults.ActiveValue;
|
import javax.swing.UIDefaults.ActiveValue;
|
||||||
import com.formdev.flatlaf.FlatDefaultsAddon;
|
import com.formdev.flatlaf.FlatDefaultsAddon;
|
||||||
import com.formdev.flatlaf.FlatLaf;
|
import com.formdev.flatlaf.FlatLaf;
|
||||||
@@ -70,6 +71,9 @@ public class FlatJideOssDefaultsAddon
|
|||||||
* own UI defaults, we have to first remember our UI defaults in the initializer
|
* own UI defaults, we have to first remember our UI defaults in the initializer
|
||||||
* (invoked before JIDE overwrites UI defaults) and then restore them in the customizer.
|
* (invoked before JIDE overwrites UI defaults) and then restore them in the customizer.
|
||||||
* <p>
|
* <p>
|
||||||
|
* Do not register this class yourself with JIDE.
|
||||||
|
* It is automatically registered.
|
||||||
|
* <p>
|
||||||
* Invoked from {@link LookAndFeelFactory#installJideExtension()}.
|
* Invoked from {@link LookAndFeelFactory#installJideExtension()}.
|
||||||
*/
|
*/
|
||||||
public static class FlatJideUIDefaultsCustomizer
|
public static class FlatJideUIDefaultsCustomizer
|
||||||
@@ -79,6 +83,10 @@ public class FlatJideOssDefaultsAddon
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void initialize( UIDefaults defaults ) {
|
public void initialize( UIDefaults defaults ) {
|
||||||
|
// do nothing in other Lafs if (wrongly) registered with LookAndFeelFactory.addUIDefaultsInitializer()
|
||||||
|
if( !(UIManager.getLookAndFeel() instanceof FlatLaf) )
|
||||||
|
return;
|
||||||
|
|
||||||
jideDefaults = new HashMap<>();
|
jideDefaults = new HashMap<>();
|
||||||
|
|
||||||
for( Map.Entry<Object, Object> e : defaults.entrySet() ) {
|
for( Map.Entry<Object, Object> e : defaults.entrySet() ) {
|
||||||
@@ -96,6 +104,10 @@ public class FlatJideOssDefaultsAddon
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void customize( UIDefaults defaults ) {
|
public void customize( UIDefaults defaults ) {
|
||||||
|
// do nothing in other Lafs if (wrongly) registered with LookAndFeelFactory.addUIDefaultsCustomizer()
|
||||||
|
if( !(UIManager.getLookAndFeel() instanceof FlatLaf) )
|
||||||
|
return;
|
||||||
|
|
||||||
if( jideDefaults != null ) {
|
if( jideDefaults != null ) {
|
||||||
defaults.putAll( jideDefaults );
|
defaults.putAll( jideDefaults );
|
||||||
jideDefaults = null;
|
jideDefaults = null;
|
||||||
|
|||||||
@@ -35,8 +35,8 @@ import com.formdev.flatlaf.FlatIntelliJLaf;
|
|||||||
import com.formdev.flatlaf.FlatLaf;
|
import com.formdev.flatlaf.FlatLaf;
|
||||||
import com.formdev.flatlaf.FlatLightLaf;
|
import com.formdev.flatlaf.FlatLightLaf;
|
||||||
import com.formdev.flatlaf.extras.FlatInspector;
|
import com.formdev.flatlaf.extras.FlatInspector;
|
||||||
|
import com.formdev.flatlaf.extras.components.FlatTriStateCheckBox;
|
||||||
import com.formdev.flatlaf.ui.FlatLineBorder;
|
import com.formdev.flatlaf.ui.FlatLineBorder;
|
||||||
import com.formdev.flatlaf.ui.FlatNativeWindowBorder;
|
|
||||||
import com.formdev.flatlaf.util.SystemInfo;
|
import com.formdev.flatlaf.util.SystemInfo;
|
||||||
import net.miginfocom.swing.*;
|
import net.miginfocom.swing.*;
|
||||||
|
|
||||||
@@ -304,13 +304,11 @@ public class FlatNativeWindowBorderTest
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void nativeChanged() {
|
private void nativeChanged() {
|
||||||
FlatNativeWindowBorder.setHasCustomDecoration( window, nativeCheckBox.isSelected() );
|
FlatLaf.setUseNativeWindowDecorations( nativeCheckBox.isSelected() );
|
||||||
}
|
}
|
||||||
|
|
||||||
private void native2Changed() {
|
private void native2Changed() {
|
||||||
((RootPaneContainer)window).getRootPane().putClientProperty( FlatClientProperties.USE_WINDOW_DECORATIONS, native2CheckBox.isSelected() );
|
((RootPaneContainer)window).getRootPane().putClientProperty( FlatClientProperties.USE_WINDOW_DECORATIONS, native2CheckBox.getChecked() );
|
||||||
window.dispose();
|
|
||||||
window.setVisible( true );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void revalidateLayout() {
|
private void revalidateLayout() {
|
||||||
@@ -382,7 +380,7 @@ public class FlatNativeWindowBorderTest
|
|||||||
undecoratedCheckBox = new JCheckBox();
|
undecoratedCheckBox = new JCheckBox();
|
||||||
fullScreenCheckBox = new JCheckBox();
|
fullScreenCheckBox = new JCheckBox();
|
||||||
nativeCheckBox = new JCheckBox();
|
nativeCheckBox = new JCheckBox();
|
||||||
native2CheckBox = new JCheckBox();
|
native2CheckBox = new FlatTriStateCheckBox();
|
||||||
openDialogButton = new JButton();
|
openDialogButton = new JButton();
|
||||||
hideWindowButton = new JButton();
|
hideWindowButton = new JButton();
|
||||||
reopenButton = new JButton();
|
reopenButton = new JButton();
|
||||||
@@ -446,7 +444,6 @@ public class FlatNativeWindowBorderTest
|
|||||||
|
|
||||||
//---- native2CheckBox ----
|
//---- native2CheckBox ----
|
||||||
native2CheckBox.setText("JRootPane.useWindowDecorations");
|
native2CheckBox.setText("JRootPane.useWindowDecorations");
|
||||||
native2CheckBox.setSelected(true);
|
|
||||||
native2CheckBox.addActionListener(e -> native2Changed());
|
native2CheckBox.addActionListener(e -> native2Changed());
|
||||||
add(native2CheckBox, "cell 0 3 3 1");
|
add(native2CheckBox, "cell 0 3 3 1");
|
||||||
|
|
||||||
@@ -507,7 +504,7 @@ public class FlatNativeWindowBorderTest
|
|||||||
private JCheckBox undecoratedCheckBox;
|
private JCheckBox undecoratedCheckBox;
|
||||||
private JCheckBox fullScreenCheckBox;
|
private JCheckBox fullScreenCheckBox;
|
||||||
private JCheckBox nativeCheckBox;
|
private JCheckBox nativeCheckBox;
|
||||||
private JCheckBox native2CheckBox;
|
private FlatTriStateCheckBox native2CheckBox;
|
||||||
private JButton openDialogButton;
|
private JButton openDialogButton;
|
||||||
private JButton hideWindowButton;
|
private JButton hideWindowButton;
|
||||||
private JButton reopenButton;
|
private JButton reopenButton;
|
||||||
|
|||||||
@@ -65,10 +65,9 @@ new FormModel {
|
|||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 0 3 3 1"
|
"value": "cell 0 3 3 1"
|
||||||
} )
|
} )
|
||||||
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
add( new FormComponent( "com.formdev.flatlaf.extras.components.FlatTriStateCheckBox" ) {
|
||||||
name: "native2CheckBox"
|
name: "native2CheckBox"
|
||||||
"text": "JRootPane.useWindowDecorations"
|
"text": "JRootPane.useWindowDecorations"
|
||||||
"selected": true
|
|
||||||
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "native2Changed", false ) )
|
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "native2Changed", false ) )
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 0 3 3 1"
|
"value": "cell 0 3 3 1"
|
||||||
|
|||||||
@@ -74,6 +74,10 @@ public class FlatTextComponentsTest
|
|||||||
JComboBox<String> comboBox3 = new JComboBox<>();
|
JComboBox<String> comboBox3 = new JComboBox<>();
|
||||||
JLabel spinnerLabel = new JLabel();
|
JLabel spinnerLabel = new JLabel();
|
||||||
JSpinner spinner1 = new JSpinner();
|
JSpinner spinner1 = new JSpinner();
|
||||||
|
JSpinner spinner2 = new JSpinner();
|
||||||
|
JSpinner spinner3 = new JSpinner();
|
||||||
|
JComboBox<String> comboBox2 = new JComboBox<>();
|
||||||
|
JComboBox<String> comboBox4 = new JComboBox<>();
|
||||||
JPopupMenu popupMenu1 = new JPopupMenu();
|
JPopupMenu popupMenu1 = new JPopupMenu();
|
||||||
JMenuItem cutMenuItem = new JMenuItem();
|
JMenuItem cutMenuItem = new JMenuItem();
|
||||||
JMenuItem copyMenuItem = new JMenuItem();
|
JMenuItem copyMenuItem = new JMenuItem();
|
||||||
@@ -97,6 +101,10 @@ public class FlatTextComponentsTest
|
|||||||
"[50,fill]" +
|
"[50,fill]" +
|
||||||
"[50,fill]" +
|
"[50,fill]" +
|
||||||
"[]" +
|
"[]" +
|
||||||
|
"[]para" +
|
||||||
|
"[]" +
|
||||||
|
"[]" +
|
||||||
|
"[]" +
|
||||||
"[]"));
|
"[]"));
|
||||||
|
|
||||||
//---- textFieldLabel ----
|
//---- textFieldLabel ----
|
||||||
@@ -307,6 +315,24 @@ public class FlatTextComponentsTest
|
|||||||
spinner1.setName("spinner1");
|
spinner1.setName("spinner1");
|
||||||
add(spinner1, "cell 1 7,growx");
|
add(spinner1, "cell 1 7,growx");
|
||||||
|
|
||||||
|
//---- spinner2 ----
|
||||||
|
spinner2.setName("spinner2");
|
||||||
|
add(spinner2, "cell 1 8,growx,height 40");
|
||||||
|
|
||||||
|
//---- spinner3 ----
|
||||||
|
spinner3.setName("spinner3");
|
||||||
|
add(spinner3, "cell 1 9,growx,hmax 14");
|
||||||
|
|
||||||
|
//---- comboBox2 ----
|
||||||
|
comboBox2.setEditable(true);
|
||||||
|
comboBox2.setName("comboBox2");
|
||||||
|
add(comboBox2, "cell 1 10,growx,height 40");
|
||||||
|
|
||||||
|
//---- comboBox4 ----
|
||||||
|
comboBox4.setEditable(true);
|
||||||
|
comboBox4.setName("comboBox4");
|
||||||
|
add(comboBox4, "cell 1 11,growx,hmax 14");
|
||||||
|
|
||||||
//======== popupMenu1 ========
|
//======== popupMenu1 ========
|
||||||
{
|
{
|
||||||
popupMenu1.setName("popupMenu1");
|
popupMenu1.setName("popupMenu1");
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
JFDML JFormDesigner: "7.0.0.0.194" Java: "13.0.1" encoding: "UTF-8"
|
JFDML JFormDesigner: "7.0.3.1.342" Java: "16" encoding: "UTF-8"
|
||||||
|
|
||||||
new FormModel {
|
new FormModel {
|
||||||
contentType: "form/swing"
|
contentType: "form/swing"
|
||||||
@@ -10,7 +10,7 @@ new FormModel {
|
|||||||
add( new FormContainer( "com.formdev.flatlaf.testing.FlatTestPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
|
add( new FormContainer( "com.formdev.flatlaf.testing.FlatTestPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
|
||||||
"$layoutConstraints": "ltr,insets dialog,hidemode 3"
|
"$layoutConstraints": "ltr,insets dialog,hidemode 3"
|
||||||
"$columnConstraints": "[][][::100][100,fill][fill]"
|
"$columnConstraints": "[][][::100][100,fill][fill]"
|
||||||
"$rowConstraints": "[][][][50,fill][50,fill][50,fill][][]"
|
"$rowConstraints": "[][][][50,fill][50,fill][50,fill][][]para[][][][]"
|
||||||
} ) {
|
} ) {
|
||||||
name: "this"
|
name: "this"
|
||||||
add( new FormComponent( "javax.swing.JLabel" ) {
|
add( new FormComponent( "javax.swing.JLabel" ) {
|
||||||
@@ -233,9 +233,37 @@ new FormModel {
|
|||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 1 7,growx"
|
"value": "cell 1 7,growx"
|
||||||
} )
|
} )
|
||||||
|
add( new FormComponent( "javax.swing.JSpinner" ) {
|
||||||
|
name: "spinner2"
|
||||||
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
|
"value": "cell 1 8,growx,height 40"
|
||||||
|
} )
|
||||||
|
add( new FormComponent( "javax.swing.JSpinner" ) {
|
||||||
|
name: "spinner3"
|
||||||
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
|
"value": "cell 1 9,growx,hmax 14"
|
||||||
|
} )
|
||||||
|
add( new FormComponent( "javax.swing.JComboBox" ) {
|
||||||
|
name: "comboBox2"
|
||||||
|
"editable": true
|
||||||
|
auxiliary() {
|
||||||
|
"JavaCodeGenerator.typeParameters": "String"
|
||||||
|
}
|
||||||
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
|
"value": "cell 1 10,growx,height 40"
|
||||||
|
} )
|
||||||
|
add( new FormComponent( "javax.swing.JComboBox" ) {
|
||||||
|
name: "comboBox4"
|
||||||
|
"editable": true
|
||||||
|
auxiliary() {
|
||||||
|
"JavaCodeGenerator.typeParameters": "String"
|
||||||
|
}
|
||||||
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
|
"value": "cell 1 11,growx,hmax 14"
|
||||||
|
} )
|
||||||
}, new FormLayoutConstraints( null ) {
|
}, new FormLayoutConstraints( null ) {
|
||||||
"location": new java.awt.Point( 0, 0 )
|
"location": new java.awt.Point( 0, 0 )
|
||||||
"size": new java.awt.Dimension( 530, 340 )
|
"size": new java.awt.Dimension( 530, 580 )
|
||||||
} )
|
} )
|
||||||
add( new FormContainer( "javax.swing.JPopupMenu", new FormLayoutManager( class javax.swing.JPopupMenu ) ) {
|
add( new FormContainer( "javax.swing.JPopupMenu", new FormLayoutManager( class javax.swing.JPopupMenu ) ) {
|
||||||
name: "popupMenu1"
|
name: "popupMenu1"
|
||||||
@@ -252,7 +280,7 @@ new FormModel {
|
|||||||
"text": "Paste"
|
"text": "Paste"
|
||||||
} )
|
} )
|
||||||
}, new FormLayoutConstraints( null ) {
|
}, new FormLayoutConstraints( null ) {
|
||||||
"location": new java.awt.Point( 0, 390 )
|
"location": new java.awt.Point( 0, 680 )
|
||||||
"size": new java.awt.Dimension( 91, 87 )
|
"size": new java.awt.Dimension( 91, 87 )
|
||||||
} )
|
} )
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,7 +25,6 @@ import java.util.List;
|
|||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import com.formdev.flatlaf.FlatClientProperties;
|
import com.formdev.flatlaf.FlatClientProperties;
|
||||||
import com.formdev.flatlaf.FlatLaf;
|
|
||||||
import net.miginfocom.swing.*;
|
import net.miginfocom.swing.*;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -36,17 +35,9 @@ public class FlatWindowDecorationsTest
|
|||||||
{
|
{
|
||||||
public static void main( String[] args ) {
|
public static void main( String[] args ) {
|
||||||
SwingUtilities.invokeLater( () -> {
|
SwingUtilities.invokeLater( () -> {
|
||||||
// enable custom window decoration (if LaF supports it)
|
|
||||||
JFrame.setDefaultLookAndFeelDecorated( true );
|
|
||||||
JDialog.setDefaultLookAndFeelDecorated( true );
|
|
||||||
|
|
||||||
FlatTestFrame frame = FlatTestFrame.create( args, "FlatWindowDecorationsTest" );
|
FlatTestFrame frame = FlatTestFrame.create( args, "FlatWindowDecorationsTest" );
|
||||||
frame.applyComponentOrientationToFrame = true;
|
frame.applyComponentOrientationToFrame = true;
|
||||||
|
|
||||||
// WARNING: Do not this in real-world programs.
|
|
||||||
// frame.setUndecorated( true );
|
|
||||||
// frame.getRootPane().setWindowDecorationStyle( JRootPane.FRAME );
|
|
||||||
|
|
||||||
Class<?> cls = FlatWindowDecorationsTest.class;
|
Class<?> cls = FlatWindowDecorationsTest.class;
|
||||||
List<Image> images = Arrays.asList(
|
List<Image> images = Arrays.asList(
|
||||||
new ImageIcon( cls.getResource( "/com/formdev/flatlaf/testing/test16.png" ) ).getImage(),
|
new ImageIcon( cls.getResource( "/com/formdev/flatlaf/testing/test16.png" ) ).getImage(),
|
||||||
@@ -112,7 +103,9 @@ public class FlatWindowDecorationsTest
|
|||||||
|
|
||||||
private void unifiedBackgroundChanged() {
|
private void unifiedBackgroundChanged() {
|
||||||
UIManager.put( "TitlePane.unifiedBackground", unifiedBackgroundCheckBox.isSelected() );
|
UIManager.put( "TitlePane.unifiedBackground", unifiedBackgroundCheckBox.isSelected() );
|
||||||
FlatLaf.updateUI();
|
Window window = SwingUtilities.windowForComponent( this );
|
||||||
|
if( window != null )
|
||||||
|
window.repaint();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void menuBarChanged() {
|
private void menuBarChanged() {
|
||||||
@@ -177,6 +170,16 @@ public class FlatWindowDecorationsTest
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void colorizeTitleBar() {
|
||||||
|
JRootPane rootPane = getWindowRootPane();
|
||||||
|
if( rootPane == null )
|
||||||
|
return;
|
||||||
|
|
||||||
|
boolean colorize = colorizeTitleBarCheckBox.isSelected();
|
||||||
|
rootPane.putClientProperty( FlatClientProperties.TITLE_BAR_BACKGROUND, colorize ? Color.green : null );
|
||||||
|
rootPane.putClientProperty( FlatClientProperties.TITLE_BAR_FOREGROUND, colorize ? Color.blue : null );
|
||||||
|
}
|
||||||
|
|
||||||
private void colorizeMenuBar() {
|
private void colorizeMenuBar() {
|
||||||
boolean colorize = colorizeMenuBarCheckBox.isSelected();
|
boolean colorize = colorizeMenuBarCheckBox.isSelected();
|
||||||
Color menuBarBackground = colorize ? new Color( 0xffccff ) : UIManager.getColor( "MenuBar.background" );
|
Color menuBarBackground = colorize ? new Color( 0xffccff ) : UIManager.getColor( "MenuBar.background" );
|
||||||
@@ -379,6 +382,7 @@ public class FlatWindowDecorationsTest
|
|||||||
colorizeMenuBarCheckBox = new JCheckBox();
|
colorizeMenuBarCheckBox = new JCheckBox();
|
||||||
unifiedBackgroundCheckBox = new JCheckBox();
|
unifiedBackgroundCheckBox = new JCheckBox();
|
||||||
colorizeMenusCheckBox = new JCheckBox();
|
colorizeMenusCheckBox = new JCheckBox();
|
||||||
|
colorizeTitleBarCheckBox = new JCheckBox();
|
||||||
resizableCheckBox = new JCheckBox();
|
resizableCheckBox = new JCheckBox();
|
||||||
maximizedBoundsCheckBox = new JCheckBox();
|
maximizedBoundsCheckBox = new JCheckBox();
|
||||||
undecoratedCheckBox = new JCheckBox();
|
undecoratedCheckBox = new JCheckBox();
|
||||||
@@ -439,6 +443,7 @@ public class FlatWindowDecorationsTest
|
|||||||
"para[]0" +
|
"para[]0" +
|
||||||
"[]0" +
|
"[]0" +
|
||||||
"[]0" +
|
"[]0" +
|
||||||
|
"[]0" +
|
||||||
"[]unrel" +
|
"[]unrel" +
|
||||||
"[]0" +
|
"[]0" +
|
||||||
"[]unrel" +
|
"[]unrel" +
|
||||||
@@ -495,7 +500,7 @@ public class FlatWindowDecorationsTest
|
|||||||
changeTitleButton.addActionListener(e -> changeTitle());
|
changeTitleButton.addActionListener(e -> changeTitle());
|
||||||
panel3.add(changeTitleButton, "cell 0 4");
|
panel3.add(changeTitleButton, "cell 0 4");
|
||||||
}
|
}
|
||||||
add(panel3, "cell 2 0 1 7,aligny top,growy 0");
|
add(panel3, "cell 2 0 1 8,aligny top,growy 0");
|
||||||
|
|
||||||
//---- menuBarEmbeddedCheckBox ----
|
//---- menuBarEmbeddedCheckBox ----
|
||||||
menuBarEmbeddedCheckBox.setText("embedded menu bar");
|
menuBarEmbeddedCheckBox.setText("embedded menu bar");
|
||||||
@@ -529,34 +534,39 @@ public class FlatWindowDecorationsTest
|
|||||||
colorizeMenusCheckBox.addActionListener(e -> colorizeMenus());
|
colorizeMenusCheckBox.addActionListener(e -> colorizeMenus());
|
||||||
add(colorizeMenusCheckBox, "cell 1 3");
|
add(colorizeMenusCheckBox, "cell 1 3");
|
||||||
|
|
||||||
|
//---- colorizeTitleBarCheckBox ----
|
||||||
|
colorizeTitleBarCheckBox.setText("colorize title bar");
|
||||||
|
colorizeTitleBarCheckBox.addActionListener(e -> colorizeTitleBar());
|
||||||
|
add(colorizeTitleBarCheckBox, "cell 0 4");
|
||||||
|
|
||||||
//---- resizableCheckBox ----
|
//---- resizableCheckBox ----
|
||||||
resizableCheckBox.setText("resizable");
|
resizableCheckBox.setText("resizable");
|
||||||
resizableCheckBox.setSelected(true);
|
resizableCheckBox.setSelected(true);
|
||||||
resizableCheckBox.addActionListener(e -> resizableChanged());
|
resizableCheckBox.addActionListener(e -> resizableChanged());
|
||||||
add(resizableCheckBox, "cell 0 4");
|
add(resizableCheckBox, "cell 0 5");
|
||||||
|
|
||||||
//---- maximizedBoundsCheckBox ----
|
//---- maximizedBoundsCheckBox ----
|
||||||
maximizedBoundsCheckBox.setText("maximized bounds (50,100, 1000,700)");
|
maximizedBoundsCheckBox.setText("maximized bounds (50,100, 1000,700)");
|
||||||
maximizedBoundsCheckBox.addActionListener(e -> maximizedBoundsChanged());
|
maximizedBoundsCheckBox.addActionListener(e -> maximizedBoundsChanged());
|
||||||
add(maximizedBoundsCheckBox, "cell 1 4");
|
add(maximizedBoundsCheckBox, "cell 1 5");
|
||||||
|
|
||||||
//---- undecoratedCheckBox ----
|
//---- undecoratedCheckBox ----
|
||||||
undecoratedCheckBox.setText("undecorated");
|
undecoratedCheckBox.setText("undecorated");
|
||||||
undecoratedCheckBox.addActionListener(e -> undecoratedChanged());
|
undecoratedCheckBox.addActionListener(e -> undecoratedChanged());
|
||||||
add(undecoratedCheckBox, "cell 0 5");
|
add(undecoratedCheckBox, "cell 0 6");
|
||||||
|
|
||||||
//---- fullScreenCheckBox ----
|
//---- fullScreenCheckBox ----
|
||||||
fullScreenCheckBox.setText("full screen");
|
fullScreenCheckBox.setText("full screen");
|
||||||
fullScreenCheckBox.addActionListener(e -> fullScreenChanged());
|
fullScreenCheckBox.addActionListener(e -> fullScreenChanged());
|
||||||
add(fullScreenCheckBox, "cell 1 5");
|
add(fullScreenCheckBox, "cell 1 6");
|
||||||
|
|
||||||
//---- label1 ----
|
//---- label1 ----
|
||||||
label1.setText("Style:");
|
label1.setText("Style:");
|
||||||
add(label1, "cell 0 6");
|
add(label1, "cell 0 7");
|
||||||
|
|
||||||
//---- label2 ----
|
//---- label2 ----
|
||||||
label2.setText("Icon:");
|
label2.setText("Icon:");
|
||||||
add(label2, "cell 1 6");
|
add(label2, "cell 1 7");
|
||||||
|
|
||||||
//======== panel1 ========
|
//======== panel1 ========
|
||||||
{
|
{
|
||||||
@@ -621,7 +631,7 @@ public class FlatWindowDecorationsTest
|
|||||||
styleFileChooserRadioButton.addActionListener(e -> decorationStyleChanged());
|
styleFileChooserRadioButton.addActionListener(e -> decorationStyleChanged());
|
||||||
panel1.add(styleFileChooserRadioButton, "cell 0 8");
|
panel1.add(styleFileChooserRadioButton, "cell 0 8");
|
||||||
}
|
}
|
||||||
add(panel1, "cell 0 7");
|
add(panel1, "cell 0 8");
|
||||||
|
|
||||||
//======== panel2 ========
|
//======== panel2 ========
|
||||||
{
|
{
|
||||||
@@ -650,18 +660,18 @@ public class FlatWindowDecorationsTest
|
|||||||
iconTestRandomRadioButton.addActionListener(e -> iconChanged());
|
iconTestRandomRadioButton.addActionListener(e -> iconChanged());
|
||||||
panel2.add(iconTestRandomRadioButton, "cell 0 2");
|
panel2.add(iconTestRandomRadioButton, "cell 0 2");
|
||||||
}
|
}
|
||||||
add(panel2, "cell 1 7");
|
add(panel2, "cell 1 8");
|
||||||
|
|
||||||
//---- openDialogButton ----
|
//---- openDialogButton ----
|
||||||
openDialogButton.setText("Open Dialog");
|
openDialogButton.setText("Open Dialog");
|
||||||
openDialogButton.addActionListener(e -> openDialog());
|
openDialogButton.addActionListener(e -> openDialog());
|
||||||
add(openDialogButton, "cell 0 8 2 1");
|
add(openDialogButton, "cell 0 9 2 1");
|
||||||
|
|
||||||
//---- openFrameButton ----
|
//---- openFrameButton ----
|
||||||
openFrameButton.setText("Open Frame");
|
openFrameButton.setText("Open Frame");
|
||||||
openFrameButton.setMnemonic('A');
|
openFrameButton.setMnemonic('A');
|
||||||
openFrameButton.addActionListener(e -> openFrame());
|
openFrameButton.addActionListener(e -> openFrame());
|
||||||
add(openFrameButton, "cell 0 8 2 1");
|
add(openFrameButton, "cell 0 9 2 1");
|
||||||
|
|
||||||
//======== menuBar ========
|
//======== menuBar ========
|
||||||
{
|
{
|
||||||
@@ -865,6 +875,7 @@ public class FlatWindowDecorationsTest
|
|||||||
private JCheckBox colorizeMenuBarCheckBox;
|
private JCheckBox colorizeMenuBarCheckBox;
|
||||||
private JCheckBox unifiedBackgroundCheckBox;
|
private JCheckBox unifiedBackgroundCheckBox;
|
||||||
private JCheckBox colorizeMenusCheckBox;
|
private JCheckBox colorizeMenusCheckBox;
|
||||||
|
private JCheckBox colorizeTitleBarCheckBox;
|
||||||
private JCheckBox resizableCheckBox;
|
private JCheckBox resizableCheckBox;
|
||||||
private JCheckBox maximizedBoundsCheckBox;
|
private JCheckBox maximizedBoundsCheckBox;
|
||||||
private JCheckBox undecoratedCheckBox;
|
private JCheckBox undecoratedCheckBox;
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ new FormModel {
|
|||||||
add( new FormContainer( "com.formdev.flatlaf.testing.FlatTestPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
|
add( new FormContainer( "com.formdev.flatlaf.testing.FlatTestPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
|
||||||
"$layoutConstraints": "ltr,insets dialog,hidemode 3"
|
"$layoutConstraints": "ltr,insets dialog,hidemode 3"
|
||||||
"$columnConstraints": "[left]para[left][fill]"
|
"$columnConstraints": "[left]para[left][fill]"
|
||||||
"$rowConstraints": "para[]0[]0[]0[]unrel[]0[]unrel[][top][]"
|
"$rowConstraints": "para[]0[]0[]0[]0[]unrel[]0[]unrel[][top][]"
|
||||||
} ) {
|
} ) {
|
||||||
name: "this"
|
name: "this"
|
||||||
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
||||||
@@ -90,7 +90,7 @@ new FormModel {
|
|||||||
"value": "cell 0 4"
|
"value": "cell 0 4"
|
||||||
} )
|
} )
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 2 0 1 7,aligny top,growy 0"
|
"value": "cell 2 0 1 8,aligny top,growy 0"
|
||||||
} )
|
} )
|
||||||
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
||||||
name: "menuBarEmbeddedCheckBox"
|
name: "menuBarEmbeddedCheckBox"
|
||||||
@@ -154,6 +154,16 @@ new FormModel {
|
|||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 1 3"
|
"value": "cell 1 3"
|
||||||
} )
|
} )
|
||||||
|
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
||||||
|
name: "colorizeTitleBarCheckBox"
|
||||||
|
"text": "colorize title bar"
|
||||||
|
auxiliary() {
|
||||||
|
"JavaCodeGenerator.variableLocal": false
|
||||||
|
}
|
||||||
|
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "colorizeTitleBar", false ) )
|
||||||
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
|
"value": "cell 0 4"
|
||||||
|
} )
|
||||||
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
||||||
name: "resizableCheckBox"
|
name: "resizableCheckBox"
|
||||||
"text": "resizable"
|
"text": "resizable"
|
||||||
@@ -163,7 +173,7 @@ new FormModel {
|
|||||||
}
|
}
|
||||||
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "resizableChanged", false ) )
|
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "resizableChanged", false ) )
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 0 4"
|
"value": "cell 0 5"
|
||||||
} )
|
} )
|
||||||
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
||||||
name: "maximizedBoundsCheckBox"
|
name: "maximizedBoundsCheckBox"
|
||||||
@@ -173,7 +183,7 @@ new FormModel {
|
|||||||
}
|
}
|
||||||
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "maximizedBoundsChanged", false ) )
|
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "maximizedBoundsChanged", false ) )
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 1 4"
|
"value": "cell 1 5"
|
||||||
} )
|
} )
|
||||||
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
||||||
name: "undecoratedCheckBox"
|
name: "undecoratedCheckBox"
|
||||||
@@ -183,7 +193,7 @@ new FormModel {
|
|||||||
}
|
}
|
||||||
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "undecoratedChanged", false ) )
|
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "undecoratedChanged", false ) )
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 0 5"
|
"value": "cell 0 6"
|
||||||
} )
|
} )
|
||||||
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
||||||
name: "fullScreenCheckBox"
|
name: "fullScreenCheckBox"
|
||||||
@@ -193,19 +203,19 @@ new FormModel {
|
|||||||
}
|
}
|
||||||
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "fullScreenChanged", false ) )
|
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "fullScreenChanged", false ) )
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 1 5"
|
"value": "cell 1 6"
|
||||||
} )
|
} )
|
||||||
add( new FormComponent( "javax.swing.JLabel" ) {
|
add( new FormComponent( "javax.swing.JLabel" ) {
|
||||||
name: "label1"
|
name: "label1"
|
||||||
"text": "Style:"
|
"text": "Style:"
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 0 6"
|
"value": "cell 0 7"
|
||||||
} )
|
} )
|
||||||
add( new FormComponent( "javax.swing.JLabel" ) {
|
add( new FormComponent( "javax.swing.JLabel" ) {
|
||||||
name: "label2"
|
name: "label2"
|
||||||
"text": "Icon:"
|
"text": "Icon:"
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 1 6"
|
"value": "cell 1 7"
|
||||||
} )
|
} )
|
||||||
add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
|
add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
|
||||||
"$columnConstraints": "[fill]"
|
"$columnConstraints": "[fill]"
|
||||||
@@ -314,7 +324,7 @@ new FormModel {
|
|||||||
"value": "cell 0 8"
|
"value": "cell 0 8"
|
||||||
} )
|
} )
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 0 7"
|
"value": "cell 0 8"
|
||||||
} )
|
} )
|
||||||
add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
|
add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
|
||||||
"$columnConstraints": "[fill]"
|
"$columnConstraints": "[fill]"
|
||||||
@@ -357,14 +367,14 @@ new FormModel {
|
|||||||
"value": "cell 0 2"
|
"value": "cell 0 2"
|
||||||
} )
|
} )
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 1 7"
|
"value": "cell 1 8"
|
||||||
} )
|
} )
|
||||||
add( new FormComponent( "javax.swing.JButton" ) {
|
add( new FormComponent( "javax.swing.JButton" ) {
|
||||||
name: "openDialogButton"
|
name: "openDialogButton"
|
||||||
"text": "Open Dialog"
|
"text": "Open Dialog"
|
||||||
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "openDialog", false ) )
|
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "openDialog", false ) )
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 0 8 2 1"
|
"value": "cell 0 9 2 1"
|
||||||
} )
|
} )
|
||||||
add( new FormComponent( "javax.swing.JButton" ) {
|
add( new FormComponent( "javax.swing.JButton" ) {
|
||||||
name: "openFrameButton"
|
name: "openFrameButton"
|
||||||
@@ -372,7 +382,7 @@ new FormModel {
|
|||||||
"mnemonic": 65
|
"mnemonic": 65
|
||||||
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "openFrame", false ) )
|
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "openFrame", false ) )
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 0 8 2 1"
|
"value": "cell 0 9 2 1"
|
||||||
} )
|
} )
|
||||||
}, new FormLayoutConstraints( null ) {
|
}, new FormLayoutConstraints( null ) {
|
||||||
"location": new java.awt.Point( 0, 0 )
|
"location": new java.awt.Point( 0, 0 )
|
||||||
|
|||||||
Reference in New Issue
Block a user