mirror of
https://github.com/JFormDesigner/FlatLaf.git
synced 2026-02-11 06:27:13 -06:00
Compare commits
7 Commits
fonts/inte
...
3.6
| Author | SHA1 | Date | |
|---|---|---|---|
|
2870ee5c51 | ||
|
|
23f8ce867b | ||
|
|
835a1f155b | ||
|
|
3925f198d9 | ||
|
|
d8e59f2cf3 | ||
|
|
666b99971d | ||
|
|
ae4037ee82 |
30
CHANGELOG.md
30
CHANGELOG.md
@@ -1,7 +1,7 @@
|
||||
FlatLaf Change Log
|
||||
==================
|
||||
|
||||
## 3.6-SNAPSHOT
|
||||
## 3.6
|
||||
|
||||
#### New features and improvements
|
||||
|
||||
@@ -21,12 +21,17 @@ FlatLaf Change Log
|
||||
- List: Support for alternate row highlighting. (PR #939)
|
||||
- Tree: Support for alternate row highlighting. (PR #903)
|
||||
- Tree: Support wide cell renderer. (issue #922)
|
||||
- ScrollBar: Use rounded thumb also on Windows (as on macOS and Linux) and made
|
||||
thumb slightly darker/lighter. (issue #918)
|
||||
- Extras: `FlatSVGIcon` color filters now can access painting component to
|
||||
implement component state based color mappings. (issue #906)
|
||||
- Linux: Added `libflatlaf-linux-arm64.so` for Linux on ARM64. (issue #899)
|
||||
- Linux: Use X11 window manager events to resize window, if FlatLaf window
|
||||
decorations are enabled. This gives FlatLaf windows a more "native" feeling.
|
||||
(issue #866)
|
||||
- Linux:
|
||||
- Rounded iconify/maximize/close buttons if using FlatLaf window decorations.
|
||||
(PR #971)
|
||||
- Added `libflatlaf-linux-arm64.so` for Linux on ARM64. (issue #899)
|
||||
- Use X11 window manager events to resize window, if FlatLaf window
|
||||
decorations are enabled. This gives FlatLaf windows a more "native" feeling.
|
||||
(issue #866)
|
||||
- IntelliJ Themes:
|
||||
- Updated to latest versions and fixed various issues.
|
||||
- Support customizing through properties files. (issue #824)
|
||||
@@ -67,6 +72,21 @@ FlatLaf Change Log
|
||||
application where multiple class loaders are involved. E.g. in Eclipse plugin
|
||||
or in LibreOffice extension. (issues #955 and #851)
|
||||
- HTML: Fixed rendering of `<hr noshade>` in dark themes. (issue #932)
|
||||
- TextComponents: `selectAllOnFocusPolicy` related changes:
|
||||
- No longer select all text if selection (or caret position) was changed by
|
||||
application and `selectAllOnFocusPolicy` is `once` (the default). (issue
|
||||
#983)
|
||||
- FormattedTextField and Spinner: `selectAllOnFocusPolicy = once` behaves now
|
||||
as `always` (was `never` before), which means that all text is selected when
|
||||
component gains focus. This is because of special behavior of
|
||||
`JFormattedTextField` that did not allow implementation of `once`.
|
||||
- Client property `JTextField.selectAllOnFocusPolicy` now also works on
|
||||
(editable) `JComboBox` and on `JSpinner`.
|
||||
- Added client property `JTextField.selectAllOnMouseClick` to override UI
|
||||
property `TextComponent.selectAllOnMouseClick`. (issue #961)
|
||||
- For `selectAllOnMouseClick = true`, clicking with the mouse into the text
|
||||
field, to focus it, now always selects all text, even if
|
||||
`selectAllOnFocusPolicy` is `once`.
|
||||
|
||||
#### Incompatibilities
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#Signature file v4.1
|
||||
#Version 3.5.2
|
||||
#Version 3.6
|
||||
|
||||
CLSS public abstract interface com.formdev.flatlaf.FlatClientProperties
|
||||
fld public final static java.lang.String BUTTON_TYPE = "JButton.buttonType"
|
||||
@@ -24,6 +24,7 @@ fld public final static java.lang.String MINIMUM_HEIGHT = "JComponent.minimumHei
|
||||
fld public final static java.lang.String MINIMUM_WIDTH = "JComponent.minimumWidth"
|
||||
fld public final static java.lang.String OUTLINE = "JComponent.outline"
|
||||
fld public final static java.lang.String OUTLINE_ERROR = "error"
|
||||
fld public final static java.lang.String OUTLINE_SUCCESS = "success"
|
||||
fld public final static java.lang.String OUTLINE_WARNING = "warning"
|
||||
fld public final static java.lang.String PLACEHOLDER_TEXT = "JTextField.placeholderText"
|
||||
fld public final static java.lang.String POPUP_BORDER_CORNER_RADIUS = "Popup.borderCornerRadius"
|
||||
@@ -40,6 +41,7 @@ fld public final static java.lang.String SELECT_ALL_ON_FOCUS_POLICY = "JTextFiel
|
||||
fld public final static java.lang.String SELECT_ALL_ON_FOCUS_POLICY_ALWAYS = "always"
|
||||
fld public final static java.lang.String SELECT_ALL_ON_FOCUS_POLICY_NEVER = "never"
|
||||
fld public final static java.lang.String SELECT_ALL_ON_FOCUS_POLICY_ONCE = "once"
|
||||
fld public final static java.lang.String SELECT_ALL_ON_MOUSE_CLICK = "JTextField.selectAllOnMouseClick"
|
||||
fld public final static java.lang.String SPLIT_PANE_EXPANDABLE_SIDE = "JSplitPane.expandableSide"
|
||||
fld public final static java.lang.String SPLIT_PANE_EXPANDABLE_SIDE_LEFT = "left"
|
||||
fld public final static java.lang.String SPLIT_PANE_EXPANDABLE_SIDE_RIGHT = "right"
|
||||
@@ -107,6 +109,7 @@ fld public final static java.lang.String TITLE_BAR_SHOW_ICONIFFY = "JRootPane.ti
|
||||
fld public final static java.lang.String TITLE_BAR_SHOW_MAXIMIZE = "JRootPane.titleBarShowMaximize"
|
||||
fld public final static java.lang.String TITLE_BAR_SHOW_TITLE = "JRootPane.titleBarShowTitle"
|
||||
fld public final static java.lang.String TREE_PAINT_SELECTION = "JTree.paintSelection"
|
||||
fld public final static java.lang.String TREE_WIDE_CELL_RENDERER = "JTree.wideCellRenderer"
|
||||
fld public final static java.lang.String TREE_WIDE_SELECTION = "JTree.wideSelection"
|
||||
fld public final static java.lang.String USE_WINDOW_DECORATIONS = "JRootPane.useWindowDecorations"
|
||||
fld public final static java.lang.String WINDOW_STYLE = "Window.style"
|
||||
@@ -220,8 +223,11 @@ meth public static java.lang.String getPreferredFontFamily()
|
||||
meth public static java.lang.String getPreferredLightFontFamily()
|
||||
meth public static java.lang.String getPreferredMonospacedFontFamily()
|
||||
meth public static java.lang.String getPreferredSemiboldFontFamily()
|
||||
meth public static java.lang.String getUIKeyLightOrDarkPrefix(boolean)
|
||||
meth public static java.util.Map<java.lang.String,java.lang.Class<?>> getStyleableInfos(javax.swing.JComponent)
|
||||
meth public static java.util.Map<java.lang.String,java.lang.String> getGlobalExtraDefaults()
|
||||
meth public static java.util.Set<java.lang.String> getUIKeyPlatformPrefixes()
|
||||
meth public static java.util.Set<java.lang.String> getUIKeySpecialPrefixes()
|
||||
meth public static java.util.function.Function<java.lang.String,java.awt.Color> getSystemColorGetter()
|
||||
meth public static javax.swing.UIDefaults$ActiveValue createActiveFontValue(float)
|
||||
meth public static void disableWindowsD3Donscreen()
|
||||
@@ -255,7 +261,7 @@ meth public void setExtraDefaults(java.util.Map<java.lang.String,java.lang.Strin
|
||||
meth public void uninitialize()
|
||||
meth public void unregisterUIDefaultsGetter(java.util.function.Function<java.lang.Object,java.lang.Object>)
|
||||
supr javax.swing.plaf.basic.BasicLookAndFeel
|
||||
hfds DESKTOPFONTHINTS,aquaLoaded,customDefaultsSources,desktopPropertyListener,desktopPropertyName,desktopPropertyName2,extraDefaults,globalExtraDefaults,mnemonicHandler,oldPopupFactory,postInitialization,preferredFontFamily,preferredLightFontFamily,preferredMonospacedFontFamily,preferredSemiboldFontFamily,subMenuUsabilityHelperInstalled,systemColorGetter,uiDefaultsGetters,updateUIPending
|
||||
hfds DESKTOPFONTHINTS,aquaLoaded,customDefaultsSources,desktopPropertyListener,desktopPropertyName,desktopPropertyName2,extraDefaults,globalExtraDefaults,linuxPopupMenuCanceler,mnemonicHandler,oldPopupFactory,postInitialization,preferredFontFamily,preferredLightFontFamily,preferredMonospacedFontFamily,preferredSemiboldFontFamily,subMenuUsabilityHelperInstalled,systemColorGetter,uiDefaultsGetters,uiKeyPlatformPrefixes,uiKeySpecialPrefixes,updateUIPending
|
||||
hcls ActiveFont,FlatUIDefaults,ImageIconUIResource
|
||||
|
||||
CLSS public abstract interface static com.formdev.flatlaf.FlatLaf$DisabledIconProvider
|
||||
@@ -318,7 +324,7 @@ meth public static boolean setup(java.io.InputStream)
|
||||
meth public static com.formdev.flatlaf.FlatLaf createLaf(com.formdev.flatlaf.IntelliJTheme)
|
||||
meth public static com.formdev.flatlaf.FlatLaf createLaf(java.io.InputStream) throws java.io.IOException
|
||||
supr java.lang.Object
|
||||
hfds checkboxDuplicateColors,checkboxKeyMapping,colors,icons,isMaterialUILite,namedColors,ui,uiKeyCopying,uiKeyDoNotOverride,uiKeyExcludes,uiKeyInverseMapping,uiKeyMapping
|
||||
hfds checkboxDuplicateColors,checkboxKeyMapping,jsonColors,jsonIcons,jsonUI,namedColors,uiKeyCopying,uiKeyDoNotOverride,uiKeyExcludes,uiKeyInverseMapping,uiKeyMapping
|
||||
|
||||
CLSS public static com.formdev.flatlaf.IntelliJTheme$ThemeLaf
|
||||
outer com.formdev.flatlaf.IntelliJTheme
|
||||
@@ -413,6 +419,7 @@ innr public static Fade
|
||||
innr public static HSLChange
|
||||
innr public static HSLIncreaseDecrease
|
||||
innr public static Mix
|
||||
innr public static Mix2
|
||||
meth public !varargs static java.awt.Color applyFunctions(java.awt.Color,com.formdev.flatlaf.util.ColorFunctions$ColorFunction[])
|
||||
meth public static float clamp(float)
|
||||
meth public static float luma(java.awt.Color)
|
||||
@@ -474,6 +481,16 @@ meth public java.lang.String toString()
|
||||
meth public void apply(float[])
|
||||
supr java.lang.Object
|
||||
|
||||
CLSS public static com.formdev.flatlaf.util.ColorFunctions$Mix2
|
||||
outer com.formdev.flatlaf.util.ColorFunctions
|
||||
cons public init(java.awt.Color,float)
|
||||
fld public final float weight
|
||||
fld public final java.awt.Color color1
|
||||
intf com.formdev.flatlaf.util.ColorFunctions$ColorFunction
|
||||
meth public java.lang.String toString()
|
||||
meth public void apply(float[])
|
||||
supr java.lang.Object
|
||||
|
||||
CLSS public com.formdev.flatlaf.util.CubicBezierEasing
|
||||
cons public init(float,float,float,float)
|
||||
fld public final static com.formdev.flatlaf.util.CubicBezierEasing EASE
|
||||
@@ -755,6 +772,7 @@ supr java.lang.Object
|
||||
CLSS public com.formdev.flatlaf.util.SystemInfo
|
||||
cons public init()
|
||||
fld public final static boolean isAARCH64
|
||||
fld public final static boolean isGNOME
|
||||
fld public final static boolean isJava_11_orLater
|
||||
fld public final static boolean isJava_12_orLater
|
||||
fld public final static boolean isJava_15_orLater
|
||||
@@ -771,6 +789,7 @@ fld public final static boolean isMacOS_10_11_ElCapitan_orLater
|
||||
fld public final static boolean isMacOS_10_14_Mojave_orLater
|
||||
fld public final static boolean isMacOS_10_15_Catalina_orLater
|
||||
fld public final static boolean isProjector
|
||||
fld public final static boolean isUnknownOS
|
||||
fld public final static boolean isWebswing
|
||||
fld public final static boolean isWinPE
|
||||
fld public final static boolean isWindows
|
||||
|
||||
@@ -21,6 +21,8 @@ import java.awt.IllegalComponentStateException;
|
||||
import java.awt.Window;
|
||||
import java.util.Objects;
|
||||
import javax.swing.JComponent;
|
||||
import javax.swing.JFormattedTextField;
|
||||
import javax.swing.JSpinner;
|
||||
import javax.swing.SwingConstants;
|
||||
|
||||
/**
|
||||
@@ -1209,12 +1211,15 @@ public interface FlatClientProperties
|
||||
/**
|
||||
* Specifies whether all text is selected when the text component gains focus.
|
||||
* <p>
|
||||
* <strong>Component</strong> {@link javax.swing.JTextField} (and subclasses)<br>
|
||||
* <strong>Components</strong> {@link javax.swing.text.JTextComponent} (and subclasses),
|
||||
* {@link javax.swing.JComboBox} (since 3.6) and {@link javax.swing.JSpinner} (since 3.6)<br>
|
||||
* <strong>Value type</strong> {@link java.lang.String}<br>
|
||||
* <strong>Allowed Values</strong>
|
||||
* {@link #SELECT_ALL_ON_FOCUS_POLICY_NEVER},
|
||||
* {@link #SELECT_ALL_ON_FOCUS_POLICY_ONCE} (default) or
|
||||
* {@link #SELECT_ALL_ON_FOCUS_POLICY_ALWAYS}
|
||||
*
|
||||
* @see #SELECT_ALL_ON_MOUSE_CLICK
|
||||
*/
|
||||
String SELECT_ALL_ON_FOCUS_POLICY = "JTextField.selectAllOnFocusPolicy";
|
||||
|
||||
@@ -1229,6 +1234,12 @@ public interface FlatClientProperties
|
||||
* Select all text when the text component gains focus for the first time
|
||||
* and selection was not modified (is at end of text).
|
||||
* This is the default.
|
||||
* <p>
|
||||
* <b>Limitations:</b>
|
||||
* For {@link JFormattedTextField} and {@link JSpinner} this behaves
|
||||
* as {@link #SELECT_ALL_ON_FOCUS_POLICY_ALWAYS}.
|
||||
* This is because of special behavior of {@link JFormattedTextField}
|
||||
* that did not allow implementation of {@code "once"}.
|
||||
*
|
||||
* @see #SELECT_ALL_ON_FOCUS_POLICY
|
||||
*/
|
||||
@@ -1241,6 +1252,19 @@ public interface FlatClientProperties
|
||||
*/
|
||||
String SELECT_ALL_ON_FOCUS_POLICY_ALWAYS = "always";
|
||||
|
||||
/**
|
||||
* Specifies whether all text is selected when when clicking with the mouse
|
||||
* into the text field (and if "select all on focus" policy is enabled).
|
||||
* <p>
|
||||
* <strong>Components</strong> {@link javax.swing.text.JTextComponent} (and subclasses),
|
||||
* {@link javax.swing.JComboBox} and {@link javax.swing.JSpinner}<br>
|
||||
* <strong>Value type</strong> {@link java.lang.Boolean}
|
||||
*
|
||||
* @see #SELECT_ALL_ON_FOCUS_POLICY
|
||||
* @since 3.6
|
||||
*/
|
||||
String SELECT_ALL_ON_MOUSE_CLICK = "JTextField.selectAllOnMouseClick";
|
||||
|
||||
/**
|
||||
* Placeholder text that is only painted if the text field is empty.
|
||||
* <p>
|
||||
|
||||
@@ -18,44 +18,95 @@ package com.formdev.flatlaf.icons;
|
||||
|
||||
import java.awt.Color;
|
||||
import java.awt.Component;
|
||||
import java.awt.Container;
|
||||
import java.awt.Dimension;
|
||||
import java.awt.Graphics2D;
|
||||
import java.awt.RenderingHints;
|
||||
import java.awt.Insets;
|
||||
import java.awt.Window;
|
||||
import javax.swing.SwingUtilities;
|
||||
import com.formdev.flatlaf.ui.FlatButtonUI;
|
||||
import com.formdev.flatlaf.ui.FlatTitlePane;
|
||||
import com.formdev.flatlaf.ui.FlatUIUtils;
|
||||
import com.formdev.flatlaf.util.DerivedColor;
|
||||
import com.formdev.flatlaf.util.HiDPIUtils;
|
||||
import com.formdev.flatlaf.util.UIScale;
|
||||
|
||||
/**
|
||||
* Base class for window icons.
|
||||
*
|
||||
* @uiDefault TitlePane.buttonSize Dimension
|
||||
* @uiDefault TitlePane.buttonInsets Insets optional
|
||||
* @uiDefault TitlePane.buttonArc int optional
|
||||
* @uiDefault TitlePane.buttonSymbolHeight int
|
||||
* @uiDefault TitlePane.buttonHoverBackground Color
|
||||
* @uiDefault TitlePane.buttonPressedBackground Color
|
||||
* @uiDefault TitlePane.buttonBackground Color optional
|
||||
* @uiDefault TitlePane.buttonForeground Color optional
|
||||
* @uiDefault TitlePane.buttonInactiveBackground Color optional
|
||||
* @uiDefault TitlePane.buttonInactiveForeground Color optional
|
||||
* @uiDefault TitlePane.buttonHoverBackground Color optional
|
||||
* @uiDefault TitlePane.buttonHoverForeground Color optional
|
||||
* @uiDefault TitlePane.buttonPressedBackground Color optional
|
||||
* @uiDefault TitlePane.buttonPressedForeground Color optional
|
||||
*
|
||||
* @author Karl Tauber
|
||||
*/
|
||||
public abstract class FlatWindowAbstractIcon
|
||||
extends FlatAbstractIcon
|
||||
{
|
||||
private final int symbolHeight;
|
||||
private final Color hoverBackground;
|
||||
private final Color pressedBackground;
|
||||
/** @since 3.6 */ protected final Insets insets;
|
||||
/** @since 3.6 */ protected final int arc;
|
||||
/** @since 3.6 */ protected final int symbolHeight;
|
||||
|
||||
/** @since 3.6 */ protected final Color background;
|
||||
/** @since 3.6 */ protected final Color foreground;
|
||||
/** @since 3.6 */ protected final Color inactiveBackground;
|
||||
/** @since 3.6 */ protected final Color inactiveForeground;
|
||||
protected final Color hoverBackground;
|
||||
/** @since 3.6 */ protected final Color hoverForeground;
|
||||
protected final Color pressedBackground;
|
||||
/** @since 3.6 */ protected final Color pressedForeground;
|
||||
|
||||
/** @since 3.2 */
|
||||
protected FlatWindowAbstractIcon( String windowStyle ) {
|
||||
this( FlatUIUtils.getSubUIDimension( "TitlePane.buttonSize", windowStyle ),
|
||||
FlatUIUtils.getSubUIInt( "TitlePane.buttonSymbolHeight", windowStyle, 10 ),
|
||||
FlatUIUtils.getSubUIColor( "TitlePane.buttonHoverBackground", windowStyle ),
|
||||
FlatUIUtils.getSubUIColor( "TitlePane.buttonPressedBackground", windowStyle ) );
|
||||
this( windowStyle, null, null, null, null, null, null, null, null );
|
||||
}
|
||||
|
||||
/** @since 3.2 */
|
||||
protected FlatWindowAbstractIcon( Dimension size, int symbolHeight, Color hoverBackground, Color pressedBackground ) {
|
||||
/** @since 3.6 */
|
||||
protected FlatWindowAbstractIcon( String windowStyle,
|
||||
Color background, Color foreground, Color inactiveBackground, Color inactiveForeground,
|
||||
Color hoverBackground, Color hoverForeground, Color pressedBackground, Color pressedForeground )
|
||||
{
|
||||
this( FlatUIUtils.getSubUIDimension( "TitlePane.buttonSize", windowStyle ),
|
||||
FlatUIUtils.getSubUIInsets( "TitlePane.buttonInsets", windowStyle ),
|
||||
FlatUIUtils.getSubUIInt( "TitlePane.buttonArc", windowStyle, 0 ),
|
||||
FlatUIUtils.getSubUIInt( "TitlePane.buttonSymbolHeight", windowStyle, 10 ),
|
||||
(background != null) ? background : FlatUIUtils.getSubUIColor( "TitlePane.buttonBackground", windowStyle ),
|
||||
(foreground != null) ? foreground : FlatUIUtils.getSubUIColor( "TitlePane.buttonForeground", windowStyle ),
|
||||
(inactiveBackground != null) ? inactiveBackground : FlatUIUtils.getSubUIColor( "TitlePane.buttonInactiveBackground", windowStyle ),
|
||||
(inactiveForeground != null) ? inactiveForeground : FlatUIUtils.getSubUIColor( "TitlePane.buttonInactiveForeground", windowStyle ),
|
||||
(hoverBackground != null) ? hoverBackground : FlatUIUtils.getSubUIColor( "TitlePane.buttonHoverBackground", windowStyle ),
|
||||
(hoverForeground != null) ? hoverForeground : FlatUIUtils.getSubUIColor( "TitlePane.buttonHoverForeground", windowStyle ),
|
||||
(pressedBackground != null) ? pressedBackground : FlatUIUtils.getSubUIColor( "TitlePane.buttonPressedBackground", windowStyle ),
|
||||
(pressedForeground != null) ? pressedForeground : FlatUIUtils.getSubUIColor( "TitlePane.buttonPressedForeground", windowStyle ) );
|
||||
}
|
||||
|
||||
/** @since 3.6 */
|
||||
protected FlatWindowAbstractIcon( Dimension size, Insets insets, int arc, int symbolHeight,
|
||||
Color background, Color foreground, Color inactiveBackground, Color inactiveForeground,
|
||||
Color hoverBackground, Color hoverForeground, Color pressedBackground, Color pressedForeground )
|
||||
{
|
||||
super( size.width, size.height, null );
|
||||
this.insets = (insets != null) ? insets : new Insets( 0, 0, 0, 0 );
|
||||
this.arc = arc;
|
||||
this.symbolHeight = symbolHeight;
|
||||
|
||||
this.background = background;
|
||||
this.foreground = foreground;
|
||||
this.inactiveBackground = inactiveBackground;
|
||||
this.inactiveForeground = inactiveForeground;
|
||||
this.hoverBackground = hoverBackground;
|
||||
this.hoverForeground = hoverForeground;
|
||||
this.pressedBackground = pressedBackground;
|
||||
this.pressedForeground = pressedForeground;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -69,26 +120,39 @@ public abstract class FlatWindowAbstractIcon
|
||||
/** @since 3.5.2 */
|
||||
@Override
|
||||
protected void paintBackground( Component c, Graphics2D g, int x, int y ) {
|
||||
Color background = FlatButtonUI.buttonStateColor( c, null, null, null, hoverBackground, pressedBackground );
|
||||
Color bg = null;
|
||||
if( background != null || inactiveBackground != null ) {
|
||||
Window window = SwingUtilities.windowForComponent( c );
|
||||
bg = (window == null || window.isActive()) ? background : inactiveBackground;
|
||||
}
|
||||
|
||||
Color background = FlatButtonUI.buttonStateColor( c, bg, null, null, hoverBackground, pressedBackground );
|
||||
if( background != null ) {
|
||||
// disable antialiasing for background rectangle painting to avoid blurry edges when scaled (e.g. at 125% or 175%)
|
||||
Object oldHint = g.getRenderingHint( RenderingHints.KEY_ANTIALIASING );
|
||||
g.setRenderingHint( RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF );
|
||||
Insets insets = UIScale.scale( this.insets );
|
||||
float arc = UIScale.scale( (float) this.arc );
|
||||
|
||||
// fill background of whole component
|
||||
g.setColor( FlatUIUtils.deriveColor( background, c.getBackground() ) );
|
||||
g.fillRect( 0, 0, c.getWidth(), c.getHeight() );
|
||||
// derive color from title pane background
|
||||
if( background instanceof DerivedColor ) {
|
||||
Container titlePane = SwingUtilities.getAncestorOfClass( FlatTitlePane.class, c );
|
||||
Component baseComp = (titlePane != null) ? titlePane : c;
|
||||
background = FlatUIUtils.deriveColor( background, baseComp.getBackground() );
|
||||
}
|
||||
|
||||
g.setRenderingHint( RenderingHints.KEY_ANTIALIASING, oldHint );
|
||||
g.setColor( background );
|
||||
FlatUIUtils.paintComponentBackground( g, insets.left, insets.top,
|
||||
c.getWidth() - insets.left - insets.right,
|
||||
c.getHeight() - insets.top - insets.bottom,
|
||||
0, arc );
|
||||
}
|
||||
}
|
||||
|
||||
protected Color getForeground( Component c ) {
|
||||
return c.getForeground();
|
||||
}
|
||||
|
||||
/** @since 3.2 */
|
||||
protected int getSymbolHeight() {
|
||||
return symbolHeight;
|
||||
Color fg = null;
|
||||
if( foreground != null || inactiveForeground != null ) {
|
||||
Window window = SwingUtilities.windowForComponent( c );
|
||||
fg = (window == null || window.isActive()) ? foreground : inactiveForeground;
|
||||
}
|
||||
return FlatButtonUI.buttonStateColor( c, (fg != null) ? fg : c.getForeground(),
|
||||
null, null, hoverForeground, pressedForeground );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,53 +17,54 @@
|
||||
package com.formdev.flatlaf.icons;
|
||||
|
||||
import java.awt.BasicStroke;
|
||||
import java.awt.Color;
|
||||
import java.awt.Component;
|
||||
import java.awt.Graphics2D;
|
||||
import java.awt.geom.Path2D;
|
||||
import com.formdev.flatlaf.ui.FlatButtonUI;
|
||||
import com.formdev.flatlaf.ui.FlatUIUtils;
|
||||
import com.formdev.flatlaf.util.SystemInfo;
|
||||
|
||||
/**
|
||||
* "close" icon for windows (frames and dialogs).
|
||||
*
|
||||
* @uiDefault TitlePane.closeHoverBackground Color
|
||||
* @uiDefault TitlePane.closePressedBackground Color
|
||||
* @uiDefault TitlePane.closeHoverForeground Color
|
||||
* @uiDefault TitlePane.closePressedForeground Color
|
||||
* @uiDefault TitlePane.closeBackground Color optional
|
||||
* @uiDefault TitlePane.closeForeground Color optional
|
||||
* @uiDefault TitlePane.closeInactiveBackground Color optional
|
||||
* @uiDefault TitlePane.closeInactiveForeground Color optional
|
||||
* @uiDefault TitlePane.closeHoverBackground Color optional
|
||||
* @uiDefault TitlePane.closeHoverForeground Color optional
|
||||
* @uiDefault TitlePane.closePressedBackground Color optional
|
||||
* @uiDefault TitlePane.closePressedForeground Color optional
|
||||
*
|
||||
* @author Karl Tauber
|
||||
*/
|
||||
public class FlatWindowCloseIcon
|
||||
extends FlatWindowAbstractIcon
|
||||
{
|
||||
private final Color hoverForeground;
|
||||
private final Color pressedForeground;
|
||||
|
||||
public FlatWindowCloseIcon() {
|
||||
this( null );
|
||||
}
|
||||
|
||||
/** @since 3.2 */
|
||||
public FlatWindowCloseIcon( String windowStyle ) {
|
||||
super( FlatUIUtils.getSubUIDimension( "TitlePane.buttonSize", windowStyle ),
|
||||
FlatUIUtils.getSubUIInt( "TitlePane.buttonSymbolHeight", windowStyle, 10 ),
|
||||
super( windowStyle,
|
||||
FlatUIUtils.getSubUIColor( "TitlePane.closeBackground", windowStyle ),
|
||||
FlatUIUtils.getSubUIColor( "TitlePane.closeForeground", windowStyle ),
|
||||
FlatUIUtils.getSubUIColor( "TitlePane.closeInactiveBackground", windowStyle ),
|
||||
FlatUIUtils.getSubUIColor( "TitlePane.closeInactiveForeground", windowStyle ),
|
||||
FlatUIUtils.getSubUIColor( "TitlePane.closeHoverBackground", windowStyle ),
|
||||
FlatUIUtils.getSubUIColor( "TitlePane.closePressedBackground", windowStyle ) );
|
||||
|
||||
hoverForeground = FlatUIUtils.getSubUIColor( "TitlePane.closeHoverForeground", windowStyle );
|
||||
pressedForeground = FlatUIUtils.getSubUIColor( "TitlePane.closePressedForeground", windowStyle );
|
||||
FlatUIUtils.getSubUIColor( "TitlePane.closeHoverForeground", windowStyle ),
|
||||
FlatUIUtils.getSubUIColor( "TitlePane.closePressedBackground", windowStyle ),
|
||||
FlatUIUtils.getSubUIColor( "TitlePane.closePressedForeground", windowStyle ) );
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void paintIconAt1x( Graphics2D g, int x, int y, int width, int height, double scaleFactor ) {
|
||||
int iwh = (int) (getSymbolHeight() * scaleFactor);
|
||||
int iwh = (int) (symbolHeight * scaleFactor);
|
||||
int ix = x + ((width - iwh) / 2);
|
||||
int iy = y + ((height - iwh) / 2);
|
||||
int ix2 = ix + iwh - 1;
|
||||
int iy2 = iy + iwh - 1;
|
||||
float thickness = Math.max( SystemInfo.isWindows_11_orLater ? (float) scaleFactor : (int) scaleFactor, 1 );
|
||||
boolean isWindows10 = SystemInfo.isWindows_10_orLater && !SystemInfo.isWindows_11_orLater;
|
||||
float thickness = Math.max( isWindows10 ? (int) scaleFactor : (float) scaleFactor, 1 );
|
||||
|
||||
Path2D path = new Path2D.Float( Path2D.WIND_EVEN_ODD, 4 );
|
||||
path.moveTo( ix, iy );
|
||||
@@ -73,9 +74,4 @@ public class FlatWindowCloseIcon
|
||||
g.setStroke( new BasicStroke( thickness ) );
|
||||
g.draw( path );
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Color getForeground( Component c ) {
|
||||
return FlatButtonUI.buttonStateColor( c, c.getForeground(), null, null, hoverForeground, pressedForeground );
|
||||
}
|
||||
}
|
||||
|
||||
@@ -37,7 +37,7 @@ public class FlatWindowIconifyIcon
|
||||
|
||||
@Override
|
||||
protected void paintIconAt1x( Graphics2D g, int x, int y, int width, int height, double scaleFactor ) {
|
||||
int iw = (int) (getSymbolHeight() * scaleFactor);
|
||||
int iw = (int) (symbolHeight * scaleFactor);
|
||||
int ih = Math.max( (int) scaleFactor, 1 );
|
||||
int ix = x + ((width - iw) / 2);
|
||||
int iy = y + ((height - ih) / 2);
|
||||
|
||||
@@ -39,10 +39,11 @@ public class FlatWindowMaximizeIcon
|
||||
|
||||
@Override
|
||||
protected void paintIconAt1x( Graphics2D g, int x, int y, int width, int height, double scaleFactor ) {
|
||||
int iwh = (int) (getSymbolHeight() * scaleFactor);
|
||||
int iwh = (int) (symbolHeight * scaleFactor);
|
||||
int ix = x + ((width - iwh) / 2);
|
||||
int iy = y + ((height - iwh) / 2);
|
||||
float thickness = Math.max( SystemInfo.isWindows_11_orLater ? (float) scaleFactor : (int) scaleFactor, 1 );
|
||||
boolean isWindows10 = SystemInfo.isWindows_10_orLater && !SystemInfo.isWindows_11_orLater;
|
||||
float thickness = Math.max( isWindows10 ? (int) scaleFactor : (float) scaleFactor, 1 );
|
||||
int arc = Math.max( (int) (1.5 * scaleFactor), 2 );
|
||||
|
||||
g.fill( SystemInfo.isWindows_11_orLater
|
||||
|
||||
@@ -42,14 +42,15 @@ public class FlatWindowRestoreIcon
|
||||
|
||||
@Override
|
||||
protected void paintIconAt1x( Graphics2D g, int x, int y, int width, int height, double scaleFactor ) {
|
||||
int iwh = (int) (getSymbolHeight() * scaleFactor);
|
||||
int iwh = (int) (symbolHeight * scaleFactor);
|
||||
int ix = x + ((width - iwh) / 2);
|
||||
int iy = y + ((height - iwh) / 2);
|
||||
float thickness = Math.max( SystemInfo.isWindows_11_orLater ? (float) scaleFactor : (int) scaleFactor, 1 );
|
||||
boolean isWindows10 = SystemInfo.isWindows_10_orLater && !SystemInfo.isWindows_11_orLater;
|
||||
float thickness = Math.max( isWindows10 ? (int) scaleFactor : (float) scaleFactor, 1 );
|
||||
int arc = Math.max( (int) (1.5 * scaleFactor), 2 );
|
||||
int arcOuter = (int) (arc + (1.5 * scaleFactor));
|
||||
|
||||
int rwh = (int) ((getSymbolHeight() - 2) * scaleFactor);
|
||||
int rwh = (int) ((symbolHeight - 2) * scaleFactor);
|
||||
int ro2 = iwh - rwh;
|
||||
|
||||
// upper-right rectangle
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
package com.formdev.flatlaf.ui;
|
||||
|
||||
import static com.formdev.flatlaf.FlatClientProperties.*;
|
||||
import java.awt.Container;
|
||||
import java.awt.EventQueue;
|
||||
import java.awt.Rectangle;
|
||||
import java.awt.event.ActionEvent;
|
||||
@@ -24,7 +25,9 @@ import java.awt.event.FocusEvent;
|
||||
import java.awt.event.MouseEvent;
|
||||
import javax.swing.Action;
|
||||
import javax.swing.ActionMap;
|
||||
import javax.swing.JComboBox;
|
||||
import javax.swing.JFormattedTextField;
|
||||
import javax.swing.JSpinner;
|
||||
import javax.swing.SwingUtilities;
|
||||
import javax.swing.UIManager;
|
||||
import javax.swing.plaf.UIResource;
|
||||
@@ -33,6 +36,7 @@ import javax.swing.text.DefaultCaret;
|
||||
import javax.swing.text.DefaultEditorKit;
|
||||
import javax.swing.text.Document;
|
||||
import javax.swing.text.JTextComponent;
|
||||
import javax.swing.text.Position;
|
||||
import javax.swing.text.Utilities;
|
||||
|
||||
/**
|
||||
@@ -48,12 +52,15 @@ public class FlatCaret
|
||||
{
|
||||
private static final String KEY_CARET_INFO = "FlatLaf.internal.caretInfo";
|
||||
|
||||
// selectAllOnFocusPolicy
|
||||
private static final int NEVER = 0, ONCE = 1, ALWAYS = 2;
|
||||
|
||||
private final String selectAllOnFocusPolicy;
|
||||
private final boolean selectAllOnMouseClick;
|
||||
|
||||
private boolean inInstall;
|
||||
private boolean wasFocused;
|
||||
private boolean wasTemporaryLost;
|
||||
private boolean wasFocusTemporaryLost;
|
||||
private boolean isMousePressed;
|
||||
private boolean isWordSelection;
|
||||
private boolean isLineSelection;
|
||||
@@ -94,6 +101,9 @@ public class FlatCaret
|
||||
// restore selection
|
||||
select( (int) ci[1], (int) ci[0] );
|
||||
|
||||
if( ci[4] != 0 )
|
||||
wasFocused = true;
|
||||
|
||||
// if text component is focused, then caret and selection are visible,
|
||||
// but when switching theme, the component does not yet have
|
||||
// a highlighter and the selection is not painted
|
||||
@@ -121,6 +131,7 @@ public class FlatCaret
|
||||
getMark(),
|
||||
getBlinkRate(),
|
||||
System.currentTimeMillis(),
|
||||
wasFocused ? 1 : 0,
|
||||
} );
|
||||
|
||||
super.deinstall( c );
|
||||
@@ -140,11 +151,36 @@ public class FlatCaret
|
||||
super.adjustVisibility( nloc );
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setDot( int dot ) {
|
||||
super.setDot( dot );
|
||||
|
||||
// mark as focused if invoked from JTextComponent.setCaretPosition()
|
||||
// to disable SELECT_ALL_ON_FOCUS_POLICY_ONCE if application explicitly changes selection
|
||||
if( !wasFocused &&
|
||||
getSelectAllOnFocusPolicy() == ONCE &&
|
||||
StackUtils.wasInvokedFrom( JTextComponent.class.getName(), "setCaretPosition", 6 ) )
|
||||
wasFocused = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void moveDot( int dot ) {
|
||||
super.moveDot( dot );
|
||||
|
||||
// mark as focused if invoked from JTextComponent.moveCaretPosition()
|
||||
// to disable SELECT_ALL_ON_FOCUS_POLICY_ONCE if application explicitly changes selection
|
||||
if( !wasFocused &&
|
||||
getSelectAllOnFocusPolicy() == ONCE &&
|
||||
StackUtils.wasInvokedFrom( JTextComponent.class.getName(), "moveCaretPosition", 6 ) )
|
||||
wasFocused = true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void focusGained( FocusEvent e ) {
|
||||
if( !inInstall && !wasTemporaryLost && (!isMousePressed || selectAllOnMouseClick) )
|
||||
if( !inInstall && !wasFocusTemporaryLost && (!isMousePressed || isSelectAllOnMouseClick()) )
|
||||
selectAllOnFocusGained();
|
||||
wasTemporaryLost = false;
|
||||
|
||||
wasFocusTemporaryLost = false;
|
||||
wasFocused = true;
|
||||
|
||||
super.focusGained( e );
|
||||
@@ -152,7 +188,7 @@ public class FlatCaret
|
||||
|
||||
@Override
|
||||
public void focusLost( FocusEvent e ) {
|
||||
wasTemporaryLost = e.isTemporary();
|
||||
wasFocusTemporaryLost = e.isTemporary();
|
||||
super.focusLost( e );
|
||||
}
|
||||
|
||||
@@ -232,24 +268,13 @@ public class FlatCaret
|
||||
if( doc == null || !c.isEnabled() || !c.isEditable() || FlatUIUtils.isCellEditor( c ) )
|
||||
return;
|
||||
|
||||
Object selectAllOnFocusPolicy = c.getClientProperty( SELECT_ALL_ON_FOCUS_POLICY );
|
||||
if( selectAllOnFocusPolicy == null )
|
||||
selectAllOnFocusPolicy = this.selectAllOnFocusPolicy;
|
||||
|
||||
if( selectAllOnFocusPolicy == null || SELECT_ALL_ON_FOCUS_POLICY_NEVER.equals( selectAllOnFocusPolicy ) )
|
||||
int selectAllOnFocusPolicy = getSelectAllOnFocusPolicy();
|
||||
if( selectAllOnFocusPolicy == NEVER )
|
||||
return;
|
||||
|
||||
if( !SELECT_ALL_ON_FOCUS_POLICY_ALWAYS.equals( selectAllOnFocusPolicy ) ) {
|
||||
// policy is "once" (or null or unknown)
|
||||
|
||||
if( selectAllOnFocusPolicy == ONCE && !isMousePressed ) {
|
||||
// was already focused?
|
||||
if( wasFocused )
|
||||
return;
|
||||
|
||||
// check whether selection was modified before gaining focus
|
||||
int dot = getDot();
|
||||
int mark = getMark();
|
||||
if( dot != mark || dot != doc.getLength() )
|
||||
if( wasFocused && !(c instanceof JFormattedTextField) )
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -265,16 +290,51 @@ public class FlatCaret
|
||||
|
||||
select( 0, c2.getDocument().getLength() );
|
||||
} );
|
||||
} else {
|
||||
} else
|
||||
select( 0, doc.getLength() );
|
||||
}
|
||||
}
|
||||
|
||||
private void select( int mark, int dot ) {
|
||||
if( mark != getMark() )
|
||||
setDot( mark );
|
||||
setDot( mark, Position.Bias.Forward );
|
||||
if( dot != getDot() )
|
||||
moveDot( dot );
|
||||
moveDot( dot, Position.Bias.Forward );
|
||||
}
|
||||
|
||||
private int getSelectAllOnFocusPolicy() {
|
||||
Object value = getClientProperty( SELECT_ALL_ON_FOCUS_POLICY );
|
||||
// Note: using String.valueOf() because selectAllOnFocusPolicy may be null
|
||||
switch( String.valueOf( value instanceof String ? value : selectAllOnFocusPolicy ) ) {
|
||||
default:
|
||||
case SELECT_ALL_ON_FOCUS_POLICY_NEVER: return NEVER;
|
||||
case SELECT_ALL_ON_FOCUS_POLICY_ONCE: return ONCE;
|
||||
case SELECT_ALL_ON_FOCUS_POLICY_ALWAYS: return ALWAYS;
|
||||
}
|
||||
}
|
||||
|
||||
private boolean isSelectAllOnMouseClick() {
|
||||
Object value = getClientProperty( SELECT_ALL_ON_MOUSE_CLICK );
|
||||
return (value instanceof Boolean) ? (boolean) value : selectAllOnMouseClick;
|
||||
}
|
||||
|
||||
private Object getClientProperty( String key ) {
|
||||
JTextComponent c = getComponent();
|
||||
if( c == null )
|
||||
return null;
|
||||
|
||||
Object value = c.getClientProperty( key );
|
||||
if( value != null )
|
||||
return value;
|
||||
|
||||
Container parent = c.getParent();
|
||||
if( parent instanceof JComboBox )
|
||||
return ((JComboBox<?>)parent).getClientProperty( key );
|
||||
if( parent instanceof JSpinner.DefaultEditor ) {
|
||||
parent = parent.getParent();
|
||||
if( parent instanceof JSpinner )
|
||||
return ((JSpinner)parent).getClientProperty( key );
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/** @since 1.4 */
|
||||
|
||||
@@ -31,6 +31,7 @@ import java.awt.Window;
|
||||
import java.awt.event.ComponentListener;
|
||||
import java.beans.PropertyChangeEvent;
|
||||
import java.beans.PropertyChangeListener;
|
||||
import java.util.Objects;
|
||||
import java.util.function.Function;
|
||||
import javax.swing.JComponent;
|
||||
import javax.swing.JDialog;
|
||||
@@ -485,8 +486,12 @@ public class FlatRootPaneUI
|
||||
break;
|
||||
|
||||
case "ancestor":
|
||||
if( e.getNewValue() instanceof Window )
|
||||
if( e.getNewValue() instanceof Window ) {
|
||||
if( titlePane != null && !Objects.equals( titlePane.windowStyle, FlatTitlePane.getWindowStyle( rootPane ) ) )
|
||||
setTitlePane( createTitlePane() );
|
||||
|
||||
macClearBackgroundForTranslucentWindow( rootPane );
|
||||
}
|
||||
|
||||
macUninstallWindowBackgroundListener( rootPane );
|
||||
macInstallWindowBackgroundListener( rootPane );
|
||||
|
||||
@@ -89,13 +89,16 @@ import com.formdev.flatlaf.util.UIScale;
|
||||
* @uiDefault TitlePane.iconSize Dimension
|
||||
* @uiDefault TitlePane.iconMargins Insets
|
||||
* @uiDefault TitlePane.titleMargins Insets
|
||||
* @uiDefault TitlePane.menuBarEmbedded boolean
|
||||
* @uiDefault TitlePane.titleMinimumWidth int
|
||||
* @uiDefault TitlePane.buttonMinimumWidth int
|
||||
* @uiDefault TitlePane.buttonMaximizedHeight int
|
||||
* @uiDefault TitlePane.buttonsGap int
|
||||
* @uiDefault TitlePane.buttonsMargins Insets
|
||||
* @uiDefault TitlePane.buttonsFillVertically boolean
|
||||
* @uiDefault TitlePane.centerTitle boolean
|
||||
* @uiDefault TitlePane.centerTitleIfMenuBarEmbedded boolean
|
||||
* @uiDefault TitlePane.showIconBesideTitle boolean
|
||||
* @uiDefault TitlePane.menuBarEmbedded boolean
|
||||
* @uiDefault TitlePane.menuBarTitleGap int
|
||||
* @uiDefault TitlePane.menuBarTitleMinimumGap int
|
||||
* @uiDefault TitlePane.closeIcon Icon
|
||||
@@ -123,9 +126,14 @@ public class FlatTitlePane
|
||||
/** @since 2.5 */ protected final boolean showIconInDialogs;
|
||||
/** @since 2 */ protected final int noIconLeftGap;
|
||||
protected final Dimension iconSize;
|
||||
/** @since 3.6 */ protected final Insets iconMargins;
|
||||
/** @since 3.6 */ protected final Insets titleMargins;
|
||||
/** @since 2.4 */ protected final int titleMinimumWidth;
|
||||
/** @since 2.4 */ protected final int buttonMinimumWidth;
|
||||
protected final int buttonMaximizedHeight;
|
||||
/** @since 3.6 */ protected final int buttonsGap;
|
||||
/** @since 3.6 */ protected final Insets buttonsMargins;
|
||||
/** @since 3.6 */ protected final boolean buttonsFillVertically;
|
||||
protected final boolean centerTitle;
|
||||
protected final boolean centerTitleIfMenuBarEmbedded;
|
||||
/** @since 2.4 */ protected final boolean showIconBesideTitle;
|
||||
@@ -145,6 +153,9 @@ public class FlatTitlePane
|
||||
protected JButton restoreButton;
|
||||
protected JButton closeButton;
|
||||
|
||||
private JComponent iconifyMaximizeGapComp;
|
||||
private JComponent maximizeCloseGapComp;
|
||||
|
||||
protected Window window;
|
||||
|
||||
private final Handler handler;
|
||||
@@ -179,9 +190,7 @@ public class FlatTitlePane
|
||||
public FlatTitlePane( JRootPane rootPane ) {
|
||||
this.rootPane = rootPane;
|
||||
|
||||
Window w = SwingUtilities.getWindowAncestor( rootPane );
|
||||
String defaultWindowStyle = (w != null && w.getType() == Window.Type.UTILITY) ? WINDOW_STYLE_SMALL : null;
|
||||
windowStyle = clientProperty( rootPane, WINDOW_STYLE, defaultWindowStyle, String.class );
|
||||
windowStyle = getWindowStyle( rootPane );
|
||||
|
||||
titleFont = FlatUIUtils.getSubUIFont( "TitlePane.font", windowStyle );
|
||||
activeBackground = FlatUIUtils.getSubUIColor( "TitlePane.background", windowStyle );
|
||||
@@ -196,9 +205,14 @@ public class FlatTitlePane
|
||||
showIconInDialogs = FlatUIUtils.getSubUIBoolean( "TitlePane.showIconInDialogs", windowStyle, true );
|
||||
noIconLeftGap = FlatUIUtils.getSubUIInt( "TitlePane.noIconLeftGap", windowStyle, 8 );
|
||||
iconSize = FlatUIUtils.getSubUIDimension( "TitlePane.iconSize", windowStyle );
|
||||
iconMargins = FlatUIUtils.getSubUIInsets( "TitlePane.iconMargins", windowStyle );
|
||||
titleMargins = FlatUIUtils.getSubUIInsets( "TitlePane.titleMargins", windowStyle );
|
||||
titleMinimumWidth = FlatUIUtils.getSubUIInt( "TitlePane.titleMinimumWidth", windowStyle, 60 );
|
||||
buttonMinimumWidth = FlatUIUtils.getSubUIInt( "TitlePane.buttonMinimumWidth", windowStyle, 30 );
|
||||
buttonMaximizedHeight = FlatUIUtils.getSubUIInt( "TitlePane.buttonMaximizedHeight", windowStyle, 0 );
|
||||
buttonsGap = FlatUIUtils.getSubUIInt( "TitlePane.buttonsGap", windowStyle, 0 );
|
||||
buttonsMargins = FlatUIUtils.getSubUIInsets( "TitlePane.buttonsMargins", windowStyle );
|
||||
buttonsFillVertically = FlatUIUtils.getSubUIBoolean( "TitlePane.buttonsFillVertically", windowStyle, true );
|
||||
centerTitle = FlatUIUtils.getSubUIBoolean( "TitlePane.centerTitle", windowStyle, false );
|
||||
centerTitleIfMenuBarEmbedded = FlatUIUtils.getSubUIBoolean( "TitlePane.centerTitleIfMenuBarEmbedded", windowStyle, true );
|
||||
showIconBesideTitle = FlatUIUtils.getSubUIBoolean( "TitlePane.showIconBesideTitle", windowStyle, false );
|
||||
@@ -228,6 +242,12 @@ public class FlatTitlePane
|
||||
applyComponentOrientation( rootPane.getComponentOrientation() );
|
||||
}
|
||||
|
||||
static String getWindowStyle( JRootPane rootPane ) {
|
||||
Window w = SwingUtilities.getWindowAncestor( rootPane );
|
||||
String defaultWindowStyle = (w != null && w.getType() == Window.Type.UTILITY) ? WINDOW_STYLE_SMALL : null;
|
||||
return clientProperty( rootPane, WINDOW_STYLE, defaultWindowStyle, String.class );
|
||||
}
|
||||
|
||||
protected FlatTitlePaneBorder createTitlePaneBorder() {
|
||||
return new FlatTitlePaneBorder();
|
||||
}
|
||||
@@ -245,8 +265,8 @@ public class FlatTitlePane
|
||||
setUI( new FlatTitleLabelUI() );
|
||||
}
|
||||
};
|
||||
iconLabel.setBorder( new FlatEmptyBorder( FlatUIUtils.getSubUIInsets( "TitlePane.iconMargins", windowStyle ) ) );
|
||||
titleLabel.setBorder( new FlatEmptyBorder( FlatUIUtils.getSubUIInsets( "TitlePane.titleMargins", windowStyle ) ) );
|
||||
iconLabel.setBorder( new FlatEmptyBorder( iconMargins ) );
|
||||
titleLabel.setBorder( new FlatEmptyBorder( titleMargins ) );
|
||||
|
||||
leftPanel.setLayout( new BoxLayout( leftPanel, BoxLayout.LINE_AXIS ) );
|
||||
leftPanel.setOpaque( false );
|
||||
@@ -349,10 +369,15 @@ public class FlatTitlePane
|
||||
restoreButton = createButton( "TitlePane.restoreIcon", "Restore", e -> restore() );
|
||||
closeButton = createButton( "TitlePane.closeIcon", "Close", e -> close() );
|
||||
|
||||
iconifyMaximizeGapComp = createButtonsGapComp();
|
||||
maximizeCloseGapComp = createButtonsGapComp();
|
||||
|
||||
// initially hide buttons that are only supported in frames
|
||||
iconifyButton.setVisible( false );
|
||||
maximizeButton.setVisible( false );
|
||||
restoreButton.setVisible( false );
|
||||
iconifyMaximizeGapComp.setVisible( false );
|
||||
maximizeCloseGapComp.setVisible( false );
|
||||
|
||||
buttonPanel = new JPanel() {
|
||||
@Override
|
||||
@@ -364,12 +389,13 @@ public class FlatTitlePane
|
||||
|
||||
if( buttonMaximizedHeight > 0 && isWindowMaximized() && !hasVisibleEmbeddedMenuBar( rootPane.getJMenuBar() ) ) {
|
||||
// make title pane height smaller when frame is maximized
|
||||
size = new Dimension( size.width, Math.min( size.height, UIScale.scale( buttonMaximizedHeight ) ) );
|
||||
size = new Dimension( size.width, Math.min( size.height, UIScale.scale( buttonMaximizedHeight + buttonsMargins.top + buttonsMargins.bottom ) ) );
|
||||
}
|
||||
return size;
|
||||
}
|
||||
};
|
||||
buttonPanel.setOpaque( false );
|
||||
buttonPanel.setBorder( FlatUIUtils.nonUIResource( new FlatEmptyBorder( buttonsMargins ) ) );
|
||||
buttonPanel.setLayout( new BoxLayout( buttonPanel, BoxLayout.LINE_AXIS ) );
|
||||
if( rootPane.getWindowDecorationStyle() == JRootPane.FRAME ) {
|
||||
// JRootPane.FRAME works only for frames (and not for dialogs)
|
||||
@@ -378,8 +404,10 @@ public class FlatTitlePane
|
||||
// later in frameStateChanged(), which is invoked from addNotify()
|
||||
|
||||
buttonPanel.add( iconifyButton );
|
||||
buttonPanel.add( iconifyMaximizeGapComp );
|
||||
buttonPanel.add( maximizeButton );
|
||||
buttonPanel.add( restoreButton );
|
||||
buttonPanel.add( maximizeCloseGapComp );
|
||||
}
|
||||
buttonPanel.add( closeButton );
|
||||
|
||||
@@ -396,13 +424,17 @@ public class FlatTitlePane
|
||||
@Override
|
||||
public Dimension getMinimumSize() {
|
||||
// allow the button to shrink if space is rare
|
||||
return new Dimension( UIScale.scale( buttonMinimumWidth ), super.getMinimumSize().height );
|
||||
return new Dimension(
|
||||
Math.min( UIScale.scale( buttonMinimumWidth ), super.getPreferredSize().width ),
|
||||
super.getMinimumSize().height );
|
||||
}
|
||||
@Override
|
||||
public Dimension getMaximumSize() {
|
||||
// allow the button to fill whole button area height
|
||||
// see also BasicMenuUI.getMaximumSize()
|
||||
return new Dimension( super.getMaximumSize().width, Short.MAX_VALUE );
|
||||
return buttonsFillVertically
|
||||
? new Dimension( super.getMaximumSize().width, Short.MAX_VALUE )
|
||||
: super.getMaximumSize();
|
||||
}
|
||||
};
|
||||
button.setFocusable( false );
|
||||
@@ -413,6 +445,14 @@ public class FlatTitlePane
|
||||
return button;
|
||||
}
|
||||
|
||||
private JComponent createButtonsGapComp() {
|
||||
JComponent gapComp = new JPanel();
|
||||
gapComp.setOpaque( false );
|
||||
gapComp.setMinimumSize( new Dimension( 0, 0 ) );
|
||||
gapComp.setPreferredSize( new Dimension( UIScale.scale( buttonsGap ), 0 ) );
|
||||
return gapComp;
|
||||
}
|
||||
|
||||
protected void activeChanged( boolean active ) {
|
||||
Color background = clientPropertyColor( rootPane, TITLE_BAR_BACKGROUND, null );
|
||||
Color foreground = clientPropertyColor( rootPane, TITLE_BAR_FOREGROUND, null );
|
||||
@@ -434,6 +474,9 @@ public class FlatTitlePane
|
||||
closeButton.setForeground( foreground );
|
||||
|
||||
// this is necessary because hover/pressed colors are derived from background color
|
||||
// (since FlatWindowAbstractIcon now invokes FlatTitlePane.getBackground()
|
||||
// to get base color, this is no longer necessary, but keep it for compatibility;
|
||||
// e.g. for custom window icons)
|
||||
iconifyButton.setBackground( background );
|
||||
maximizeButton.setBackground( background );
|
||||
restoreButton.setBackground( background );
|
||||
@@ -493,6 +536,13 @@ public class FlatTitlePane
|
||||
maximizeButton.setVisible( false );
|
||||
restoreButton.setVisible( false );
|
||||
}
|
||||
|
||||
boolean iconifyVisible = iconifyButton.isVisible();
|
||||
boolean maximizeVisible = maximizeButton.isVisible();
|
||||
boolean restoreVisible = restoreButton.isVisible();
|
||||
boolean closeVisible = closeButton.isVisible();
|
||||
iconifyMaximizeGapComp.setVisible( iconifyVisible && (maximizeVisible || restoreVisible || closeVisible) );
|
||||
maximizeCloseGapComp.setVisible( closeVisible && (maximizeVisible || restoreVisible) );
|
||||
}
|
||||
|
||||
protected void updateIcon() {
|
||||
@@ -746,12 +796,17 @@ public class FlatTitlePane
|
||||
if( isFullWindowContent() )
|
||||
return;
|
||||
|
||||
g.setColor( getBackground() );
|
||||
g.fillRect( 0, 0, getWidth(), getHeight() );
|
||||
}
|
||||
|
||||
@Override
|
||||
public Color getBackground() {
|
||||
// not storing value of "TitlePane.unifiedBackground" in class to allow changing at runtime
|
||||
g.setColor( (UIManager.getBoolean( "TitlePane.unifiedBackground" ) &&
|
||||
return (UIManager.getBoolean( "TitlePane.unifiedBackground" ) &&
|
||||
clientPropertyColor( rootPane, TITLE_BAR_BACKGROUND, null ) == null)
|
||||
? FlatUIUtils.getParentBackground( this )
|
||||
: getBackground() );
|
||||
g.fillRect( 0, 0, getWidth(), getHeight() );
|
||||
: super.getBackground();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1093,6 +1148,7 @@ public class FlatTitlePane
|
||||
if( !c.isDisplayable() || !c.isVisible() || !contains( c, x, y ) || c == mouseLayer )
|
||||
return true; // continue checking with next component
|
||||
|
||||
// check enabled component that has mouse listeners
|
||||
if( c.isEnabled() &&
|
||||
(c.getMouseListeners().length > 0 ||
|
||||
c.getMouseMotionListeners().length > 0) )
|
||||
|
||||
@@ -276,7 +276,7 @@ RootPane.inactiveBorderColor = lighten(@background,5%,derived)
|
||||
#---- ScrollBar ----
|
||||
|
||||
ScrollBar.track = lighten(@background,1%,derived noAutoInverse)
|
||||
ScrollBar.thumb = lighten($ScrollBar.track,10%,derived noAutoInverse)
|
||||
ScrollBar.thumb = lighten($ScrollBar.track,15%,derived noAutoInverse)
|
||||
ScrollBar.hoverTrackColor = lighten($ScrollBar.track,4%,derived noAutoInverse)
|
||||
ScrollBar.hoverThumbColor = lighten($ScrollBar.thumb,10%,derived noAutoInverse)
|
||||
ScrollBar.pressedThumbColor = lighten($ScrollBar.thumb,15%,derived noAutoInverse)
|
||||
@@ -343,8 +343,13 @@ TableHeader.bottomSeparatorColor = $TableHeader.separatorColor
|
||||
#---- TitlePane ----
|
||||
|
||||
TitlePane.embeddedForeground = darken($TitlePane.foreground,15%)
|
||||
TitlePane.buttonHoverBackground = lighten($TitlePane.background,15%,derived)
|
||||
TitlePane.buttonPressedBackground = lighten($TitlePane.background,10%,derived)
|
||||
TitlePane.buttonHoverBackground = lighten($TitlePane.background,10%,derived)
|
||||
TitlePane.buttonPressedBackground = lighten($TitlePane.background,6%,derived)
|
||||
|
||||
# Linux
|
||||
[linux]TitlePane.buttonBackground = lighten($TitlePane.background,5%,derived)
|
||||
[linux]TitlePane.buttonHoverBackground = lighten($TitlePane.background,10%,derived)
|
||||
[linux]TitlePane.buttonPressedBackground = lighten($TitlePane.background,15%,derived)
|
||||
|
||||
|
||||
#---- ToggleButton ----
|
||||
|
||||
@@ -574,12 +574,12 @@ RootPane.honorDialogMinimumSizeOnResize = true
|
||||
|
||||
ScrollBar.width = 10
|
||||
ScrollBar.minimumButtonSize = 12,12
|
||||
ScrollBar.minimumThumbSize = 10,10
|
||||
ScrollBar.minimumThumbSize = 18,18
|
||||
ScrollBar.maximumThumbSize = 100000,100000
|
||||
ScrollBar.trackInsets = 0,0,0,0
|
||||
ScrollBar.thumbInsets = 0,0,0,0
|
||||
ScrollBar.thumbInsets = 2,2,2,2
|
||||
ScrollBar.trackArc = 0
|
||||
ScrollBar.thumbArc = 0
|
||||
ScrollBar.thumbArc = 999
|
||||
ScrollBar.hoverThumbWithTrack = false
|
||||
ScrollBar.pressedThumbWithTrack = false
|
||||
ScrollBar.showButtons = false
|
||||
@@ -588,15 +588,8 @@ ScrollBar.buttonArrowColor = @buttonArrowColor
|
||||
ScrollBar.buttonDisabledArrowColor = @buttonDisabledArrowColor
|
||||
ScrollBar.allowsAbsolutePositioning = true
|
||||
|
||||
[mac]ScrollBar.minimumThumbSize = 18,18
|
||||
[mac]ScrollBar.thumbInsets = 2,2,2,2
|
||||
[mac]ScrollBar.thumbArc = 999
|
||||
[mac]ScrollBar.hoverThumbWithTrack = true
|
||||
|
||||
[linux]ScrollBar.minimumThumbSize = 18,18
|
||||
[linux]ScrollBar.thumbInsets = 2,2,2,2
|
||||
[linux]ScrollBar.thumbArc = 999
|
||||
|
||||
|
||||
#---- ScrollPane ----
|
||||
|
||||
@@ -823,9 +816,14 @@ TitlePane.iconMargins = 3,8,3,8
|
||||
TitlePane.titleMargins = 3,0,3,0
|
||||
TitlePane.titleMinimumWidth = 60
|
||||
TitlePane.buttonSize = 44,30
|
||||
TitlePane.buttonInsets = 0,0,0,0
|
||||
TitlePane.buttonArc = 0
|
||||
TitlePane.buttonMinimumWidth = 30
|
||||
TitlePane.buttonMaximizedHeight = 22
|
||||
TitlePane.buttonSymbolHeight = 10
|
||||
TitlePane.buttonsGap = 0
|
||||
TitlePane.buttonsMargins = 0,0,0,0
|
||||
TitlePane.buttonsFillVertically = true
|
||||
TitlePane.centerTitle = false
|
||||
TitlePane.centerTitleIfMenuBarEmbedded = true
|
||||
TitlePane.showIconBesideTitle = false
|
||||
@@ -856,6 +854,27 @@ TitlePane.small.iconifyIcon = com.formdev.flatlaf.icons.FlatWindowIconifyIcon, s
|
||||
TitlePane.small.maximizeIcon = com.formdev.flatlaf.icons.FlatWindowMaximizeIcon, small
|
||||
TitlePane.small.restoreIcon = com.formdev.flatlaf.icons.FlatWindowRestoreIcon, small
|
||||
|
||||
# Linux
|
||||
[linux]TitlePane.buttonSize = 26,26
|
||||
[linux]TitlePane.buttonInsets = 2,2,2,2
|
||||
[linux]TitlePane.buttonArc = 999
|
||||
[linux]TitlePane.buttonMaximizedHeight = -1
|
||||
[linux]TitlePane.buttonSymbolHeight = 8
|
||||
[linux]TitlePane.buttonsGap = 8
|
||||
[linux]TitlePane.buttonsMargins = 4,4,4,4
|
||||
[linux]TitlePane.buttonsFillVertically = false
|
||||
[linux]TitlePane.small.buttonSize = 20,20
|
||||
[linux]TitlePane.small.buttonInsets = 1,1,1,1
|
||||
[linux]TitlePane.small.buttonSymbolHeight = 6
|
||||
[linux]TitlePane.small.buttonsGap = 4
|
||||
[linux]TitlePane.small.buttonsMargins = 2,2,2,2
|
||||
[linux]TitlePane.closeBackground = $?TitlePane.buttonBackground
|
||||
[linux]TitlePane.closeInactiveBackground = $?TitlePane.buttonInactiveBackground
|
||||
[linux]TitlePane.closeHoverBackground = $?TitlePane.buttonHoverBackground
|
||||
[linux]TitlePane.closePressedBackground = $?TitlePane.buttonPressedBackground
|
||||
[linux]TitlePane.closeHoverForeground = $?TitlePane.foreground
|
||||
[linux]TitlePane.closePressedForeground = $?TitlePane.foreground
|
||||
|
||||
|
||||
#---- ToggleButton ----
|
||||
|
||||
|
||||
@@ -282,7 +282,7 @@ RootPane.inactiveBorderColor = darken(@background,30%,derived)
|
||||
#---- ScrollBar ----
|
||||
|
||||
ScrollBar.track = lighten(@background,1%,derived noAutoInverse)
|
||||
ScrollBar.thumb = darken($ScrollBar.track,10%,derived noAutoInverse)
|
||||
ScrollBar.thumb = darken($ScrollBar.track,15%,derived noAutoInverse)
|
||||
ScrollBar.hoverTrackColor = darken($ScrollBar.track,3%,derived noAutoInverse)
|
||||
ScrollBar.hoverThumbColor = darken($ScrollBar.thumb,10%,derived noAutoInverse)
|
||||
ScrollBar.pressedThumbColor = darken($ScrollBar.thumb,20%,derived noAutoInverse)
|
||||
@@ -349,8 +349,13 @@ TableHeader.bottomSeparatorColor = $TableHeader.separatorColor
|
||||
#---- TitlePane ----
|
||||
|
||||
TitlePane.embeddedForeground = lighten($TitlePane.foreground,35%)
|
||||
TitlePane.buttonHoverBackground = darken($TitlePane.background,10%,derived)
|
||||
TitlePane.buttonPressedBackground = darken($TitlePane.background,8%,derived)
|
||||
TitlePane.buttonHoverBackground = darken($TitlePane.background,5%,derived)
|
||||
TitlePane.buttonPressedBackground = darken($TitlePane.background,3%,derived)
|
||||
|
||||
# Linux
|
||||
[linux]TitlePane.buttonBackground = darken($TitlePane.background,5%,derived)
|
||||
[linux]TitlePane.buttonHoverBackground = darken($TitlePane.background,10%,derived)
|
||||
[linux]TitlePane.buttonPressedBackground = darken($TitlePane.background,15%,derived)
|
||||
|
||||
|
||||
#---- ToggleButton ----
|
||||
|
||||
@@ -48,6 +48,9 @@ tasks {
|
||||
|
||||
if( JavaVersion.current() >= JavaVersion.VERSION_1_9 )
|
||||
attributes( "Multi-Release" to "true" )
|
||||
|
||||
// allow loading FlatLaf native library in Java 24+ (see https://openjdk.org/jeps/472)
|
||||
attributes( "Enable-Native-Access" to "ALL-UNNAMED" )
|
||||
}
|
||||
|
||||
exclude( "module-info.class" )
|
||||
|
||||
@@ -228,8 +228,20 @@ class DemoFrame
|
||||
private void windowDecorationsChanged() {
|
||||
boolean windowDecorations = windowDecorationsCheckBoxMenuItem.isSelected();
|
||||
|
||||
// change window decoration of all frames and dialogs
|
||||
FlatLaf.setUseNativeWindowDecorations( windowDecorations );
|
||||
if( SystemInfo.isLinux ) {
|
||||
// enable/disable custom window decorations
|
||||
JFrame.setDefaultLookAndFeelDecorated( windowDecorations );
|
||||
JDialog.setDefaultLookAndFeelDecorated( windowDecorations );
|
||||
|
||||
// dispose frame, update decoration and re-show frame
|
||||
dispose();
|
||||
setUndecorated( windowDecorations );
|
||||
getRootPane().setWindowDecorationStyle( windowDecorations ? JRootPane.FRAME : JRootPane.NONE );
|
||||
setVisible( true );
|
||||
} else {
|
||||
// change window decoration of all frames and dialogs
|
||||
FlatLaf.setUseNativeWindowDecorations( windowDecorations );
|
||||
}
|
||||
|
||||
menuBarEmbeddedCheckBoxMenuItem.setEnabled( windowDecorations );
|
||||
unifiedTitleBarMenuItem.setEnabled( windowDecorations );
|
||||
@@ -486,7 +498,7 @@ class DemoFrame
|
||||
}
|
||||
|
||||
private boolean supportsFlatLafWindowDecorations() {
|
||||
return FlatLaf.supportsNativeWindowDecorations() || (SystemInfo.isLinux && JFrame.isDefaultLookAndFeelDecorated());
|
||||
return FlatLaf.supportsNativeWindowDecorations() || SystemInfo.isLinux;
|
||||
}
|
||||
|
||||
private void initComponents() {
|
||||
@@ -979,10 +991,9 @@ class DemoFrame
|
||||
scrollingPopupMenu.add( "Item " + i );
|
||||
|
||||
if( supportsFlatLafWindowDecorations() ) {
|
||||
if( SystemInfo.isLinux )
|
||||
unsupported( windowDecorationsCheckBoxMenuItem );
|
||||
else
|
||||
windowDecorationsCheckBoxMenuItem.setSelected( FlatLaf.isUseNativeWindowDecorations() );
|
||||
windowDecorationsCheckBoxMenuItem.setSelected( SystemInfo.isLinux
|
||||
? JFrame.isDefaultLookAndFeelDecorated()
|
||||
: FlatLaf.isUseNativeWindowDecorations() );
|
||||
menuBarEmbeddedCheckBoxMenuItem.setSelected( UIManager.getBoolean( "TitlePane.menuBarEmbedded" ) );
|
||||
unifiedTitleBarMenuItem.setSelected( UIManager.getBoolean( "TitlePane.unifiedBackground" ) );
|
||||
showTitleBarIconMenuItem.setSelected( UIManager.getBoolean( "TitlePane.showIcon" ) );
|
||||
@@ -1026,7 +1037,7 @@ class DemoFrame
|
||||
private void unsupported( JCheckBoxMenuItem menuItem ) {
|
||||
menuItem.setEnabled( false );
|
||||
menuItem.setSelected( false );
|
||||
menuItem.setToolTipText( "Not supported on your system." );
|
||||
menuItem.setToolTipText( "Not supported on this platform." );
|
||||
}
|
||||
|
||||
// JFormDesigner - Variables declaration - DO NOT MODIFY //GEN-BEGIN:variables
|
||||
|
||||
@@ -215,8 +215,14 @@ TableHeader.pressedForeground = TableHeader.foreground
|
||||
|
||||
#---- TitlePane ----
|
||||
|
||||
TitlePane.buttonBackground = TitlePane.background
|
||||
TitlePane.buttonInactiveBackground = TitlePane.background
|
||||
TitlePane.buttonHoverBackground = TitlePane.background
|
||||
TitlePane.buttonPressedBackground = TitlePane.background
|
||||
TitlePane.closeBackground = TitlePane.background
|
||||
TitlePane.closeInactiveBackground = TitlePane.background
|
||||
TitlePane.closeHoverBackground = TitlePane.background
|
||||
TitlePane.closePressedBackground = TitlePane.background
|
||||
|
||||
|
||||
#---- ToggleButton ----
|
||||
|
||||
@@ -25,18 +25,6 @@
|
||||
+ ProgressBar.font [active] Liberation Sans plain 13 javax.swing.plaf.FontUIResource [UI]
|
||||
|
||||
|
||||
#---- ScrollBar ----
|
||||
|
||||
- ScrollBar.minimumThumbSize 10,10 javax.swing.plaf.DimensionUIResource [UI]
|
||||
+ ScrollBar.minimumThumbSize 18,18 javax.swing.plaf.DimensionUIResource [UI]
|
||||
|
||||
- ScrollBar.thumbArc 0
|
||||
+ ScrollBar.thumbArc 999
|
||||
|
||||
- ScrollBar.thumbInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI]
|
||||
+ ScrollBar.thumbInsets 2,2,2,2 javax.swing.plaf.InsetsUIResource [UI]
|
||||
|
||||
|
||||
#---- TaskPane ----
|
||||
|
||||
- TaskPane.font [active] Segoe UI bold 12 javax.swing.plaf.FontUIResource [UI]
|
||||
@@ -45,8 +33,86 @@
|
||||
|
||||
#---- TitlePane ----
|
||||
|
||||
- TitlePane.buttonArc 0
|
||||
+ TitlePane.buttonArc 999
|
||||
|
||||
+ TitlePane.buttonBackground #3c3f41 HSL 204 4 25 com.formdev.flatlaf.util.DerivedColor [UI] lighten(5% autoInverse)
|
||||
|
||||
- TitlePane.buttonInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI]
|
||||
+ TitlePane.buttonInsets 2,2,2,2 javax.swing.plaf.InsetsUIResource [UI]
|
||||
|
||||
- TitlePane.buttonMaximizedHeight 22
|
||||
+ TitlePane.buttonMaximizedHeight -1
|
||||
|
||||
- TitlePane.buttonPressedBackground #3f4144 HSL 216 4 26 com.formdev.flatlaf.util.DerivedColor [UI] lighten(6% autoInverse)
|
||||
+ TitlePane.buttonPressedBackground #55585c HSL 214 4 35 com.formdev.flatlaf.util.DerivedColor [UI] lighten(15% autoInverse)
|
||||
|
||||
- TitlePane.buttonSize 44,30 javax.swing.plaf.DimensionUIResource [UI]
|
||||
+ TitlePane.buttonSize 26,26 javax.swing.plaf.DimensionUIResource [UI]
|
||||
|
||||
- TitlePane.buttonSymbolHeight 10
|
||||
+ TitlePane.buttonSymbolHeight 8
|
||||
|
||||
- TitlePane.buttonsFillVertically true
|
||||
+ TitlePane.buttonsFillVertically false
|
||||
|
||||
- TitlePane.buttonsGap 0
|
||||
+ TitlePane.buttonsGap 8
|
||||
|
||||
- TitlePane.buttonsMargins 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI]
|
||||
+ TitlePane.buttonsMargins 4,4,4,4 javax.swing.plaf.InsetsUIResource [UI]
|
||||
|
||||
+ TitlePane.closeBackground #3c3f41 HSL 204 4 25 com.formdev.flatlaf.util.DerivedColor [UI] lighten(5% autoInverse)
|
||||
|
||||
- TitlePane.closeHoverBackground #c42b1c HSL 5 75 44 javax.swing.plaf.ColorUIResource [UI]
|
||||
+ TitlePane.closeHoverBackground #484c4f HSL 206 5 30 com.formdev.flatlaf.util.DerivedColor [UI] lighten(10% autoInverse)
|
||||
|
||||
- TitlePane.closeHoverForeground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI]
|
||||
+ TitlePane.closeHoverForeground #dddddd HSL 0 0 87 javax.swing.plaf.ColorUIResource [UI]
|
||||
|
||||
- TitlePane.closeIcon [lazy] 44,30 com.formdev.flatlaf.icons.FlatWindowCloseIcon [UI]
|
||||
+ TitlePane.closeIcon [lazy] 26,26 com.formdev.flatlaf.icons.FlatWindowCloseIcon [UI]
|
||||
|
||||
- TitlePane.closePressedBackground #c42b1ce6 90% HSLA 5 75 44 90 javax.swing.plaf.ColorUIResource [UI]
|
||||
+ TitlePane.closePressedBackground #55585c HSL 214 4 35 com.formdev.flatlaf.util.DerivedColor [UI] lighten(15% autoInverse)
|
||||
|
||||
- TitlePane.closePressedForeground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI]
|
||||
+ TitlePane.closePressedForeground #dddddd HSL 0 0 87 javax.swing.plaf.ColorUIResource [UI]
|
||||
|
||||
- TitlePane.iconifyIcon [lazy] 44,30 com.formdev.flatlaf.icons.FlatWindowIconifyIcon [UI]
|
||||
+ TitlePane.iconifyIcon [lazy] 26,26 com.formdev.flatlaf.icons.FlatWindowIconifyIcon [UI]
|
||||
|
||||
- TitlePane.maximizeIcon [lazy] 44,30 com.formdev.flatlaf.icons.FlatWindowMaximizeIcon [UI]
|
||||
+ TitlePane.maximizeIcon [lazy] 26,26 com.formdev.flatlaf.icons.FlatWindowMaximizeIcon [UI]
|
||||
|
||||
- TitlePane.restoreIcon [lazy] 44,30 com.formdev.flatlaf.icons.FlatWindowRestoreIcon [UI]
|
||||
+ TitlePane.restoreIcon [lazy] 26,26 com.formdev.flatlaf.icons.FlatWindowRestoreIcon [UI]
|
||||
|
||||
+ TitlePane.small.buttonInsets 1,1,1,1 javax.swing.plaf.InsetsUIResource [UI]
|
||||
|
||||
- TitlePane.small.buttonSize 30,20 javax.swing.plaf.DimensionUIResource [UI]
|
||||
+ TitlePane.small.buttonSize 20,20 javax.swing.plaf.DimensionUIResource [UI]
|
||||
|
||||
- TitlePane.small.buttonSymbolHeight 8
|
||||
+ TitlePane.small.buttonSymbolHeight 6
|
||||
|
||||
+ TitlePane.small.buttonsGap 4
|
||||
+ TitlePane.small.buttonsMargins 2,2,2,2 javax.swing.plaf.InsetsUIResource [UI]
|
||||
|
||||
- TitlePane.small.closeIcon [lazy] 30,20 com.formdev.flatlaf.icons.FlatWindowCloseIcon [UI]
|
||||
+ TitlePane.small.closeIcon [lazy] 20,20 com.formdev.flatlaf.icons.FlatWindowCloseIcon [UI]
|
||||
|
||||
- TitlePane.small.font [active] Segoe UI plain 11 javax.swing.plaf.FontUIResource [UI]
|
||||
+ TitlePane.small.font [active] Liberation Sans plain 14 javax.swing.plaf.FontUIResource [UI]
|
||||
|
||||
- TitlePane.small.iconifyIcon [lazy] 30,20 com.formdev.flatlaf.icons.FlatWindowIconifyIcon [UI]
|
||||
+ TitlePane.small.iconifyIcon [lazy] 20,20 com.formdev.flatlaf.icons.FlatWindowIconifyIcon [UI]
|
||||
|
||||
- TitlePane.small.maximizeIcon [lazy] 30,20 com.formdev.flatlaf.icons.FlatWindowMaximizeIcon [UI]
|
||||
+ TitlePane.small.maximizeIcon [lazy] 20,20 com.formdev.flatlaf.icons.FlatWindowMaximizeIcon [UI]
|
||||
|
||||
- TitlePane.small.restoreIcon [lazy] 30,20 com.formdev.flatlaf.icons.FlatWindowRestoreIcon [UI]
|
||||
+ TitlePane.small.restoreIcon [lazy] 20,20 com.formdev.flatlaf.icons.FlatWindowRestoreIcon [UI]
|
||||
- defaultFont Segoe UI plain 12 javax.swing.plaf.FontUIResource [UI]
|
||||
+ defaultFont Liberation Sans plain 15 javax.swing.plaf.FontUIResource [UI]
|
||||
|
||||
|
||||
@@ -68,15 +68,6 @@
|
||||
- ScrollBar.hoverThumbWithTrack false
|
||||
+ ScrollBar.hoverThumbWithTrack true
|
||||
|
||||
- ScrollBar.minimumThumbSize 10,10 javax.swing.plaf.DimensionUIResource [UI]
|
||||
+ ScrollBar.minimumThumbSize 18,18 javax.swing.plaf.DimensionUIResource [UI]
|
||||
|
||||
- ScrollBar.thumbArc 0
|
||||
+ ScrollBar.thumbArc 999
|
||||
|
||||
- ScrollBar.thumbInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI]
|
||||
+ ScrollBar.thumbInsets 2,2,2,2 javax.swing.plaf.InsetsUIResource [UI]
|
||||
|
||||
|
||||
#---- TaskPane ----
|
||||
|
||||
|
||||
@@ -881,22 +881,22 @@ ScrollBar.buttonArrowColor #b7b7b7 HSL 0 0 72 javax.swing.plaf.Colo
|
||||
ScrollBar.buttonDisabledArrowColor #777777 HSL 0 0 47 javax.swing.plaf.ColorUIResource [UI]
|
||||
ScrollBar.foreground #dddddd HSL 0 0 87 javax.swing.plaf.ColorUIResource [UI]
|
||||
ScrollBar.hoverButtonBackground #484c4e HSL 200 4 29 com.formdev.flatlaf.util.DerivedColor [UI] lighten(5%)
|
||||
ScrollBar.hoverThumbColor #6e767a HSL 200 5 45 com.formdev.flatlaf.util.DerivedColor [UI] lighten(10%)
|
||||
ScrollBar.hoverThumbColor #7a8387 HSL 198 5 50 com.formdev.flatlaf.util.DerivedColor [UI] lighten(10%)
|
||||
ScrollBar.hoverThumbWithTrack false
|
||||
ScrollBar.hoverTrackColor #484c4f HSL 206 5 30 com.formdev.flatlaf.util.DerivedColor [UI] lighten(4%)
|
||||
ScrollBar.maximumThumbSize 100000,100000 javax.swing.plaf.DimensionUIResource [UI]
|
||||
ScrollBar.minimumButtonSize 12,12 javax.swing.plaf.DimensionUIResource [UI]
|
||||
ScrollBar.minimumThumbSize 10,10 javax.swing.plaf.DimensionUIResource [UI]
|
||||
ScrollBar.minimumThumbSize 18,18 javax.swing.plaf.DimensionUIResource [UI]
|
||||
ScrollBar.pressedButtonBackground #54595c HSL 203 5 35 com.formdev.flatlaf.util.DerivedColor [UI] lighten(10%)
|
||||
ScrollBar.pressedThumbColor #7a8387 HSL 198 5 50 com.formdev.flatlaf.util.DerivedColor [UI] lighten(15%)
|
||||
ScrollBar.pressedThumbColor #888f93 HSL 202 5 55 com.formdev.flatlaf.util.DerivedColor [UI] lighten(15%)
|
||||
ScrollBar.pressedThumbWithTrack false
|
||||
ScrollBar.showButtons false
|
||||
ScrollBar.squareButtons false
|
||||
ScrollBar.thumb #565c5f HSL 200 5 35 com.formdev.flatlaf.util.DerivedColor [UI] lighten(10%)
|
||||
ScrollBar.thumbArc 0
|
||||
ScrollBar.thumb #62696c HSL 198 5 40 com.formdev.flatlaf.util.DerivedColor [UI] lighten(15%)
|
||||
ScrollBar.thumbArc 999
|
||||
ScrollBar.thumbDarkShadow #7a7d7f HSL 204 2 49 javax.swing.plaf.ColorUIResource [UI]
|
||||
ScrollBar.thumbHighlight #232324 HSL 240 1 14 javax.swing.plaf.ColorUIResource [UI]
|
||||
ScrollBar.thumbInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI]
|
||||
ScrollBar.thumbInsets 2,2,2,2 javax.swing.plaf.InsetsUIResource [UI]
|
||||
ScrollBar.thumbShadow #616365 HSL 210 2 39 javax.swing.plaf.ColorUIResource [UI]
|
||||
ScrollBar.track #3e4244 HSL 200 5 25 com.formdev.flatlaf.util.DerivedColor [UI] lighten(1%)
|
||||
ScrollBar.trackArc 0
|
||||
@@ -1255,12 +1255,17 @@ TipOfTheDay.tipAreaInsets 4,16,4,16 javax.swing.plaf.InsetsUIResource [U
|
||||
#---- TitlePane ----
|
||||
|
||||
TitlePane.background #303234 HSL 210 4 20 javax.swing.plaf.ColorUIResource [UI]
|
||||
TitlePane.buttonHoverBackground #55585c HSL 214 4 35 com.formdev.flatlaf.util.DerivedColor [UI] lighten(15% autoInverse)
|
||||
TitlePane.buttonArc 0
|
||||
TitlePane.buttonHoverBackground #484c4f HSL 206 5 30 com.formdev.flatlaf.util.DerivedColor [UI] lighten(10% autoInverse)
|
||||
TitlePane.buttonInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI]
|
||||
TitlePane.buttonMaximizedHeight 22
|
||||
TitlePane.buttonMinimumWidth 30
|
||||
TitlePane.buttonPressedBackground #484c4f HSL 206 5 30 com.formdev.flatlaf.util.DerivedColor [UI] lighten(10% autoInverse)
|
||||
TitlePane.buttonPressedBackground #3f4144 HSL 216 4 26 com.formdev.flatlaf.util.DerivedColor [UI] lighten(6% autoInverse)
|
||||
TitlePane.buttonSize 44,30 javax.swing.plaf.DimensionUIResource [UI]
|
||||
TitlePane.buttonSymbolHeight 10
|
||||
TitlePane.buttonsFillVertically true
|
||||
TitlePane.buttonsGap 0
|
||||
TitlePane.buttonsMargins 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI]
|
||||
TitlePane.centerTitle false
|
||||
TitlePane.centerTitleIfMenuBarEmbedded true
|
||||
TitlePane.closeHoverBackground #c42b1c HSL 5 75 44 javax.swing.plaf.ColorUIResource [UI]
|
||||
|
||||
@@ -25,18 +25,6 @@
|
||||
+ ProgressBar.font [active] Liberation Sans plain 13 javax.swing.plaf.FontUIResource [UI]
|
||||
|
||||
|
||||
#---- ScrollBar ----
|
||||
|
||||
- ScrollBar.minimumThumbSize 10,10 javax.swing.plaf.DimensionUIResource [UI]
|
||||
+ ScrollBar.minimumThumbSize 18,18 javax.swing.plaf.DimensionUIResource [UI]
|
||||
|
||||
- ScrollBar.thumbArc 0
|
||||
+ ScrollBar.thumbArc 999
|
||||
|
||||
- ScrollBar.thumbInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI]
|
||||
+ ScrollBar.thumbInsets 2,2,2,2 javax.swing.plaf.InsetsUIResource [UI]
|
||||
|
||||
|
||||
#---- TaskPane ----
|
||||
|
||||
- TaskPane.font [active] Segoe UI bold 12 javax.swing.plaf.FontUIResource [UI]
|
||||
@@ -45,8 +33,89 @@
|
||||
|
||||
#---- TitlePane ----
|
||||
|
||||
- TitlePane.buttonArc 0
|
||||
+ TitlePane.buttonArc 999
|
||||
|
||||
+ TitlePane.buttonBackground #f2f2f2 HSL 0 0 95 com.formdev.flatlaf.util.DerivedColor [UI] darken(5% autoInverse)
|
||||
|
||||
- TitlePane.buttonHoverBackground #f2f2f2 HSL 0 0 95 com.formdev.flatlaf.util.DerivedColor [UI] darken(5% autoInverse)
|
||||
+ TitlePane.buttonHoverBackground #e6e6e6 HSL 0 0 90 com.formdev.flatlaf.util.DerivedColor [UI] darken(10% autoInverse)
|
||||
|
||||
- TitlePane.buttonInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI]
|
||||
+ TitlePane.buttonInsets 2,2,2,2 javax.swing.plaf.InsetsUIResource [UI]
|
||||
|
||||
- TitlePane.buttonMaximizedHeight 22
|
||||
+ TitlePane.buttonMaximizedHeight -1
|
||||
|
||||
- TitlePane.buttonPressedBackground #f7f7f7 HSL 0 0 97 com.formdev.flatlaf.util.DerivedColor [UI] darken(3% autoInverse)
|
||||
+ TitlePane.buttonPressedBackground #d9d9d9 HSL 0 0 85 com.formdev.flatlaf.util.DerivedColor [UI] darken(15% autoInverse)
|
||||
|
||||
- TitlePane.buttonSize 44,30 javax.swing.plaf.DimensionUIResource [UI]
|
||||
+ TitlePane.buttonSize 26,26 javax.swing.plaf.DimensionUIResource [UI]
|
||||
|
||||
- TitlePane.buttonSymbolHeight 10
|
||||
+ TitlePane.buttonSymbolHeight 8
|
||||
|
||||
- TitlePane.buttonsFillVertically true
|
||||
+ TitlePane.buttonsFillVertically false
|
||||
|
||||
- TitlePane.buttonsGap 0
|
||||
+ TitlePane.buttonsGap 8
|
||||
|
||||
- TitlePane.buttonsMargins 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI]
|
||||
+ TitlePane.buttonsMargins 4,4,4,4 javax.swing.plaf.InsetsUIResource [UI]
|
||||
|
||||
+ TitlePane.closeBackground #f2f2f2 HSL 0 0 95 com.formdev.flatlaf.util.DerivedColor [UI] darken(5% autoInverse)
|
||||
|
||||
- TitlePane.closeHoverBackground #c42b1c HSL 5 75 44 javax.swing.plaf.ColorUIResource [UI]
|
||||
+ TitlePane.closeHoverBackground #e6e6e6 HSL 0 0 90 com.formdev.flatlaf.util.DerivedColor [UI] darken(10% autoInverse)
|
||||
|
||||
- TitlePane.closeHoverForeground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI]
|
||||
+ TitlePane.closeHoverForeground #000000 HSL 0 0 0 javax.swing.plaf.ColorUIResource [UI]
|
||||
|
||||
- TitlePane.closeIcon [lazy] 44,30 com.formdev.flatlaf.icons.FlatWindowCloseIcon [UI]
|
||||
+ TitlePane.closeIcon [lazy] 26,26 com.formdev.flatlaf.icons.FlatWindowCloseIcon [UI]
|
||||
|
||||
- TitlePane.closePressedBackground #c42b1ce6 90% HSLA 5 75 44 90 javax.swing.plaf.ColorUIResource [UI]
|
||||
+ TitlePane.closePressedBackground #d9d9d9 HSL 0 0 85 com.formdev.flatlaf.util.DerivedColor [UI] darken(15% autoInverse)
|
||||
|
||||
- TitlePane.closePressedForeground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI]
|
||||
+ TitlePane.closePressedForeground #000000 HSL 0 0 0 javax.swing.plaf.ColorUIResource [UI]
|
||||
|
||||
- TitlePane.iconifyIcon [lazy] 44,30 com.formdev.flatlaf.icons.FlatWindowIconifyIcon [UI]
|
||||
+ TitlePane.iconifyIcon [lazy] 26,26 com.formdev.flatlaf.icons.FlatWindowIconifyIcon [UI]
|
||||
|
||||
- TitlePane.maximizeIcon [lazy] 44,30 com.formdev.flatlaf.icons.FlatWindowMaximizeIcon [UI]
|
||||
+ TitlePane.maximizeIcon [lazy] 26,26 com.formdev.flatlaf.icons.FlatWindowMaximizeIcon [UI]
|
||||
|
||||
- TitlePane.restoreIcon [lazy] 44,30 com.formdev.flatlaf.icons.FlatWindowRestoreIcon [UI]
|
||||
+ TitlePane.restoreIcon [lazy] 26,26 com.formdev.flatlaf.icons.FlatWindowRestoreIcon [UI]
|
||||
|
||||
+ TitlePane.small.buttonInsets 1,1,1,1 javax.swing.plaf.InsetsUIResource [UI]
|
||||
|
||||
- TitlePane.small.buttonSize 30,20 javax.swing.plaf.DimensionUIResource [UI]
|
||||
+ TitlePane.small.buttonSize 20,20 javax.swing.plaf.DimensionUIResource [UI]
|
||||
|
||||
- TitlePane.small.buttonSymbolHeight 8
|
||||
+ TitlePane.small.buttonSymbolHeight 6
|
||||
|
||||
+ TitlePane.small.buttonsGap 4
|
||||
+ TitlePane.small.buttonsMargins 2,2,2,2 javax.swing.plaf.InsetsUIResource [UI]
|
||||
|
||||
- TitlePane.small.closeIcon [lazy] 30,20 com.formdev.flatlaf.icons.FlatWindowCloseIcon [UI]
|
||||
+ TitlePane.small.closeIcon [lazy] 20,20 com.formdev.flatlaf.icons.FlatWindowCloseIcon [UI]
|
||||
|
||||
- TitlePane.small.font [active] Segoe UI plain 11 javax.swing.plaf.FontUIResource [UI]
|
||||
+ TitlePane.small.font [active] Liberation Sans plain 14 javax.swing.plaf.FontUIResource [UI]
|
||||
|
||||
- TitlePane.small.iconifyIcon [lazy] 30,20 com.formdev.flatlaf.icons.FlatWindowIconifyIcon [UI]
|
||||
+ TitlePane.small.iconifyIcon [lazy] 20,20 com.formdev.flatlaf.icons.FlatWindowIconifyIcon [UI]
|
||||
|
||||
- TitlePane.small.maximizeIcon [lazy] 30,20 com.formdev.flatlaf.icons.FlatWindowMaximizeIcon [UI]
|
||||
+ TitlePane.small.maximizeIcon [lazy] 20,20 com.formdev.flatlaf.icons.FlatWindowMaximizeIcon [UI]
|
||||
|
||||
- TitlePane.small.restoreIcon [lazy] 30,20 com.formdev.flatlaf.icons.FlatWindowRestoreIcon [UI]
|
||||
+ TitlePane.small.restoreIcon [lazy] 20,20 com.formdev.flatlaf.icons.FlatWindowRestoreIcon [UI]
|
||||
- defaultFont Segoe UI plain 12 javax.swing.plaf.FontUIResource [UI]
|
||||
+ defaultFont Liberation Sans plain 15 javax.swing.plaf.FontUIResource [UI]
|
||||
|
||||
|
||||
@@ -68,15 +68,6 @@
|
||||
- ScrollBar.hoverThumbWithTrack false
|
||||
+ ScrollBar.hoverThumbWithTrack true
|
||||
|
||||
- ScrollBar.minimumThumbSize 10,10 javax.swing.plaf.DimensionUIResource [UI]
|
||||
+ ScrollBar.minimumThumbSize 18,18 javax.swing.plaf.DimensionUIResource [UI]
|
||||
|
||||
- ScrollBar.thumbArc 0
|
||||
+ ScrollBar.thumbArc 999
|
||||
|
||||
- ScrollBar.thumbInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI]
|
||||
+ ScrollBar.thumbInsets 2,2,2,2 javax.swing.plaf.InsetsUIResource [UI]
|
||||
|
||||
|
||||
#---- TaskPane ----
|
||||
|
||||
|
||||
@@ -886,22 +886,22 @@ ScrollBar.buttonArrowColor #666666 HSL 0 0 40 javax.swing.plaf.Colo
|
||||
ScrollBar.buttonDisabledArrowColor #a6a6a6 HSL 0 0 65 javax.swing.plaf.ColorUIResource [UI]
|
||||
ScrollBar.foreground #000000 HSL 0 0 0 javax.swing.plaf.ColorUIResource [UI]
|
||||
ScrollBar.hoverButtonBackground #e5e5e5 HSL 0 0 90 com.formdev.flatlaf.util.DerivedColor [UI] darken(5%)
|
||||
ScrollBar.hoverThumbColor #c3c3c3 HSL 0 0 76 com.formdev.flatlaf.util.DerivedColor [UI] darken(10%)
|
||||
ScrollBar.hoverThumbColor #b6b6b6 HSL 0 0 71 com.formdev.flatlaf.util.DerivedColor [UI] darken(10%)
|
||||
ScrollBar.hoverThumbWithTrack false
|
||||
ScrollBar.hoverTrackColor #ededed HSL 0 0 93 com.formdev.flatlaf.util.DerivedColor [UI] darken(3%)
|
||||
ScrollBar.maximumThumbSize 100000,100000 javax.swing.plaf.DimensionUIResource [UI]
|
||||
ScrollBar.minimumButtonSize 12,12 javax.swing.plaf.DimensionUIResource [UI]
|
||||
ScrollBar.minimumThumbSize 10,10 javax.swing.plaf.DimensionUIResource [UI]
|
||||
ScrollBar.minimumThumbSize 18,18 javax.swing.plaf.DimensionUIResource [UI]
|
||||
ScrollBar.pressedButtonBackground #d9d9d9 HSL 0 0 85 com.formdev.flatlaf.util.DerivedColor [UI] darken(10%)
|
||||
ScrollBar.pressedThumbColor #a9a9a9 HSL 0 0 66 com.formdev.flatlaf.util.DerivedColor [UI] darken(20%)
|
||||
ScrollBar.pressedThumbColor #9c9c9c HSL 0 0 61 com.formdev.flatlaf.util.DerivedColor [UI] darken(20%)
|
||||
ScrollBar.pressedThumbWithTrack false
|
||||
ScrollBar.showButtons false
|
||||
ScrollBar.squareButtons false
|
||||
ScrollBar.thumb #dcdcdc HSL 0 0 86 com.formdev.flatlaf.util.DerivedColor [UI] darken(10%)
|
||||
ScrollBar.thumbArc 0
|
||||
ScrollBar.thumb #cfcfcf HSL 0 0 81 com.formdev.flatlaf.util.DerivedColor [UI] darken(15%)
|
||||
ScrollBar.thumbArc 999
|
||||
ScrollBar.thumbDarkShadow #9c9c9c HSL 0 0 61 javax.swing.plaf.ColorUIResource [UI]
|
||||
ScrollBar.thumbHighlight #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI]
|
||||
ScrollBar.thumbInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI]
|
||||
ScrollBar.thumbInsets 2,2,2,2 javax.swing.plaf.InsetsUIResource [UI]
|
||||
ScrollBar.thumbShadow #c2c2c2 HSL 0 0 76 javax.swing.plaf.ColorUIResource [UI]
|
||||
ScrollBar.track #f5f5f5 HSL 0 0 96 com.formdev.flatlaf.util.DerivedColor [UI] lighten(1%)
|
||||
ScrollBar.trackArc 0
|
||||
@@ -1260,12 +1260,17 @@ TipOfTheDay.tipAreaInsets 4,16,4,16 javax.swing.plaf.InsetsUIResource [U
|
||||
#---- TitlePane ----
|
||||
|
||||
TitlePane.background #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI]
|
||||
TitlePane.buttonHoverBackground #e6e6e6 HSL 0 0 90 com.formdev.flatlaf.util.DerivedColor [UI] darken(10% autoInverse)
|
||||
TitlePane.buttonArc 0
|
||||
TitlePane.buttonHoverBackground #f2f2f2 HSL 0 0 95 com.formdev.flatlaf.util.DerivedColor [UI] darken(5% autoInverse)
|
||||
TitlePane.buttonInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI]
|
||||
TitlePane.buttonMaximizedHeight 22
|
||||
TitlePane.buttonMinimumWidth 30
|
||||
TitlePane.buttonPressedBackground #ebebeb HSL 0 0 92 com.formdev.flatlaf.util.DerivedColor [UI] darken(8% autoInverse)
|
||||
TitlePane.buttonPressedBackground #f7f7f7 HSL 0 0 97 com.formdev.flatlaf.util.DerivedColor [UI] darken(3% autoInverse)
|
||||
TitlePane.buttonSize 44,30 javax.swing.plaf.DimensionUIResource [UI]
|
||||
TitlePane.buttonSymbolHeight 10
|
||||
TitlePane.buttonsFillVertically true
|
||||
TitlePane.buttonsGap 0
|
||||
TitlePane.buttonsMargins 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI]
|
||||
TitlePane.centerTitle false
|
||||
TitlePane.centerTitleIfMenuBarEmbedded true
|
||||
TitlePane.closeHoverBackground #c42b1c HSL 5 75 44 javax.swing.plaf.ColorUIResource [UI]
|
||||
|
||||
@@ -1265,12 +1265,17 @@ TipOfTheDay.tipAreaInsets 4,16,4,16 javax.swing.plaf.InsetsUIResource [U
|
||||
#---- TitlePane ----
|
||||
|
||||
TitlePane.background #323232 HSL 0 0 20 javax.swing.plaf.ColorUIResource [UI]
|
||||
TitlePane.buttonHoverBackground #585858 HSL 0 0 35 com.formdev.flatlaf.util.DerivedColor [UI] lighten(15% autoInverse)
|
||||
TitlePane.buttonArc 0
|
||||
TitlePane.buttonHoverBackground #4c4c4c HSL 0 0 30 com.formdev.flatlaf.util.DerivedColor [UI] lighten(10% autoInverse)
|
||||
TitlePane.buttonInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI]
|
||||
TitlePane.buttonMaximizedHeight 22
|
||||
TitlePane.buttonMinimumWidth 30
|
||||
TitlePane.buttonPressedBackground #4c4c4c HSL 0 0 30 com.formdev.flatlaf.util.DerivedColor [UI] lighten(10% autoInverse)
|
||||
TitlePane.buttonPressedBackground #414141 HSL 0 0 25 com.formdev.flatlaf.util.DerivedColor [UI] lighten(6% autoInverse)
|
||||
TitlePane.buttonSize 44,30 javax.swing.plaf.DimensionUIResource [UI]
|
||||
TitlePane.buttonSymbolHeight 10
|
||||
TitlePane.buttonsFillVertically true
|
||||
TitlePane.buttonsGap 0
|
||||
TitlePane.buttonsMargins 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI]
|
||||
TitlePane.centerTitle false
|
||||
TitlePane.centerTitleIfMenuBarEmbedded true
|
||||
TitlePane.closeHoverBackground #c42b1c HSL 5 75 44 javax.swing.plaf.ColorUIResource [UI]
|
||||
|
||||
@@ -1269,12 +1269,17 @@ TipOfTheDay.tipAreaInsets 4,16,4,16 javax.swing.plaf.InsetsUIResource [U
|
||||
#---- TitlePane ----
|
||||
|
||||
TitlePane.background #ececec HSL 0 0 93 javax.swing.plaf.ColorUIResource [UI]
|
||||
TitlePane.buttonHoverBackground #d3d3d3 HSL 0 0 83 com.formdev.flatlaf.util.DerivedColor [UI] darken(10% autoInverse)
|
||||
TitlePane.buttonArc 0
|
||||
TitlePane.buttonHoverBackground #dfdfdf HSL 0 0 87 com.formdev.flatlaf.util.DerivedColor [UI] darken(5% autoInverse)
|
||||
TitlePane.buttonInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI]
|
||||
TitlePane.buttonMaximizedHeight 22
|
||||
TitlePane.buttonMinimumWidth 30
|
||||
TitlePane.buttonPressedBackground #d8d8d8 HSL 0 0 85 com.formdev.flatlaf.util.DerivedColor [UI] darken(8% autoInverse)
|
||||
TitlePane.buttonPressedBackground #e4e4e4 HSL 0 0 89 com.formdev.flatlaf.util.DerivedColor [UI] darken(3% autoInverse)
|
||||
TitlePane.buttonSize 44,30 javax.swing.plaf.DimensionUIResource [UI]
|
||||
TitlePane.buttonSymbolHeight 10
|
||||
TitlePane.buttonsFillVertically true
|
||||
TitlePane.buttonsGap 0
|
||||
TitlePane.buttonsMargins 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI]
|
||||
TitlePane.centerTitle false
|
||||
TitlePane.centerTitleIfMenuBarEmbedded true
|
||||
TitlePane.closeHoverBackground #c42b1c HSL 5 75 44 javax.swing.plaf.ColorUIResource [UI]
|
||||
|
||||
@@ -919,15 +919,15 @@ ScrollBar.hoverThumbWithTrack false
|
||||
ScrollBar.hoverTrackColor #00ff00 HSL 120 100 50 javax.swing.plaf.ColorUIResource [UI]
|
||||
ScrollBar.maximumThumbSize 100000,100000 javax.swing.plaf.DimensionUIResource [UI]
|
||||
ScrollBar.minimumButtonSize 12,12 javax.swing.plaf.DimensionUIResource [UI]
|
||||
ScrollBar.minimumThumbSize 10,10 javax.swing.plaf.DimensionUIResource [UI]
|
||||
ScrollBar.minimumThumbSize 18,18 javax.swing.plaf.DimensionUIResource [UI]
|
||||
ScrollBar.pressedThumbWithTrack false
|
||||
ScrollBar.showButtons false
|
||||
ScrollBar.squareButtons false
|
||||
ScrollBar.thumb #73737333 20% HSLA 0 0 45 20 javax.swing.plaf.ColorUIResource [UI]
|
||||
ScrollBar.thumbArc 0
|
||||
ScrollBar.thumbArc 999
|
||||
ScrollBar.thumbDarkShadow #696969 HSL 0 0 41 javax.swing.plaf.ColorUIResource [UI]
|
||||
ScrollBar.thumbHighlight #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI]
|
||||
ScrollBar.thumbInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI]
|
||||
ScrollBar.thumbInsets 2,2,2,2 javax.swing.plaf.InsetsUIResource [UI]
|
||||
ScrollBar.thumbShadow #a0a0a0 HSL 0 0 63 javax.swing.plaf.ColorUIResource [UI]
|
||||
ScrollBar.track #88ff88 HSL 120 100 77 javax.swing.plaf.ColorUIResource [UI]
|
||||
ScrollBar.trackArc 0
|
||||
@@ -1302,17 +1302,34 @@ TipOfTheDay.tipAreaInsets 4,16,4,16 javax.swing.plaf.InsetsUIResource [U
|
||||
|
||||
TitlePane.background #00ff00 HSL 120 100 50 javax.swing.plaf.ColorUIResource [UI]
|
||||
TitlePane.borderColor #ff0000 HSL 0 100 50 javax.swing.plaf.ColorUIResource [UI]
|
||||
TitlePane.buttonArc 0
|
||||
TitlePane.buttonBackground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI]
|
||||
TitlePane.buttonForeground #000000 HSL 0 0 0 javax.swing.plaf.ColorUIResource [UI]
|
||||
TitlePane.buttonHoverBackground #bbbbbb HSL 0 0 73 javax.swing.plaf.ColorUIResource [UI]
|
||||
TitlePane.buttonHoverForeground #00ff00 HSL 120 100 50 javax.swing.plaf.ColorUIResource [UI]
|
||||
TitlePane.buttonInactiveBackground #dddddd HSL 0 0 87 javax.swing.plaf.ColorUIResource [UI]
|
||||
TitlePane.buttonInactiveForeground #0000ff HSL 240 100 50 javax.swing.plaf.ColorUIResource [UI]
|
||||
TitlePane.buttonInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI]
|
||||
TitlePane.buttonMaximizedHeight 22
|
||||
TitlePane.buttonMinimumWidth 30
|
||||
TitlePane.buttonPressedBackground #999999 HSL 0 0 60 javax.swing.plaf.ColorUIResource [UI]
|
||||
TitlePane.buttonPressedForeground #ff0000 HSL 0 100 50 javax.swing.plaf.ColorUIResource [UI]
|
||||
TitlePane.buttonSize 44,30 javax.swing.plaf.DimensionUIResource [UI]
|
||||
TitlePane.buttonSymbolHeight 10
|
||||
TitlePane.buttonsFillVertically true
|
||||
TitlePane.buttonsGap 0
|
||||
TitlePane.buttonsMargins 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI]
|
||||
TitlePane.centerTitle false
|
||||
TitlePane.centerTitleIfMenuBarEmbedded true
|
||||
TitlePane.closeHoverBackground #c42b1c HSL 5 75 44 javax.swing.plaf.ColorUIResource [UI]
|
||||
TitlePane.closeHoverForeground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI]
|
||||
TitlePane.closeBackground #ff0000 HSL 0 100 50 javax.swing.plaf.ColorUIResource [UI]
|
||||
TitlePane.closeForeground #000000 HSL 0 0 0 javax.swing.plaf.ColorUIResource [UI]
|
||||
TitlePane.closeHoverBackground #bb0000 HSL 0 100 37 javax.swing.plaf.ColorUIResource [UI]
|
||||
TitlePane.closeHoverForeground #ff00ff HSL 300 100 50 javax.swing.plaf.ColorUIResource [UI]
|
||||
TitlePane.closeIcon [lazy] 44,30 com.formdev.flatlaf.icons.FlatWindowCloseIcon [UI]
|
||||
TitlePane.closePressedBackground #c42b1ce6 90% HSLA 5 75 44 90 javax.swing.plaf.ColorUIResource [UI]
|
||||
TitlePane.closePressedForeground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI]
|
||||
TitlePane.closeInactiveBackground #dd0000 HSL 0 100 43 javax.swing.plaf.ColorUIResource [UI]
|
||||
TitlePane.closeInactiveForeground #00ffff HSL 180 100 50 javax.swing.plaf.ColorUIResource [UI]
|
||||
TitlePane.closePressedBackground #990000 HSL 0 100 30 javax.swing.plaf.ColorUIResource [UI]
|
||||
TitlePane.closePressedForeground #00ff00 HSL 120 100 50 javax.swing.plaf.ColorUIResource [UI]
|
||||
TitlePane.font [active] $defaultFont [UI]
|
||||
TitlePane.foreground #0000ff HSL 240 100 50 javax.swing.plaf.ColorUIResource [UI]
|
||||
TitlePane.icon [lazy] 16,16 sun.swing.ImageIconUIResource [UI] (sun.awt.image.ToolkitImage)
|
||||
@@ -1714,6 +1731,24 @@ windowText #ff0000 HSL 0 100 50 javax.swing.plaf.Colo
|
||||
#-- activeTitleForeground --
|
||||
InternalFrame.activeTitleForeground #ffaaaa #880000 5.7 !!
|
||||
|
||||
#-- buttonForeground --
|
||||
TitlePane.buttonForeground #000000 #ffffff 21.0
|
||||
|
||||
#-- buttonHoverForeground --
|
||||
TitlePane.buttonHoverForeground #00ff00 #bbbbbb 1.4 !!!!!!
|
||||
|
||||
#-- buttonInactiveForeground --
|
||||
TitlePane.buttonInactiveForeground #0000ff #dddddd 6.3 !
|
||||
|
||||
#-- buttonPressedForeground --
|
||||
TitlePane.buttonPressedForeground #ff0000 #999999 1.4 !!!!!!
|
||||
|
||||
#-- closeForeground --
|
||||
TitlePane.closeForeground #000000 #ff0000 5.3 !!
|
||||
|
||||
#-- closeInactiveForeground --
|
||||
TitlePane.closeInactiveForeground #00ffff #dd0000 4.1 !!!
|
||||
|
||||
#-- disabledForeground --
|
||||
ComboBox.disabledForeground #000088 #e0e0e0 11.7
|
||||
Label.disabledForeground #000088 #ccffcc 13.8
|
||||
|
||||
@@ -24,13 +24,8 @@ import java.awt.event.ComponentAdapter;
|
||||
import java.awt.event.ComponentEvent;
|
||||
import java.awt.event.WindowAdapter;
|
||||
import java.awt.event.WindowEvent;
|
||||
import javax.swing.JButton;
|
||||
import javax.swing.JComponent;
|
||||
import javax.swing.JFrame;
|
||||
import javax.swing.JLabel;
|
||||
import javax.swing.JScrollPane;
|
||||
import javax.swing.KeyStroke;
|
||||
import javax.swing.UIManager;
|
||||
import java.util.function.Supplier;
|
||||
import javax.swing.*;
|
||||
import javax.swing.plaf.metal.MetalLookAndFeel;
|
||||
import javax.swing.plaf.nimbus.NimbusLookAndFeel;
|
||||
import com.formdev.flatlaf.FlatDarculaLaf;
|
||||
@@ -59,11 +54,18 @@ public class FlatSingleComponentTest
|
||||
|
||||
private final JLabel infoLabel;
|
||||
|
||||
private JComponent createSingleComponent() {
|
||||
protected JComponent createSingleComponent() {
|
||||
return new JButton( "hello" );
|
||||
}
|
||||
|
||||
public static void main( String[] args ) {
|
||||
EventQueue.invokeLater( () -> {
|
||||
launch( FlatSingleComponentTest::new, args );
|
||||
} );
|
||||
}
|
||||
|
||||
@SuppressWarnings( "ReturnValueIgnored" ) // Error Prone
|
||||
protected static void launch( Supplier<FlatSingleComponentTest> factory, String[] args ) {
|
||||
DemoPrefs.init( PREFS_ROOT_PATH );
|
||||
DemoPrefs.initSystemScale();
|
||||
|
||||
@@ -88,10 +90,10 @@ public class FlatSingleComponentTest
|
||||
DemoPrefs.setupLaf( args );
|
||||
|
||||
// create and show frame
|
||||
new FlatSingleComponentTest();
|
||||
factory.get();
|
||||
}
|
||||
|
||||
private FlatSingleComponentTest() {
|
||||
protected FlatSingleComponentTest() {
|
||||
super( "FlatSingleComponentTest" );
|
||||
setDefaultCloseOperation( JFrame.EXIT_ON_CLOSE );
|
||||
|
||||
|
||||
@@ -18,7 +18,9 @@ package com.formdev.flatlaf.testing;
|
||||
|
||||
import java.awt.Color;
|
||||
import java.awt.Component;
|
||||
import java.awt.Container;
|
||||
import java.awt.Dimension;
|
||||
import java.awt.FocusTraversalPolicy;
|
||||
import java.awt.Graphics;
|
||||
import java.awt.Insets;
|
||||
import java.util.function.Supplier;
|
||||
@@ -47,6 +49,12 @@ public class FlatTextComponentsTest
|
||||
FlatTextComponentsTest() {
|
||||
initComponents();
|
||||
updatePreferredSizes();
|
||||
|
||||
// exclude from tab focus traversal
|
||||
controlPanel.setFocusTraversalPolicyProvider( true );
|
||||
controlPanel.setFocusTraversalPolicy( new NotFocusableTraversalPolicy() );
|
||||
placeholderPanel.setFocusTraversalPolicyProvider( true );
|
||||
placeholderPanel.setFocusTraversalPolicy( new NotFocusableTraversalPolicy() );
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -196,7 +204,7 @@ public class FlatTextComponentsTest
|
||||
JLabel formattedTextFieldLabel = new JLabel();
|
||||
JFormattedTextField formattedTextField1 = new JFormattedTextField();
|
||||
JFormattedTextField formattedTextField3 = new JFormattedTextField();
|
||||
JPanel panel1 = new JPanel();
|
||||
controlPanel = new JPanel();
|
||||
editableCheckBox = new JCheckBox();
|
||||
JButton button1 = new JButton();
|
||||
JLabel leftPaddingLabel = new JLabel();
|
||||
@@ -215,7 +223,7 @@ public class FlatTextComponentsTest
|
||||
trailingComponentVisibleCheckBox = new JCheckBox();
|
||||
showClearButtonCheckBox = new JCheckBox();
|
||||
showRevealButtonCheckBox = new JCheckBox();
|
||||
JPanel panel2 = new JPanel();
|
||||
placeholderPanel = new JPanel();
|
||||
JLabel label7 = new JLabel();
|
||||
FlatTextField flatTextField1 = new FlatTextField();
|
||||
JLabel label8 = new JLabel();
|
||||
@@ -351,11 +359,11 @@ public class FlatTextComponentsTest
|
||||
formattedTextField3.putClientProperty(FlatClientProperties.PLACEHOLDER_TEXT, "place");
|
||||
add(formattedTextField3, "cell 2 1,growx");
|
||||
|
||||
//======== panel1 ========
|
||||
//======== controlPanel ========
|
||||
{
|
||||
panel1.setBorder(new TitledBorder("Control"));
|
||||
panel1.putClientProperty("FlatLaf.internal.testing.ignore", true);
|
||||
panel1.setLayout(new MigLayout(
|
||||
controlPanel.setBorder(new TitledBorder("Control"));
|
||||
controlPanel.putClientProperty("FlatLaf.internal.testing.ignore", true);
|
||||
controlPanel.setLayout(new MigLayout(
|
||||
"hidemode 3",
|
||||
// columns
|
||||
"[fill]" +
|
||||
@@ -379,94 +387,104 @@ public class FlatTextComponentsTest
|
||||
//---- editableCheckBox ----
|
||||
editableCheckBox.setText("editable");
|
||||
editableCheckBox.setSelected(true);
|
||||
editableCheckBox.setFocusable(false);
|
||||
editableCheckBox.addActionListener(e -> editableChanged());
|
||||
panel1.add(editableCheckBox, "cell 0 0 2 1,alignx left,growx 0");
|
||||
controlPanel.add(editableCheckBox, "cell 0 0 2 1,alignx left,growx 0");
|
||||
|
||||
//---- button1 ----
|
||||
button1.setText("change text");
|
||||
button1.setFocusable(false);
|
||||
button1.addActionListener(e -> changeText());
|
||||
panel1.add(button1, "cell 0 1 2 1,alignx left,growx 0");
|
||||
controlPanel.add(button1, "cell 0 1 2 1,alignx left,growx 0");
|
||||
|
||||
//---- leftPaddingLabel ----
|
||||
leftPaddingLabel.setText("Left padding:");
|
||||
panel1.add(leftPaddingLabel, "cell 0 2");
|
||||
controlPanel.add(leftPaddingLabel, "cell 0 2");
|
||||
|
||||
//---- leftPaddingField ----
|
||||
leftPaddingField.addChangeListener(e -> paddingChanged());
|
||||
panel1.add(leftPaddingField, "cell 1 2");
|
||||
controlPanel.add(leftPaddingField, "cell 1 2");
|
||||
|
||||
//---- rightPaddingLabel ----
|
||||
rightPaddingLabel.setText("Right padding:");
|
||||
panel1.add(rightPaddingLabel, "cell 0 3");
|
||||
controlPanel.add(rightPaddingLabel, "cell 0 3");
|
||||
|
||||
//---- rightPaddingField ----
|
||||
rightPaddingField.addChangeListener(e -> paddingChanged());
|
||||
panel1.add(rightPaddingField, "cell 1 3");
|
||||
controlPanel.add(rightPaddingField, "cell 1 3");
|
||||
|
||||
//---- topPaddingLabel ----
|
||||
topPaddingLabel.setText("Top padding:");
|
||||
panel1.add(topPaddingLabel, "cell 0 4");
|
||||
controlPanel.add(topPaddingLabel, "cell 0 4");
|
||||
|
||||
//---- topPaddingField ----
|
||||
topPaddingField.addChangeListener(e -> paddingChanged());
|
||||
panel1.add(topPaddingField, "cell 1 4");
|
||||
controlPanel.add(topPaddingField, "cell 1 4");
|
||||
|
||||
//---- bottomPaddingLabel ----
|
||||
bottomPaddingLabel.setText("Bottom padding:");
|
||||
panel1.add(bottomPaddingLabel, "cell 0 5");
|
||||
controlPanel.add(bottomPaddingLabel, "cell 0 5");
|
||||
|
||||
//---- bottomPaddingField ----
|
||||
bottomPaddingField.addChangeListener(e -> paddingChanged());
|
||||
panel1.add(bottomPaddingField, "cell 1 5");
|
||||
controlPanel.add(bottomPaddingField, "cell 1 5");
|
||||
|
||||
//---- leadingIconCheckBox ----
|
||||
leadingIconCheckBox.setText("leading icon");
|
||||
leadingIconCheckBox.setFocusable(false);
|
||||
leadingIconCheckBox.addActionListener(e -> leadingIcon());
|
||||
panel1.add(leadingIconCheckBox, "cell 0 6 2 1,alignx left,growx 0");
|
||||
controlPanel.add(leadingIconCheckBox, "cell 0 6 2 1,alignx left,growx 0");
|
||||
|
||||
//---- trailingIconCheckBox ----
|
||||
trailingIconCheckBox.setText("trailing icon");
|
||||
trailingIconCheckBox.setFocusable(false);
|
||||
trailingIconCheckBox.addActionListener(e -> trailingIcon());
|
||||
panel1.add(trailingIconCheckBox, "cell 0 7 2 1,alignx left,growx 0");
|
||||
controlPanel.add(trailingIconCheckBox, "cell 0 7 2 1,alignx left,growx 0");
|
||||
|
||||
//---- leadingComponentCheckBox ----
|
||||
leadingComponentCheckBox.setText("leading component");
|
||||
leadingComponentCheckBox.setFocusable(false);
|
||||
leadingComponentCheckBox.addActionListener(e -> leadingComponent());
|
||||
panel1.add(leadingComponentCheckBox, "cell 0 8 2 1,alignx left,growx 0");
|
||||
controlPanel.add(leadingComponentCheckBox, "cell 0 8 2 1,alignx left,growx 0");
|
||||
|
||||
//---- trailingComponentCheckBox ----
|
||||
trailingComponentCheckBox.setText("trailing component");
|
||||
trailingComponentCheckBox.setFocusable(false);
|
||||
trailingComponentCheckBox.addActionListener(e -> trailingComponent());
|
||||
panel1.add(trailingComponentCheckBox, "cell 0 9 2 1,alignx left,growx 0");
|
||||
controlPanel.add(trailingComponentCheckBox, "cell 0 9 2 1,alignx left,growx 0");
|
||||
|
||||
//---- leadingComponentVisibleCheckBox ----
|
||||
leadingComponentVisibleCheckBox.setText("leading component visible");
|
||||
leadingComponentVisibleCheckBox.setSelected(true);
|
||||
leadingComponentVisibleCheckBox.setFocusable(false);
|
||||
leadingComponentVisibleCheckBox.addActionListener(e -> leadingComponentVisible());
|
||||
panel1.add(leadingComponentVisibleCheckBox, "cell 0 10 2 1,alignx left,growx 0");
|
||||
controlPanel.add(leadingComponentVisibleCheckBox, "cell 0 10 2 1,alignx left,growx 0");
|
||||
|
||||
//---- trailingComponentVisibleCheckBox ----
|
||||
trailingComponentVisibleCheckBox.setText("trailing component visible");
|
||||
trailingComponentVisibleCheckBox.setSelected(true);
|
||||
trailingComponentVisibleCheckBox.setFocusable(false);
|
||||
trailingComponentVisibleCheckBox.addActionListener(e -> trailingComponentVisible());
|
||||
panel1.add(trailingComponentVisibleCheckBox, "cell 0 11 2 1,alignx left,growx 0");
|
||||
controlPanel.add(trailingComponentVisibleCheckBox, "cell 0 11 2 1,alignx left,growx 0");
|
||||
|
||||
//---- showClearButtonCheckBox ----
|
||||
showClearButtonCheckBox.setText("clear button");
|
||||
showClearButtonCheckBox.setFocusable(false);
|
||||
showClearButtonCheckBox.addActionListener(e -> showClearButton());
|
||||
panel1.add(showClearButtonCheckBox, "cell 0 12 2 1,alignx left,growx 0");
|
||||
controlPanel.add(showClearButtonCheckBox, "cell 0 12 2 1,alignx left,growx 0");
|
||||
|
||||
//---- showRevealButtonCheckBox ----
|
||||
showRevealButtonCheckBox.setText("password reveal button");
|
||||
showRevealButtonCheckBox.setFocusable(false);
|
||||
showRevealButtonCheckBox.addActionListener(e -> showRevealButton());
|
||||
panel1.add(showRevealButtonCheckBox, "cell 0 13 2 1,alignx left,growx 0");
|
||||
controlPanel.add(showRevealButtonCheckBox, "cell 0 13 2 1,alignx left,growx 0");
|
||||
}
|
||||
add(panel1, "cell 4 0 1 10,aligny top,growy 0");
|
||||
add(controlPanel, "cell 4 0 1 10,aligny top,growy 0");
|
||||
|
||||
//======== panel2 ========
|
||||
//======== placeholderPanel ========
|
||||
{
|
||||
panel2.setBorder(new TitledBorder("Placeholder"));
|
||||
panel2.setLayout(new MigLayout(
|
||||
placeholderPanel.setBorder(new TitledBorder("Placeholder"));
|
||||
placeholderPanel.setLayout(new MigLayout(
|
||||
"hidemode 3",
|
||||
// columns
|
||||
"[fill]" +
|
||||
@@ -480,55 +498,55 @@ public class FlatTextComponentsTest
|
||||
|
||||
//---- label7 ----
|
||||
label7.setText("leading");
|
||||
panel2.add(label7, "cell 0 0");
|
||||
placeholderPanel.add(label7, "cell 0 0");
|
||||
|
||||
//---- flatTextField1 ----
|
||||
flatTextField1.setHorizontalAlignment(SwingConstants.LEADING);
|
||||
flatTextField1.setPlaceholderText("text");
|
||||
flatTextField1.setColumns(10);
|
||||
panel2.add(flatTextField1, "cell 1 0");
|
||||
placeholderPanel.add(flatTextField1, "cell 1 0");
|
||||
|
||||
//---- label8 ----
|
||||
label8.setText("left");
|
||||
panel2.add(label8, "cell 0 1");
|
||||
placeholderPanel.add(label8, "cell 0 1");
|
||||
|
||||
//---- flatTextField2 ----
|
||||
flatTextField2.setHorizontalAlignment(SwingConstants.LEFT);
|
||||
flatTextField2.setPlaceholderText("text");
|
||||
flatTextField2.setColumns(10);
|
||||
panel2.add(flatTextField2, "cell 1 1");
|
||||
placeholderPanel.add(flatTextField2, "cell 1 1");
|
||||
|
||||
//---- label9 ----
|
||||
label9.setText("center");
|
||||
panel2.add(label9, "cell 0 2");
|
||||
placeholderPanel.add(label9, "cell 0 2");
|
||||
|
||||
//---- flatTextField3 ----
|
||||
flatTextField3.setHorizontalAlignment(SwingConstants.CENTER);
|
||||
flatTextField3.setPlaceholderText("text");
|
||||
flatTextField3.setColumns(10);
|
||||
panel2.add(flatTextField3, "cell 1 2");
|
||||
placeholderPanel.add(flatTextField3, "cell 1 2");
|
||||
|
||||
//---- label10 ----
|
||||
label10.setText("right");
|
||||
panel2.add(label10, "cell 0 3");
|
||||
placeholderPanel.add(label10, "cell 0 3");
|
||||
|
||||
//---- flatTextField4 ----
|
||||
flatTextField4.setHorizontalAlignment(SwingConstants.RIGHT);
|
||||
flatTextField4.setPlaceholderText("text");
|
||||
flatTextField4.setColumns(10);
|
||||
panel2.add(flatTextField4, "cell 1 3");
|
||||
placeholderPanel.add(flatTextField4, "cell 1 3");
|
||||
|
||||
//---- label11 ----
|
||||
label11.setText("trailing");
|
||||
panel2.add(label11, "cell 0 4");
|
||||
placeholderPanel.add(label11, "cell 0 4");
|
||||
|
||||
//---- flatTextField5 ----
|
||||
flatTextField5.setHorizontalAlignment(SwingConstants.TRAILING);
|
||||
flatTextField5.setPlaceholderText("text");
|
||||
flatTextField5.setColumns(10);
|
||||
panel2.add(flatTextField5, "cell 1 4");
|
||||
placeholderPanel.add(flatTextField5, "cell 1 4");
|
||||
}
|
||||
add(panel2, "cell 5 0 1 9,aligny top,growy 0");
|
||||
add(placeholderPanel, "cell 5 0 1 10,aligny top,growy 0");
|
||||
|
||||
//---- passwordFieldLabel ----
|
||||
passwordFieldLabel.setText("JPasswordField:");
|
||||
@@ -783,6 +801,7 @@ public class FlatTextComponentsTest
|
||||
|
||||
// JFormDesigner - Variables declaration - DO NOT MODIFY //GEN-BEGIN:variables
|
||||
private JTextField textField1;
|
||||
private JPanel controlPanel;
|
||||
private JCheckBox editableCheckBox;
|
||||
private JSpinner leftPaddingField;
|
||||
private JSpinner rightPaddingField;
|
||||
@@ -796,6 +815,7 @@ public class FlatTextComponentsTest
|
||||
private JCheckBox trailingComponentVisibleCheckBox;
|
||||
private JCheckBox showClearButtonCheckBox;
|
||||
private JCheckBox showRevealButtonCheckBox;
|
||||
private JPanel placeholderPanel;
|
||||
private JComboBox<String> comboBox5;
|
||||
private JSpinner spinner4;
|
||||
private JComboBox<String> comboBox6;
|
||||
@@ -807,6 +827,18 @@ public class FlatTextComponentsTest
|
||||
private JEditorPane editorPane;
|
||||
// JFormDesigner - End of variables declaration //GEN-END:variables
|
||||
|
||||
//---- NotFocusableTraversalPolicy ----------------------------------------
|
||||
|
||||
private static class NotFocusableTraversalPolicy
|
||||
extends FocusTraversalPolicy
|
||||
{
|
||||
@Override public Component getComponentAfter( Container aContainer, Component aComponent ) { return null; }
|
||||
@Override public Component getComponentBefore( Container aContainer, Component aComponent ) { return null; }
|
||||
@Override public Component getFirstComponent( Container aContainer ) { return null; }
|
||||
@Override public Component getLastComponent( Container aContainer ) { return null; }
|
||||
@Override public Component getDefaultComponent( Container aContainer ) { return null; }
|
||||
}
|
||||
|
||||
//---- TestIcon -----------------------------------------------------------
|
||||
|
||||
private static class TestIcon
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
JFDML JFormDesigner: "8.1.0.0.283" Java: "19.0.2" encoding: "UTF-8"
|
||||
JFDML JFormDesigner: "8.3" encoding: "UTF-8"
|
||||
|
||||
new FormModel {
|
||||
contentType: "form/swing"
|
||||
@@ -78,13 +78,17 @@ new FormModel {
|
||||
"$columnConstraints": "[fill][fill]"
|
||||
"$rowConstraints": "[][][][][][][]0[][]0[][]0[][][]"
|
||||
} ) {
|
||||
name: "panel1"
|
||||
name: "controlPanel"
|
||||
"border": new javax.swing.border.TitledBorder( "Control" )
|
||||
"$client.FlatLaf.internal.testing.ignore": true
|
||||
auxiliary() {
|
||||
"JavaCodeGenerator.variableLocal": false
|
||||
}
|
||||
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
||||
name: "editableCheckBox"
|
||||
"text": "editable"
|
||||
"selected": true
|
||||
"focusable": false
|
||||
auxiliary() {
|
||||
"JavaCodeGenerator.variableLocal": false
|
||||
}
|
||||
@@ -95,6 +99,7 @@ new FormModel {
|
||||
add( new FormComponent( "javax.swing.JButton" ) {
|
||||
name: "button1"
|
||||
"text": "change text"
|
||||
"focusable": false
|
||||
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "changeText", false ) )
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 0 1 2 1,alignx left,growx 0"
|
||||
@@ -162,6 +167,7 @@ new FormModel {
|
||||
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
||||
name: "leadingIconCheckBox"
|
||||
"text": "leading icon"
|
||||
"focusable": false
|
||||
auxiliary() {
|
||||
"JavaCodeGenerator.variableLocal": false
|
||||
}
|
||||
@@ -172,6 +178,7 @@ new FormModel {
|
||||
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
||||
name: "trailingIconCheckBox"
|
||||
"text": "trailing icon"
|
||||
"focusable": false
|
||||
auxiliary() {
|
||||
"JavaCodeGenerator.variableLocal": false
|
||||
}
|
||||
@@ -182,6 +189,7 @@ new FormModel {
|
||||
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
||||
name: "leadingComponentCheckBox"
|
||||
"text": "leading component"
|
||||
"focusable": false
|
||||
auxiliary() {
|
||||
"JavaCodeGenerator.variableLocal": false
|
||||
}
|
||||
@@ -192,6 +200,7 @@ new FormModel {
|
||||
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
||||
name: "trailingComponentCheckBox"
|
||||
"text": "trailing component"
|
||||
"focusable": false
|
||||
auxiliary() {
|
||||
"JavaCodeGenerator.variableLocal": false
|
||||
}
|
||||
@@ -203,6 +212,7 @@ new FormModel {
|
||||
name: "leadingComponentVisibleCheckBox"
|
||||
"text": "leading component visible"
|
||||
"selected": true
|
||||
"focusable": false
|
||||
auxiliary() {
|
||||
"JavaCodeGenerator.variableLocal": false
|
||||
}
|
||||
@@ -214,6 +224,7 @@ new FormModel {
|
||||
name: "trailingComponentVisibleCheckBox"
|
||||
"text": "trailing component visible"
|
||||
"selected": true
|
||||
"focusable": false
|
||||
auxiliary() {
|
||||
"JavaCodeGenerator.variableLocal": false
|
||||
}
|
||||
@@ -224,6 +235,7 @@ new FormModel {
|
||||
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
||||
name: "showClearButtonCheckBox"
|
||||
"text": "clear button"
|
||||
"focusable": false
|
||||
auxiliary() {
|
||||
"JavaCodeGenerator.variableLocal": false
|
||||
}
|
||||
@@ -234,6 +246,7 @@ new FormModel {
|
||||
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
||||
name: "showRevealButtonCheckBox"
|
||||
"text": "password reveal button"
|
||||
"focusable": false
|
||||
auxiliary() {
|
||||
"JavaCodeGenerator.variableLocal": false
|
||||
}
|
||||
@@ -249,8 +262,11 @@ new FormModel {
|
||||
"$columnConstraints": "[fill][fill]"
|
||||
"$rowConstraints": "[][][][][]"
|
||||
} ) {
|
||||
name: "panel2"
|
||||
name: "placeholderPanel"
|
||||
"border": new javax.swing.border.TitledBorder( "Placeholder" )
|
||||
auxiliary() {
|
||||
"JavaCodeGenerator.variableLocal": false
|
||||
}
|
||||
add( new FormComponent( "javax.swing.JLabel" ) {
|
||||
name: "label7"
|
||||
"text": "leading"
|
||||
@@ -325,7 +341,7 @@ new FormModel {
|
||||
"value": "cell 1 4"
|
||||
} )
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 5 0 1 9,aligny top,growy 0"
|
||||
"value": "cell 5 0 1 10,aligny top,growy 0"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JLabel" ) {
|
||||
name: "passwordFieldLabel"
|
||||
|
||||
@@ -0,0 +1,423 @@
|
||||
/*
|
||||
* Copyright 2025 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.testing;
|
||||
|
||||
import static com.formdev.flatlaf.FlatClientProperties.*;
|
||||
import java.awt.EventQueue;
|
||||
import java.text.ParseException;
|
||||
import javax.swing.*;
|
||||
import javax.swing.text.DefaultFormatterFactory;
|
||||
import javax.swing.text.MaskFormatter;
|
||||
import net.miginfocom.swing.*;
|
||||
|
||||
/**
|
||||
* @author Karl Tauber
|
||||
*/
|
||||
public class FlatTextSelectAllOnFocusTest
|
||||
extends FlatSingleComponentTest
|
||||
{
|
||||
public static void main( String[] args ) {
|
||||
EventQueue.invokeLater( () -> {
|
||||
launch( FlatTextSelectAllOnFocusTest::new, args );
|
||||
} );
|
||||
}
|
||||
|
||||
@Override
|
||||
protected JComponent createSingleComponent() {
|
||||
initComponents();
|
||||
|
||||
try {
|
||||
MaskFormatter formatter = new MaskFormatter( "###-####-###" );
|
||||
formatter.setPlaceholderCharacter( '_' );
|
||||
DefaultFormatterFactory factory = new DefaultFormatterFactory( formatter );
|
||||
|
||||
formattedTextField1.setFormatterFactory( factory );
|
||||
formattedTextField2.setFormatterFactory( factory );
|
||||
formattedTextField3.setFormatterFactory( factory );
|
||||
formattedTextField4.setFormatterFactory( factory );
|
||||
formattedTextField5.setFormatterFactory( factory );
|
||||
formattedTextField6.setFormatterFactory( factory );
|
||||
|
||||
formattedTextField1.setValue( "123-4567-890" );
|
||||
formattedTextField2.setValue( "123-4567-890" );
|
||||
formattedTextField3.setValue( "123-4567-890" );
|
||||
formattedTextField4.setValue( "123-4567-890" );
|
||||
formattedTextField5.setValue( "123-4567-890" );
|
||||
formattedTextField6.setValue( "123-4567-890" );
|
||||
} catch( ParseException ex ) {
|
||||
ex.printStackTrace();
|
||||
}
|
||||
|
||||
textField2.putClientProperty( SELECT_ALL_ON_FOCUS_POLICY, SELECT_ALL_ON_FOCUS_POLICY_NEVER );
|
||||
textField3.putClientProperty( SELECT_ALL_ON_FOCUS_POLICY, SELECT_ALL_ON_FOCUS_POLICY_ONCE );
|
||||
textField4.putClientProperty( SELECT_ALL_ON_FOCUS_POLICY, SELECT_ALL_ON_FOCUS_POLICY_ALWAYS );
|
||||
textField5.putClientProperty( SELECT_ALL_ON_FOCUS_POLICY, SELECT_ALL_ON_FOCUS_POLICY_ONCE );
|
||||
textField5.putClientProperty( SELECT_ALL_ON_MOUSE_CLICK, true );
|
||||
textField6.putClientProperty( SELECT_ALL_ON_FOCUS_POLICY, SELECT_ALL_ON_FOCUS_POLICY_ALWAYS );
|
||||
textField6.putClientProperty( SELECT_ALL_ON_MOUSE_CLICK, true );
|
||||
textField7.select( 5, 7 );
|
||||
|
||||
formattedTextField2.putClientProperty( SELECT_ALL_ON_FOCUS_POLICY, SELECT_ALL_ON_FOCUS_POLICY_NEVER );
|
||||
formattedTextField3.putClientProperty( SELECT_ALL_ON_FOCUS_POLICY, SELECT_ALL_ON_FOCUS_POLICY_ONCE );
|
||||
formattedTextField4.putClientProperty( SELECT_ALL_ON_FOCUS_POLICY, SELECT_ALL_ON_FOCUS_POLICY_ALWAYS );
|
||||
formattedTextField5.putClientProperty( SELECT_ALL_ON_FOCUS_POLICY, SELECT_ALL_ON_FOCUS_POLICY_ONCE );
|
||||
formattedTextField5.putClientProperty( SELECT_ALL_ON_MOUSE_CLICK, true );
|
||||
formattedTextField6.putClientProperty( SELECT_ALL_ON_FOCUS_POLICY, SELECT_ALL_ON_FOCUS_POLICY_ALWAYS );
|
||||
formattedTextField6.putClientProperty( SELECT_ALL_ON_MOUSE_CLICK, true );
|
||||
|
||||
comboBox2.putClientProperty( SELECT_ALL_ON_FOCUS_POLICY, SELECT_ALL_ON_FOCUS_POLICY_NEVER );
|
||||
comboBox3.putClientProperty( SELECT_ALL_ON_FOCUS_POLICY, SELECT_ALL_ON_FOCUS_POLICY_ONCE );
|
||||
comboBox4.putClientProperty( SELECT_ALL_ON_FOCUS_POLICY, SELECT_ALL_ON_FOCUS_POLICY_ALWAYS );
|
||||
comboBox5.putClientProperty( SELECT_ALL_ON_FOCUS_POLICY, SELECT_ALL_ON_FOCUS_POLICY_ONCE );
|
||||
comboBox5.putClientProperty( SELECT_ALL_ON_MOUSE_CLICK, true );
|
||||
comboBox6.putClientProperty( SELECT_ALL_ON_FOCUS_POLICY, SELECT_ALL_ON_FOCUS_POLICY_ALWAYS );
|
||||
comboBox6.putClientProperty( SELECT_ALL_ON_MOUSE_CLICK, true );
|
||||
((JTextField)comboBox7.getEditor().getEditorComponent()).select( 5, 7 );
|
||||
|
||||
spinner2.putClientProperty( SELECT_ALL_ON_FOCUS_POLICY, SELECT_ALL_ON_FOCUS_POLICY_NEVER );
|
||||
spinner3.putClientProperty( SELECT_ALL_ON_FOCUS_POLICY, SELECT_ALL_ON_FOCUS_POLICY_ONCE );
|
||||
spinner4.putClientProperty( SELECT_ALL_ON_FOCUS_POLICY, SELECT_ALL_ON_FOCUS_POLICY_ALWAYS );
|
||||
spinner5.putClientProperty( SELECT_ALL_ON_FOCUS_POLICY, SELECT_ALL_ON_FOCUS_POLICY_ONCE );
|
||||
spinner5.putClientProperty( SELECT_ALL_ON_MOUSE_CLICK, true );
|
||||
spinner6.putClientProperty( SELECT_ALL_ON_FOCUS_POLICY, SELECT_ALL_ON_FOCUS_POLICY_ALWAYS );
|
||||
spinner6.putClientProperty( SELECT_ALL_ON_MOUSE_CLICK, true );
|
||||
|
||||
// textArea1.putClientProperty( SELECT_ALL_ON_FOCUS_POLICY, SELECT_ALL_ON_FOCUS_POLICY_ALWAYS );
|
||||
// textPane1.putClientProperty( SELECT_ALL_ON_FOCUS_POLICY, SELECT_ALL_ON_FOCUS_POLICY_ALWAYS );
|
||||
// editorPane1.putClientProperty( SELECT_ALL_ON_FOCUS_POLICY, SELECT_ALL_ON_FOCUS_POLICY_ALWAYS );
|
||||
//
|
||||
// textArea1.putClientProperty( SELECT_ALL_ON_FOCUS_POLICY, SELECT_ALL_ON_FOCUS_POLICY_ONCE );
|
||||
// textPane1.putClientProperty( SELECT_ALL_ON_FOCUS_POLICY, SELECT_ALL_ON_FOCUS_POLICY_ONCE );
|
||||
// editorPane1.putClientProperty( SELECT_ALL_ON_FOCUS_POLICY, SELECT_ALL_ON_FOCUS_POLICY_ONCE );
|
||||
//
|
||||
// textArea1.putClientProperty( SELECT_ALL_ON_MOUSE_CLICK, true );
|
||||
// textPane1.putClientProperty( SELECT_ALL_ON_MOUSE_CLICK, true );
|
||||
// editorPane1.putClientProperty( SELECT_ALL_ON_MOUSE_CLICK, true );
|
||||
//
|
||||
// textArea1.select( 5, 7 );
|
||||
// textPane1.select( 5, 7 );
|
||||
// editorPane1.select( 5, 7 );
|
||||
|
||||
return panel;
|
||||
}
|
||||
|
||||
private void initComponents() {
|
||||
// JFormDesigner - Component initialization - DO NOT MODIFY //GEN-BEGIN:initComponents
|
||||
panel = new FlatTestPanel();
|
||||
label1 = new JLabel();
|
||||
label2 = new JLabel();
|
||||
label3 = new JLabel();
|
||||
label4 = new JLabel();
|
||||
label5 = new JLabel();
|
||||
label6 = new JLabel();
|
||||
label7 = new JLabel();
|
||||
textFieldLabel = new JLabel();
|
||||
textField1 = new JTextField();
|
||||
textField2 = new JTextField();
|
||||
textField3 = new JTextField();
|
||||
textField4 = new JTextField();
|
||||
textField5 = new JTextField();
|
||||
textField6 = new JTextField();
|
||||
textField7 = new JTextField();
|
||||
formattedTextFieldLabel = new JLabel();
|
||||
formattedTextField1 = new JFormattedTextField();
|
||||
formattedTextField2 = new JFormattedTextField();
|
||||
formattedTextField3 = new JFormattedTextField();
|
||||
formattedTextField4 = new JFormattedTextField();
|
||||
formattedTextField5 = new JFormattedTextField();
|
||||
formattedTextField6 = new JFormattedTextField();
|
||||
comboBoxLabel = new JLabel();
|
||||
comboBox1 = new JComboBox<>();
|
||||
comboBox2 = new JComboBox<>();
|
||||
comboBox3 = new JComboBox<>();
|
||||
comboBox4 = new JComboBox<>();
|
||||
comboBox5 = new JComboBox<>();
|
||||
comboBox6 = new JComboBox<>();
|
||||
comboBox7 = new JComboBox<>();
|
||||
spinnerLabel = new JLabel();
|
||||
spinner1 = new JSpinner();
|
||||
spinner2 = new JSpinner();
|
||||
spinner3 = new JSpinner();
|
||||
spinner4 = new JSpinner();
|
||||
spinner5 = new JSpinner();
|
||||
spinner6 = new JSpinner();
|
||||
scrollPane1 = new JScrollPane();
|
||||
textArea1 = new JTextArea();
|
||||
scrollPane2 = new JScrollPane();
|
||||
textPane1 = new JTextPane();
|
||||
scrollPane3 = new JScrollPane();
|
||||
editorPane1 = new JEditorPane();
|
||||
|
||||
//======== panel ========
|
||||
{
|
||||
panel.setLayout(new MigLayout(
|
||||
"ltr,insets dialog,hidemode 3",
|
||||
// columns
|
||||
"[]" +
|
||||
"[100,sizegroup 1,fill]" +
|
||||
"[sizegroup 1,fill]" +
|
||||
"[sizegroup 1,fill]" +
|
||||
"[sizegroup 1,fill]" +
|
||||
"[sizegroup 1,fill]" +
|
||||
"[fill]" +
|
||||
"[fill]",
|
||||
// rows
|
||||
"[]" +
|
||||
"[]" +
|
||||
"[]" +
|
||||
"[]" +
|
||||
"[]" +
|
||||
"[fill]" +
|
||||
"[30]"));
|
||||
|
||||
//---- label1 ----
|
||||
label1.setText("default");
|
||||
panel.add(label1, "cell 1 0");
|
||||
|
||||
//---- label2 ----
|
||||
label2.setText("never");
|
||||
panel.add(label2, "cell 2 0");
|
||||
|
||||
//---- label3 ----
|
||||
label3.setText("once");
|
||||
panel.add(label3, "cell 3 0");
|
||||
|
||||
//---- label4 ----
|
||||
label4.setText("always");
|
||||
panel.add(label4, "cell 4 0");
|
||||
|
||||
//---- label5 ----
|
||||
label5.setText("once on click");
|
||||
panel.add(label5, "cell 5 0");
|
||||
|
||||
//---- label6 ----
|
||||
label6.setText("always on click");
|
||||
panel.add(label6, "cell 6 0");
|
||||
|
||||
//---- label7 ----
|
||||
label7.setText("custom selection");
|
||||
panel.add(label7, "cell 7 0");
|
||||
|
||||
//---- textFieldLabel ----
|
||||
textFieldLabel.setText("JTextField:");
|
||||
textFieldLabel.setDisplayedMnemonic('T');
|
||||
textFieldLabel.setLabelFor(textField1);
|
||||
panel.add(textFieldLabel, "cell 0 1");
|
||||
|
||||
//---- textField1 ----
|
||||
textField1.setText("1234567890");
|
||||
panel.add(textField1, "cell 1 1");
|
||||
|
||||
//---- textField2 ----
|
||||
textField2.setText("1234567890");
|
||||
panel.add(textField2, "cell 2 1");
|
||||
|
||||
//---- textField3 ----
|
||||
textField3.setText("1234567890");
|
||||
panel.add(textField3, "cell 3 1");
|
||||
|
||||
//---- textField4 ----
|
||||
textField4.setText("1234567890");
|
||||
panel.add(textField4, "cell 4 1");
|
||||
|
||||
//---- textField5 ----
|
||||
textField5.setText("1234567890");
|
||||
panel.add(textField5, "cell 5 1");
|
||||
|
||||
//---- textField6 ----
|
||||
textField6.setText("1234567890");
|
||||
panel.add(textField6, "cell 6 1");
|
||||
|
||||
//---- textField7 ----
|
||||
textField7.setText("1234567890");
|
||||
panel.add(textField7, "cell 7 1");
|
||||
|
||||
//---- formattedTextFieldLabel ----
|
||||
formattedTextFieldLabel.setText("JFormattedTextField:");
|
||||
formattedTextFieldLabel.setDisplayedMnemonic('F');
|
||||
formattedTextFieldLabel.setLabelFor(formattedTextField1);
|
||||
panel.add(formattedTextFieldLabel, "cell 0 2");
|
||||
panel.add(formattedTextField1, "cell 1 2");
|
||||
panel.add(formattedTextField2, "cell 2 2");
|
||||
panel.add(formattedTextField3, "cell 3 2");
|
||||
panel.add(formattedTextField4, "cell 4 2");
|
||||
panel.add(formattedTextField5, "cell 5 2");
|
||||
panel.add(formattedTextField6, "cell 6 2");
|
||||
|
||||
//---- comboBoxLabel ----
|
||||
comboBoxLabel.setText("JComboBox:");
|
||||
comboBoxLabel.setDisplayedMnemonic('C');
|
||||
comboBoxLabel.setLabelFor(comboBox1);
|
||||
panel.add(comboBoxLabel, "cell 0 3");
|
||||
|
||||
//---- comboBox1 ----
|
||||
comboBox1.setEditable(true);
|
||||
comboBox1.setModel(new DefaultComboBoxModel<>(new String[] {
|
||||
"1234567890"
|
||||
}));
|
||||
panel.add(comboBox1, "cell 1 3");
|
||||
|
||||
//---- comboBox2 ----
|
||||
comboBox2.setEditable(true);
|
||||
comboBox2.setModel(new DefaultComboBoxModel<>(new String[] {
|
||||
"1234567890"
|
||||
}));
|
||||
panel.add(comboBox2, "cell 2 3");
|
||||
|
||||
//---- comboBox3 ----
|
||||
comboBox3.setEditable(true);
|
||||
comboBox3.setModel(new DefaultComboBoxModel<>(new String[] {
|
||||
"1234567890"
|
||||
}));
|
||||
panel.add(comboBox3, "cell 3 3");
|
||||
|
||||
//---- comboBox4 ----
|
||||
comboBox4.setEditable(true);
|
||||
comboBox4.setModel(new DefaultComboBoxModel<>(new String[] {
|
||||
"1234567890"
|
||||
}));
|
||||
panel.add(comboBox4, "cell 4 3");
|
||||
|
||||
//---- comboBox5 ----
|
||||
comboBox5.setEditable(true);
|
||||
comboBox5.setModel(new DefaultComboBoxModel<>(new String[] {
|
||||
"1234567890"
|
||||
}));
|
||||
panel.add(comboBox5, "cell 5 3");
|
||||
|
||||
//---- comboBox6 ----
|
||||
comboBox6.setEditable(true);
|
||||
comboBox6.setModel(new DefaultComboBoxModel<>(new String[] {
|
||||
"1234567890"
|
||||
}));
|
||||
panel.add(comboBox6, "cell 6 3");
|
||||
|
||||
//---- comboBox7 ----
|
||||
comboBox7.setEditable(true);
|
||||
comboBox7.setModel(new DefaultComboBoxModel<>(new String[] {
|
||||
"1234567890"
|
||||
}));
|
||||
panel.add(comboBox7, "cell 7 3");
|
||||
|
||||
//---- spinnerLabel ----
|
||||
spinnerLabel.setText("JSpinner:");
|
||||
spinnerLabel.setDisplayedMnemonic('S');
|
||||
spinnerLabel.setLabelFor(spinner1);
|
||||
panel.add(spinnerLabel, "cell 0 4");
|
||||
|
||||
//---- spinner1 ----
|
||||
spinner1.setModel(new SpinnerNumberModel(1234, null, null, 100));
|
||||
panel.add(spinner1, "cell 1 4");
|
||||
|
||||
//---- spinner2 ----
|
||||
spinner2.setModel(new SpinnerNumberModel(1234, null, null, 100));
|
||||
panel.add(spinner2, "cell 2 4");
|
||||
|
||||
//---- spinner3 ----
|
||||
spinner3.setModel(new SpinnerNumberModel(1234, null, null, 100));
|
||||
panel.add(spinner3, "cell 3 4");
|
||||
|
||||
//---- spinner4 ----
|
||||
spinner4.setModel(new SpinnerNumberModel(1234, null, null, 100));
|
||||
panel.add(spinner4, "cell 4 4");
|
||||
|
||||
//---- spinner5 ----
|
||||
spinner5.setModel(new SpinnerNumberModel(1234, null, null, 100));
|
||||
panel.add(spinner5, "cell 5 4");
|
||||
|
||||
//---- spinner6 ----
|
||||
spinner6.setModel(new SpinnerNumberModel(1234, null, null, 100));
|
||||
panel.add(spinner6, "cell 6 4");
|
||||
|
||||
//======== scrollPane1 ========
|
||||
{
|
||||
|
||||
//---- textArea1 ----
|
||||
textArea1.setRows(3);
|
||||
textArea1.setText("1234567890\nabc");
|
||||
scrollPane1.setViewportView(textArea1);
|
||||
}
|
||||
panel.add(scrollPane1, "cell 1 5");
|
||||
|
||||
//======== scrollPane2 ========
|
||||
{
|
||||
|
||||
//---- textPane1 ----
|
||||
textPane1.setText("1234567890\nabc");
|
||||
scrollPane2.setViewportView(textPane1);
|
||||
}
|
||||
panel.add(scrollPane2, "cell 2 5");
|
||||
|
||||
//======== scrollPane3 ========
|
||||
{
|
||||
|
||||
//---- editorPane1 ----
|
||||
editorPane1.setText("1234567890\nabc");
|
||||
scrollPane3.setViewportView(editorPane1);
|
||||
}
|
||||
panel.add(scrollPane3, "cell 3 5 2 1");
|
||||
}
|
||||
// JFormDesigner - End of component initialization //GEN-END:initComponents
|
||||
}
|
||||
|
||||
// JFormDesigner - Variables declaration - DO NOT MODIFY //GEN-BEGIN:variables
|
||||
private FlatTestPanel panel;
|
||||
private JLabel label1;
|
||||
private JLabel label2;
|
||||
private JLabel label3;
|
||||
private JLabel label4;
|
||||
private JLabel label5;
|
||||
private JLabel label6;
|
||||
private JLabel label7;
|
||||
private JLabel textFieldLabel;
|
||||
private JTextField textField1;
|
||||
private JTextField textField2;
|
||||
private JTextField textField3;
|
||||
private JTextField textField4;
|
||||
private JTextField textField5;
|
||||
private JTextField textField6;
|
||||
private JTextField textField7;
|
||||
private JLabel formattedTextFieldLabel;
|
||||
private JFormattedTextField formattedTextField1;
|
||||
private JFormattedTextField formattedTextField2;
|
||||
private JFormattedTextField formattedTextField3;
|
||||
private JFormattedTextField formattedTextField4;
|
||||
private JFormattedTextField formattedTextField5;
|
||||
private JFormattedTextField formattedTextField6;
|
||||
private JLabel comboBoxLabel;
|
||||
private JComboBox<String> comboBox1;
|
||||
private JComboBox<String> comboBox2;
|
||||
private JComboBox<String> comboBox3;
|
||||
private JComboBox<String> comboBox4;
|
||||
private JComboBox<String> comboBox5;
|
||||
private JComboBox<String> comboBox6;
|
||||
private JComboBox<String> comboBox7;
|
||||
private JLabel spinnerLabel;
|
||||
private JSpinner spinner1;
|
||||
private JSpinner spinner2;
|
||||
private JSpinner spinner3;
|
||||
private JSpinner spinner4;
|
||||
private JSpinner spinner5;
|
||||
private JSpinner spinner6;
|
||||
private JScrollPane scrollPane1;
|
||||
private JTextArea textArea1;
|
||||
private JScrollPane scrollPane2;
|
||||
private JTextPane textPane1;
|
||||
private JScrollPane scrollPane3;
|
||||
private JEditorPane editorPane1;
|
||||
// JFormDesigner - End of variables declaration //GEN-END:variables
|
||||
}
|
||||
@@ -0,0 +1,327 @@
|
||||
JFDML JFormDesigner: "8.3" encoding: "UTF-8"
|
||||
|
||||
new FormModel {
|
||||
contentType: "form/swing"
|
||||
root: new FormRoot {
|
||||
add( new FormContainer( "com.formdev.flatlaf.testing.FlatTestPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
|
||||
"$layoutConstraints": "ltr,insets dialog,hidemode 3"
|
||||
"$columnConstraints": "[][100,sizegroup 1,fill][sizegroup 1,fill][sizegroup 1,fill][sizegroup 1,fill][sizegroup 1,fill][fill][fill]"
|
||||
"$rowConstraints": "[][][][][][fill][30]"
|
||||
} ) {
|
||||
name: "panel"
|
||||
add( new FormComponent( "javax.swing.JLabel" ) {
|
||||
name: "label1"
|
||||
"text": "default"
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 1 0"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JLabel" ) {
|
||||
name: "label2"
|
||||
"text": "never"
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 2 0"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JLabel" ) {
|
||||
name: "label3"
|
||||
"text": "once"
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 3 0"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JLabel" ) {
|
||||
name: "label4"
|
||||
"text": "always"
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 4 0"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JLabel" ) {
|
||||
name: "label5"
|
||||
"text": "once on click"
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 5 0"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JLabel" ) {
|
||||
name: "label6"
|
||||
"text": "always on click"
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 6 0"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JLabel" ) {
|
||||
name: "label7"
|
||||
"text": "custom selection"
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 7 0"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JLabel" ) {
|
||||
name: "textFieldLabel"
|
||||
"text": "JTextField:"
|
||||
"displayedMnemonic": 84
|
||||
"labelFor": new FormReference( "textField1" )
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 0 1"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JTextField" ) {
|
||||
name: "textField1"
|
||||
"text": "1234567890"
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 1 1"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JTextField" ) {
|
||||
name: "textField2"
|
||||
"text": "1234567890"
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 2 1"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JTextField" ) {
|
||||
name: "textField3"
|
||||
"text": "1234567890"
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 3 1"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JTextField" ) {
|
||||
name: "textField4"
|
||||
"text": "1234567890"
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 4 1"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JTextField" ) {
|
||||
name: "textField5"
|
||||
"text": "1234567890"
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 5 1"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JTextField" ) {
|
||||
name: "textField6"
|
||||
"text": "1234567890"
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 6 1"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JTextField" ) {
|
||||
name: "textField7"
|
||||
"text": "1234567890"
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 7 1"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JLabel" ) {
|
||||
name: "formattedTextFieldLabel"
|
||||
"text": "JFormattedTextField:"
|
||||
"displayedMnemonic": 70
|
||||
"labelFor": new FormReference( "formattedTextField1" )
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 0 2"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JFormattedTextField" ) {
|
||||
name: "formattedTextField1"
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 1 2"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JFormattedTextField" ) {
|
||||
name: "formattedTextField2"
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 2 2"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JFormattedTextField" ) {
|
||||
name: "formattedTextField3"
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 3 2"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JFormattedTextField" ) {
|
||||
name: "formattedTextField4"
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 4 2"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JFormattedTextField" ) {
|
||||
name: "formattedTextField5"
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 5 2"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JFormattedTextField" ) {
|
||||
name: "formattedTextField6"
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 6 2"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JLabel" ) {
|
||||
name: "comboBoxLabel"
|
||||
"text": "JComboBox:"
|
||||
"displayedMnemonic": 67
|
||||
"labelFor": new FormReference( "comboBox1" )
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 0 3"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JComboBox" ) {
|
||||
name: "comboBox1"
|
||||
"editable": true
|
||||
"model": new javax.swing.DefaultComboBoxModel {
|
||||
selectedItem: "1234567890"
|
||||
addElement( "1234567890" )
|
||||
}
|
||||
auxiliary() {
|
||||
"JavaCodeGenerator.typeParameters": "String"
|
||||
}
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 1 3"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JComboBox" ) {
|
||||
name: "comboBox2"
|
||||
"editable": true
|
||||
"model": new javax.swing.DefaultComboBoxModel {
|
||||
selectedItem: "1234567890"
|
||||
addElement( "1234567890" )
|
||||
}
|
||||
auxiliary() {
|
||||
"JavaCodeGenerator.typeParameters": "String"
|
||||
}
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 2 3"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JComboBox" ) {
|
||||
name: "comboBox3"
|
||||
"editable": true
|
||||
"model": new javax.swing.DefaultComboBoxModel {
|
||||
selectedItem: "1234567890"
|
||||
addElement( "1234567890" )
|
||||
}
|
||||
auxiliary() {
|
||||
"JavaCodeGenerator.typeParameters": "String"
|
||||
}
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 3 3"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JComboBox" ) {
|
||||
name: "comboBox4"
|
||||
"editable": true
|
||||
"model": new javax.swing.DefaultComboBoxModel {
|
||||
selectedItem: "1234567890"
|
||||
addElement( "1234567890" )
|
||||
}
|
||||
auxiliary() {
|
||||
"JavaCodeGenerator.typeParameters": "String"
|
||||
}
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 4 3"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JComboBox" ) {
|
||||
name: "comboBox5"
|
||||
"editable": true
|
||||
"model": &DefaultComboBoxModel0 new javax.swing.DefaultComboBoxModel {
|
||||
selectedItem: "1234567890"
|
||||
addElement( "1234567890" )
|
||||
}
|
||||
auxiliary() {
|
||||
"JavaCodeGenerator.typeParameters": "String"
|
||||
}
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 5 3"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JComboBox" ) {
|
||||
name: "comboBox6"
|
||||
"editable": true
|
||||
"model": #DefaultComboBoxModel0
|
||||
auxiliary() {
|
||||
"JavaCodeGenerator.typeParameters": "String"
|
||||
}
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 6 3"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JComboBox" ) {
|
||||
name: "comboBox7"
|
||||
"editable": true
|
||||
"model": #DefaultComboBoxModel0
|
||||
auxiliary() {
|
||||
"JavaCodeGenerator.typeParameters": "String"
|
||||
}
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 7 3"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JLabel" ) {
|
||||
name: "spinnerLabel"
|
||||
"text": "JSpinner:"
|
||||
"displayedMnemonic": 83
|
||||
"labelFor": new FormReference( "spinner1" )
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 0 4"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JSpinner" ) {
|
||||
name: "spinner1"
|
||||
"model": new javax.swing.SpinnerNumberModel {
|
||||
stepSize: 100
|
||||
value: 1234
|
||||
}
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 1 4"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JSpinner" ) {
|
||||
name: "spinner2"
|
||||
"model": new javax.swing.SpinnerNumberModel {
|
||||
stepSize: 100
|
||||
value: 1234
|
||||
}
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 2 4"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JSpinner" ) {
|
||||
name: "spinner3"
|
||||
"model": new javax.swing.SpinnerNumberModel {
|
||||
stepSize: 100
|
||||
value: 1234
|
||||
}
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 3 4"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JSpinner" ) {
|
||||
name: "spinner4"
|
||||
"model": new javax.swing.SpinnerNumberModel {
|
||||
stepSize: 100
|
||||
value: 1234
|
||||
}
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 4 4"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JSpinner" ) {
|
||||
name: "spinner5"
|
||||
"model": &SpinnerNumberModel0 new javax.swing.SpinnerNumberModel {
|
||||
stepSize: 100
|
||||
value: 1234
|
||||
}
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 5 4"
|
||||
} )
|
||||
add( new FormComponent( "javax.swing.JSpinner" ) {
|
||||
name: "spinner6"
|
||||
"model": #SpinnerNumberModel0
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 6 4"
|
||||
} )
|
||||
add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) {
|
||||
name: "scrollPane1"
|
||||
add( new FormComponent( "javax.swing.JTextArea" ) {
|
||||
name: "textArea1"
|
||||
"rows": 3
|
||||
"text": "1234567890\nabc"
|
||||
} )
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 1 5"
|
||||
} )
|
||||
add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) {
|
||||
name: "scrollPane2"
|
||||
add( new FormComponent( "javax.swing.JTextPane" ) {
|
||||
name: "textPane1"
|
||||
"text": "1234567890\nabc"
|
||||
} )
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 2 5"
|
||||
} )
|
||||
add( new FormContainer( "javax.swing.JScrollPane", new FormLayoutManager( class javax.swing.JScrollPane ) ) {
|
||||
name: "scrollPane3"
|
||||
add( new FormComponent( "javax.swing.JEditorPane" ) {
|
||||
name: "editorPane1"
|
||||
"text": "1234567890\nabc"
|
||||
} )
|
||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||
"value": "cell 3 5 2 1"
|
||||
} )
|
||||
}, new FormLayoutConstraints( null ) {
|
||||
"location": new java.awt.Point( 0, 0 )
|
||||
"size": new java.awt.Dimension( 995, 285 )
|
||||
} )
|
||||
}
|
||||
}
|
||||
@@ -106,9 +106,9 @@ public class UIDefaultsDump
|
||||
|
||||
dump( FlatMacLightLaf.class.getName(), dir, false );
|
||||
dump( FlatMacDarkLaf.class.getName(), dir, false );
|
||||
}
|
||||
|
||||
dump( FlatTestLaf.class.getName(), dir, false );
|
||||
dump( FlatTestLaf.class.getName(), dir, false );
|
||||
}
|
||||
|
||||
// dump( MyBasicLookAndFeel.class.getName(), dir, false );
|
||||
// dump( MetalLookAndFeel.class.getName(), dir, false );
|
||||
@@ -192,8 +192,11 @@ public class UIDefaultsDump
|
||||
dump( dir, "", lookAndFeel, defaults, key -> !key.contains( "InputMap" ), true );
|
||||
|
||||
if( lookAndFeel.getClass() == FlatLightLaf.class || !(lookAndFeel instanceof FlatLaf) ) {
|
||||
dump( dir, "_InputMap", lookAndFeel, defaults, key -> key.contains( "InputMap" ), false );
|
||||
dumpActionMaps( dir, "_ActionMap", lookAndFeel, defaults );
|
||||
if( SystemInfo.isWindows || SystemInfo.isMacOS )
|
||||
dump( dir, "_InputMap", lookAndFeel, defaults, key -> key.contains( "InputMap" ), false );
|
||||
|
||||
if( SystemInfo.isWindows )
|
||||
dumpActionMaps( dir, "_ActionMap", lookAndFeel, defaults );
|
||||
}
|
||||
|
||||
if( lookAndFeel instanceof IntelliJTheme.ThemeLaf ) {
|
||||
|
||||
@@ -463,6 +463,24 @@ TitlePane.foreground = #00f
|
||||
TitlePane.inactiveForeground = #fff
|
||||
TitlePane.borderColor = #f00
|
||||
|
||||
TitlePane.buttonBackground = #fff
|
||||
TitlePane.buttonForeground = #000
|
||||
TitlePane.buttonInactiveBackground = #ddd
|
||||
TitlePane.buttonInactiveForeground = #00f
|
||||
TitlePane.buttonHoverBackground = #bbb
|
||||
TitlePane.buttonHoverForeground = #0f0
|
||||
TitlePane.buttonPressedBackground = #999
|
||||
TitlePane.buttonPressedForeground = #f00
|
||||
|
||||
TitlePane.closeBackground = #f00
|
||||
TitlePane.closeForeground = #000
|
||||
TitlePane.closeInactiveBackground = #d00
|
||||
TitlePane.closeInactiveForeground = #0ff
|
||||
TitlePane.closeHoverBackground = #b00
|
||||
TitlePane.closeHoverForeground = #f0f
|
||||
TitlePane.closePressedBackground = #900
|
||||
TitlePane.closePressedForeground = #0f0
|
||||
|
||||
|
||||
#---- ToggleButton ----
|
||||
|
||||
|
||||
@@ -46,6 +46,9 @@ tasks {
|
||||
|
||||
if( JavaVersion.current() >= JavaVersion.VERSION_1_9 )
|
||||
attributes( "Multi-Release" to "true" )
|
||||
|
||||
// allow loading FlatLaf native library in Java 24+ (see https://openjdk.org/jeps/472)
|
||||
attributes( "Enable-Native-Access" to "ALL-UNNAMED" )
|
||||
}
|
||||
|
||||
exclude( "module-info.class" )
|
||||
|
||||
@@ -1066,17 +1066,32 @@ TipOfTheDay.icon.socketColor
|
||||
TipOfTheDay.tipAreaInsets
|
||||
TitlePane.background
|
||||
TitlePane.borderColor
|
||||
TitlePane.buttonArc
|
||||
TitlePane.buttonBackground
|
||||
TitlePane.buttonForeground
|
||||
TitlePane.buttonHoverBackground
|
||||
TitlePane.buttonHoverForeground
|
||||
TitlePane.buttonInactiveBackground
|
||||
TitlePane.buttonInactiveForeground
|
||||
TitlePane.buttonInsets
|
||||
TitlePane.buttonMaximizedHeight
|
||||
TitlePane.buttonMinimumWidth
|
||||
TitlePane.buttonPressedBackground
|
||||
TitlePane.buttonPressedForeground
|
||||
TitlePane.buttonSize
|
||||
TitlePane.buttonSymbolHeight
|
||||
TitlePane.buttonsFillVertically
|
||||
TitlePane.buttonsGap
|
||||
TitlePane.buttonsMargins
|
||||
TitlePane.centerTitle
|
||||
TitlePane.centerTitleIfMenuBarEmbedded
|
||||
TitlePane.closeBackground
|
||||
TitlePane.closeForeground
|
||||
TitlePane.closeHoverBackground
|
||||
TitlePane.closeHoverForeground
|
||||
TitlePane.closeIcon
|
||||
TitlePane.closeInactiveBackground
|
||||
TitlePane.closeInactiveForeground
|
||||
TitlePane.closePressedBackground
|
||||
TitlePane.closePressedForeground
|
||||
TitlePane.embeddedForeground
|
||||
@@ -1098,17 +1113,32 @@ TitlePane.showIcon
|
||||
TitlePane.showIconBesideTitle
|
||||
TitlePane.showIconInDialogs
|
||||
TitlePane.small.background
|
||||
TitlePane.small.buttonArc
|
||||
TitlePane.small.buttonBackground
|
||||
TitlePane.small.buttonForeground
|
||||
TitlePane.small.buttonHoverBackground
|
||||
TitlePane.small.buttonHoverForeground
|
||||
TitlePane.small.buttonInactiveBackground
|
||||
TitlePane.small.buttonInactiveForeground
|
||||
TitlePane.small.buttonInsets
|
||||
TitlePane.small.buttonMaximizedHeight
|
||||
TitlePane.small.buttonMinimumWidth
|
||||
TitlePane.small.buttonPressedBackground
|
||||
TitlePane.small.buttonPressedForeground
|
||||
TitlePane.small.buttonSize
|
||||
TitlePane.small.buttonSymbolHeight
|
||||
TitlePane.small.buttonsFillVertically
|
||||
TitlePane.small.buttonsGap
|
||||
TitlePane.small.buttonsMargins
|
||||
TitlePane.small.centerTitle
|
||||
TitlePane.small.centerTitleIfMenuBarEmbedded
|
||||
TitlePane.small.closeBackground
|
||||
TitlePane.small.closeForeground
|
||||
TitlePane.small.closeHoverBackground
|
||||
TitlePane.small.closeHoverForeground
|
||||
TitlePane.small.closeIcon
|
||||
TitlePane.small.closeInactiveBackground
|
||||
TitlePane.small.closeInactiveForeground
|
||||
TitlePane.small.closePressedBackground
|
||||
TitlePane.small.closePressedForeground
|
||||
TitlePane.small.embeddedForeground
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
# limitations under the License.
|
||||
#
|
||||
|
||||
flatlaf.releaseVersion = 3.5.4
|
||||
flatlaf.developmentVersion = 3.6-SNAPSHOT
|
||||
flatlaf.releaseVersion = 3.6
|
||||
flatlaf.developmentVersion = 3.7-SNAPSHOT
|
||||
|
||||
org.gradle.parallel = true
|
||||
# org.gradle.warning.mode = all
|
||||
|
||||
Reference in New Issue
Block a user