mirror of
https://github.com/JFormDesigner/FlatLaf.git
synced 2026-02-11 14:37:13 -06:00
Compare commits
17 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
95312c3650 | ||
|
|
9006e835c6 | ||
|
|
f801d61929 | ||
|
|
a143e5777c | ||
|
|
bf500e46e7 | ||
|
|
4a2f79f390 | ||
|
|
c24ce7c5bc | ||
|
|
8a6a0c7971 | ||
|
|
de6e5bd800 | ||
|
|
e18a04f9e6 | ||
|
|
14fc652f4b | ||
|
|
9a876e747a | ||
|
|
f8ee8b27fb | ||
|
|
ce1a1487aa | ||
|
|
fe1e364a1d | ||
|
|
eabb052107 | ||
|
|
734f3621f1 |
4
.github/workflows/natives.yml
vendored
4
.github/workflows/natives.yml
vendored
@@ -41,7 +41,9 @@ jobs:
|
|||||||
- name: Cache Gradle cache
|
- name: Cache Gradle cache
|
||||||
uses: actions/cache@v2
|
uses: actions/cache@v2
|
||||||
with:
|
with:
|
||||||
path: ~/.gradle/caches
|
path: |
|
||||||
|
~/.gradle/caches
|
||||||
|
!~/.gradle/caches/modules-2/modules-2.lock
|
||||||
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
|
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle.kts') }}
|
||||||
restore-keys: ${{ runner.os }}-gradle
|
restore-keys: ${{ runner.os }}-gradle
|
||||||
|
|
||||||
|
|||||||
28
CHANGELOG.md
28
CHANGELOG.md
@@ -1,6 +1,34 @@
|
|||||||
FlatLaf Change Log
|
FlatLaf Change Log
|
||||||
==================
|
==================
|
||||||
|
|
||||||
|
## 1.1.1
|
||||||
|
|
||||||
|
#### New features and improvements
|
||||||
|
|
||||||
|
- Native window decorations: Support disabling native window decorations per
|
||||||
|
window. (set client property `JRootPane.useWindowDecorations` to `false` on
|
||||||
|
root pane).
|
||||||
|
- Support running on WinPE. (issue #279)
|
||||||
|
|
||||||
|
#### Fixed bugs
|
||||||
|
|
||||||
|
- Native window decorations: Fixed missing animations when minimizing,
|
||||||
|
maximizing or restoring a window using window title bar buttons. (issue #282)
|
||||||
|
- Native window decorations: Fixed broken maximizing window when restoring frame
|
||||||
|
state at startup. (issue #283)
|
||||||
|
- Native window decorations: Fixed double window title bar when first disposing
|
||||||
|
a window with `frame.dispose()` and then showing it again with
|
||||||
|
`frame.setVisible(true)`. (issue #277)
|
||||||
|
- Custom window decorations: Fixed NPE in `FlatTitlePane.findHorizontalGlue()`.
|
||||||
|
(issue #275)
|
||||||
|
- Custom window decorations: Fixed right aligned progress bar in embedded menu
|
||||||
|
bar was overlapping window title. (issue #272)
|
||||||
|
- Fixed missing focus indicators in heavy-weight popups. (issue #273)
|
||||||
|
- InternalFrame: Fixed translucent internal frame menu bar background if
|
||||||
|
`TitlePane.unifiedBackground` is `true`. (issue #274)
|
||||||
|
- Extras: UI Inspector: Fixed `InaccessibleObjectException` when running in Java 16.
|
||||||
|
|
||||||
|
|
||||||
## 1.1
|
## 1.1
|
||||||
|
|
||||||
#### New features and improvements
|
#### New features and improvements
|
||||||
|
|||||||
@@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
val releaseVersion = "1.1"
|
val releaseVersion = "1.1.1"
|
||||||
val developmentVersion = "1.2-SNAPSHOT"
|
val developmentVersion = "1.2-SNAPSHOT"
|
||||||
|
|
||||||
version = if( java.lang.Boolean.getBoolean( "release" ) ) releaseVersion else developmentVersion
|
version = if( java.lang.Boolean.getBoolean( "release" ) ) releaseVersion else developmentVersion
|
||||||
|
|||||||
@@ -231,10 +231,28 @@ public interface FlatClientProperties
|
|||||||
|
|
||||||
//---- JRootPane ----------------------------------------------------------
|
//---- JRootPane ----------------------------------------------------------
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Specifies whether FlatLaf native window decorations should be used
|
||||||
|
* when creating {@code JFrame} or {@code JDialog}.
|
||||||
|
* <p>
|
||||||
|
* Setting this to {@code false} disables using FlatLaf native window decorations
|
||||||
|
* for the window that contains the root pane. Needs to be set before showing the window.
|
||||||
|
* <p>
|
||||||
|
* (requires Window 10)
|
||||||
|
* <p>
|
||||||
|
* <strong>Component</strong> {@link javax.swing.JRootPane}<br>
|
||||||
|
* <strong>Value type</strong> {@link java.lang.Boolean}
|
||||||
|
*
|
||||||
|
* @since 1.1.1
|
||||||
|
*/
|
||||||
|
String USE_WINDOW_DECORATIONS = "JRootPane.useWindowDecorations";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Specifies whether the menu bar is embedded into the title pane if custom
|
* Specifies whether the menu bar is embedded into the title pane if custom
|
||||||
* window decorations are enabled. Default is {@code true}.
|
* window decorations are enabled. Default is {@code true}.
|
||||||
* <p>
|
* <p>
|
||||||
|
* (requires Window 10)
|
||||||
|
* <p>
|
||||||
* <strong>Component</strong> {@link javax.swing.JRootPane}<br>
|
* <strong>Component</strong> {@link javax.swing.JRootPane}<br>
|
||||||
* <strong>Value type</strong> {@link java.lang.Boolean}
|
* <strong>Value type</strong> {@link java.lang.Boolean}
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -157,7 +157,7 @@ public abstract class FlatLaf
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public boolean getSupportsWindowDecorations() {
|
public boolean getSupportsWindowDecorations() {
|
||||||
if( SystemInfo.isProjector )
|
if( SystemInfo.isProjector || SystemInfo.isWinPE )
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
if( SystemInfo.isWindows_10_orLater &&
|
if( SystemInfo.isWindows_10_orLater &&
|
||||||
@@ -377,6 +377,12 @@ public abstract class FlatLaf
|
|||||||
initIconColors( defaults, isDark() );
|
initIconColors( defaults, isDark() );
|
||||||
FlatInputMaps.initInputMaps( defaults );
|
FlatInputMaps.initInputMaps( defaults );
|
||||||
|
|
||||||
|
// copy InternalFrame.icon (the Java cup) to TitlePane.icon
|
||||||
|
// (using defaults.remove() to avoid that lazy value is resolved and icon loaded here)
|
||||||
|
Object icon = defaults.remove( "InternalFrame.icon" );
|
||||||
|
defaults.put( "InternalFrame.icon", icon );
|
||||||
|
defaults.put( "TitlePane.icon", icon );
|
||||||
|
|
||||||
// get addons and sort them by priority
|
// get addons and sort them by priority
|
||||||
ServiceLoader<FlatDefaultsAddon> addonLoader = ServiceLoader.load( FlatDefaultsAddon.class );
|
ServiceLoader<FlatDefaultsAddon> addonLoader = ServiceLoader.load( FlatDefaultsAddon.class );
|
||||||
List<FlatDefaultsAddon> addons = new ArrayList<>();
|
List<FlatDefaultsAddon> addons = new ArrayList<>();
|
||||||
@@ -437,7 +443,10 @@ public abstract class FlatLaf
|
|||||||
FontUIResource uiFont = null;
|
FontUIResource uiFont = null;
|
||||||
|
|
||||||
if( SystemInfo.isWindows ) {
|
if( SystemInfo.isWindows ) {
|
||||||
Font winFont = (Font) Toolkit.getDefaultToolkit().getDesktopProperty( "win.messagebox.font" );
|
// on WinPE use "win.defaultGUI.font", which is usually Tahoma,
|
||||||
|
// because Segoe UI font is not available on WinPE
|
||||||
|
Font winFont = (Font) Toolkit.getDefaultToolkit().getDesktopProperty(
|
||||||
|
SystemInfo.isWinPE ? "win.defaultGUI.font" : "win.messagebox.font" );
|
||||||
if( winFont != null )
|
if( winFont != null )
|
||||||
uiFont = createCompositeFont( winFont.getFamily(), winFont.getStyle(), winFont.getSize() );
|
uiFont = createCompositeFont( winFont.getFamily(), winFont.getStyle(), winFont.getSize() );
|
||||||
|
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ import java.awt.event.WindowEvent;
|
|||||||
import java.awt.event.WindowListener;
|
import java.awt.event.WindowListener;
|
||||||
import java.lang.ref.WeakReference;
|
import java.lang.ref.WeakReference;
|
||||||
import javax.swing.AbstractButton;
|
import javax.swing.AbstractButton;
|
||||||
|
import javax.swing.JDialog;
|
||||||
import javax.swing.JFrame;
|
import javax.swing.JFrame;
|
||||||
import javax.swing.JLabel;
|
import javax.swing.JLabel;
|
||||||
import javax.swing.JMenu;
|
import javax.swing.JMenu;
|
||||||
@@ -137,10 +138,17 @@ class MnemonicHandler
|
|||||||
// get menu bar and first menu
|
// get menu bar and first menu
|
||||||
Component c = e.getComponent();
|
Component c = e.getComponent();
|
||||||
JRootPane rootPane = SwingUtilities.getRootPane( c );
|
JRootPane rootPane = SwingUtilities.getRootPane( c );
|
||||||
Window window = (rootPane != null) ? SwingUtilities.getWindowAncestor( rootPane ) : null;
|
|
||||||
JMenuBar menuBar = (rootPane != null) ? rootPane.getJMenuBar() : null;
|
JMenuBar menuBar = (rootPane != null) ? rootPane.getJMenuBar() : null;
|
||||||
if( menuBar == null && window instanceof JFrame )
|
if( menuBar == null ) {
|
||||||
|
// get menu bar from frame/dialog because there
|
||||||
|
// may be multiple nested root panes in a frame/dialog
|
||||||
|
// (e.g. each internal frame has its own root pane)
|
||||||
|
Window window = SwingUtilities.getWindowAncestor( c );
|
||||||
|
if( window instanceof JFrame )
|
||||||
menuBar = ((JFrame)window).getJMenuBar();
|
menuBar = ((JFrame)window).getJMenuBar();
|
||||||
|
else if( window instanceof JDialog )
|
||||||
|
menuBar = ((JDialog)window).getJMenuBar();
|
||||||
|
}
|
||||||
JMenu firstMenu = (menuBar != null) ? menuBar.getMenu( 0 ) : null;
|
JMenu firstMenu = (menuBar != null) ? menuBar.getMenu( 0 ) : null;
|
||||||
|
|
||||||
// select first menu and show mnemonics
|
// select first menu and show mnemonics
|
||||||
|
|||||||
@@ -17,6 +17,7 @@
|
|||||||
package com.formdev.flatlaf.ui;
|
package com.formdev.flatlaf.ui;
|
||||||
|
|
||||||
import java.awt.Graphics;
|
import java.awt.Graphics;
|
||||||
|
import java.awt.Window;
|
||||||
import java.awt.event.ActionEvent;
|
import java.awt.event.ActionEvent;
|
||||||
import javax.swing.AbstractAction;
|
import javax.swing.AbstractAction;
|
||||||
import javax.swing.ActionMap;
|
import javax.swing.ActionMap;
|
||||||
@@ -86,7 +87,7 @@ public class FlatMenuBarUI
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void update( Graphics g, JComponent c ) {
|
public void update( Graphics g, JComponent c ) {
|
||||||
// do not fill background if menubar is embedded into title pane
|
// paint background
|
||||||
if( isFillBackground( c ) ) {
|
if( isFillBackground( c ) ) {
|
||||||
g.setColor( c.getBackground() );
|
g.setColor( c.getBackground() );
|
||||||
g.fillRect( 0, 0, c.getWidth(), c.getHeight() );
|
g.fillRect( 0, 0, c.getWidth(), c.getHeight() );
|
||||||
@@ -96,21 +97,25 @@ public class FlatMenuBarUI
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected boolean isFillBackground( JComponent c ) {
|
protected boolean isFillBackground( JComponent c ) {
|
||||||
// paint background in opaque or having custom background color
|
// paint background if opaque or if having custom background color
|
||||||
if( c.isOpaque() || !(c.getBackground() instanceof UIResource) )
|
if( c.isOpaque() || !(c.getBackground() instanceof UIResource) )
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
|
// paint background if menu bar is not the "main" menu bar
|
||||||
|
JRootPane rootPane = SwingUtilities.getRootPane( c );
|
||||||
|
if( rootPane == null || !(rootPane.getParent() instanceof Window) || rootPane.getJMenuBar() != c )
|
||||||
|
return true;
|
||||||
|
|
||||||
// do not paint background for unified title pane
|
// do not paint background for unified title pane
|
||||||
if( unifiedBackground )
|
if( unifiedBackground )
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
// paint background in full screen mode
|
// paint background in full screen mode
|
||||||
JRootPane rootPane = SwingUtilities.getRootPane( c );
|
if( FlatUIUtils.isFullScreen( rootPane ) )
|
||||||
if( rootPane == null || FlatUIUtils.isFullScreen( rootPane ) )
|
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
// do not paint background if menu bar is embedded into title pane
|
// do not paint background if menu bar is embedded into title pane
|
||||||
return rootPane.getJMenuBar() != c || !FlatRootPaneUI.isMenuBarEmbedded( rootPane );
|
return !FlatRootPaneUI.isMenuBarEmbedded( rootPane );
|
||||||
}
|
}
|
||||||
|
|
||||||
//---- class TakeFocus ----------------------------------------------------
|
//---- class TakeFocus ----------------------------------------------------
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ import javax.swing.JRootPane;
|
|||||||
import javax.swing.SwingUtilities;
|
import javax.swing.SwingUtilities;
|
||||||
import javax.swing.UIManager;
|
import javax.swing.UIManager;
|
||||||
import javax.swing.event.ChangeListener;
|
import javax.swing.event.ChangeListener;
|
||||||
|
import com.formdev.flatlaf.FlatClientProperties;
|
||||||
import com.formdev.flatlaf.FlatLaf;
|
import com.formdev.flatlaf.FlatLaf;
|
||||||
import com.formdev.flatlaf.FlatSystemProperties;
|
import com.formdev.flatlaf.FlatSystemProperties;
|
||||||
import com.formdev.flatlaf.ui.JBRCustomDecorations.JBRWindowTopBorder;
|
import com.formdev.flatlaf.ui.JBRCustomDecorations.JBRWindowTopBorder;
|
||||||
@@ -62,20 +63,20 @@ public class FlatNativeWindowBorder
|
|||||||
if( !isSupported() )
|
if( !isSupported() )
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
// Check whether root pane already has a window, which is the case when switching LaF.
|
// Check whether root pane already has a window, which is the case when
|
||||||
|
// switching from another LaF to FlatLaf.
|
||||||
// Also check whether the window is displayable, which is required to install
|
// Also check whether the window is displayable, which is required to install
|
||||||
// FlatLaf native window border.
|
// FlatLaf native window border.
|
||||||
// If the window is not displayable, then it was probably closed/disposed but not yet removed
|
// If the window is not displayable, then it was probably closed/disposed but not yet removed
|
||||||
// from the list of windows that AWT maintains and returns with Window.getWindows().
|
// from the list of windows that AWT maintains and returns with Window.getWindows().
|
||||||
// It could be also be a window that is currently hidden, but may be shown later.
|
// It could be also be a window that is currently hidden, but may be shown later.
|
||||||
Window window = SwingUtilities.windowForComponent( rootPane );
|
Window window = SwingUtilities.windowForComponent( rootPane );
|
||||||
if( window != null && window.isDisplayable() ) {
|
if( window != null && window.isDisplayable() )
|
||||||
install( window, FlatSystemProperties.USE_WINDOW_DECORATIONS );
|
install( window, FlatSystemProperties.USE_WINDOW_DECORATIONS );
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Install FlatLaf native window border, which must be done late,
|
// Install FlatLaf native window border, which must be done late,
|
||||||
// when the native window is already created, because it needs access to the window.
|
// when the native window is already created, because it needs access to the window.
|
||||||
|
// Uninstall FlatLaf native window border when window is disposed (or root pane removed).
|
||||||
// "ancestor" property change event is fired from JComponent.addNotify() and removeNotify().
|
// "ancestor" property change event is fired from JComponent.addNotify() and removeNotify().
|
||||||
PropertyChangeListener ancestorListener = e -> {
|
PropertyChangeListener ancestorListener = e -> {
|
||||||
Object newValue = e.getNewValue();
|
Object newValue = e.getNewValue();
|
||||||
@@ -99,6 +100,10 @@ public class FlatNativeWindowBorder
|
|||||||
if( window instanceof JFrame ) {
|
if( window instanceof JFrame ) {
|
||||||
JFrame frame = (JFrame) window;
|
JFrame frame = (JFrame) window;
|
||||||
|
|
||||||
|
// check whether disabled via client property
|
||||||
|
if( !FlatClientProperties.clientPropertyBoolean( frame.getRootPane(), FlatClientProperties.USE_WINDOW_DECORATIONS, true ) )
|
||||||
|
return;
|
||||||
|
|
||||||
// do not enable native window border if JFrame should use system window decorations
|
// do not enable native window border if JFrame should use system window decorations
|
||||||
// and if not forced to use FlatLaf/JBR native window decorations
|
// and if not forced to use FlatLaf/JBR native window decorations
|
||||||
if( !JFrame.isDefaultLookAndFeelDecorated() &&
|
if( !JFrame.isDefaultLookAndFeelDecorated() &&
|
||||||
@@ -119,6 +124,10 @@ public class FlatNativeWindowBorder
|
|||||||
} else if( window instanceof JDialog ) {
|
} else if( window instanceof JDialog ) {
|
||||||
JDialog dialog = (JDialog) window;
|
JDialog dialog = (JDialog) window;
|
||||||
|
|
||||||
|
// check whether disabled via client property
|
||||||
|
if( !FlatClientProperties.clientPropertyBoolean( dialog.getRootPane(), FlatClientProperties.USE_WINDOW_DECORATIONS, true ) )
|
||||||
|
return;
|
||||||
|
|
||||||
// do not enable native window border if JDialog should use system window decorations
|
// do not enable native window border if JDialog should use system window decorations
|
||||||
// and if not forced to use FlatLaf/JBR native window decorations
|
// and if not forced to use FlatLaf/JBR native window decorations
|
||||||
if( !JDialog.isDefaultLookAndFeelDecorated() &&
|
if( !JDialog.isDefaultLookAndFeelDecorated() &&
|
||||||
@@ -148,7 +157,11 @@ public class FlatNativeWindowBorder
|
|||||||
if( data instanceof PropertyChangeListener )
|
if( data instanceof PropertyChangeListener )
|
||||||
rootPane.removePropertyChangeListener( "ancestor", (PropertyChangeListener) data );
|
rootPane.removePropertyChangeListener( "ancestor", (PropertyChangeListener) data );
|
||||||
|
|
||||||
// uninstall native window border, except when switching to another FlatLaf theme
|
// do not uninstall when switching to another FlatLaf theme
|
||||||
|
if( UIManager.getLookAndFeel() instanceof FlatLaf )
|
||||||
|
return;
|
||||||
|
|
||||||
|
// uninstall native window border
|
||||||
Window window = SwingUtilities.windowForComponent( rootPane );
|
Window window = SwingUtilities.windowForComponent( rootPane );
|
||||||
if( window != null )
|
if( window != null )
|
||||||
uninstall( window );
|
uninstall( window );
|
||||||
@@ -158,10 +171,6 @@ public class FlatNativeWindowBorder
|
|||||||
if( !hasCustomDecoration( window ) )
|
if( !hasCustomDecoration( window ) )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// do not uninstall when switching to another FlatLaf theme
|
|
||||||
if( UIManager.getLookAndFeel() instanceof FlatLaf )
|
|
||||||
return;
|
|
||||||
|
|
||||||
// disable native window border for window
|
// disable native window border for window
|
||||||
setHasCustomDecoration( window, false );
|
setHasCustomDecoration( window, false );
|
||||||
|
|
||||||
@@ -217,6 +226,13 @@ public class FlatNativeWindowBorder
|
|||||||
nativeProvider.setTitleBarAppIconBounds( window, appIconBounds );
|
nativeProvider.setTitleBarAppIconBounds( window, appIconBounds );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static boolean showWindow( Window window, int cmd ) {
|
||||||
|
if( canUseJBRCustomDecorations || !isSupported() )
|
||||||
|
return false;
|
||||||
|
|
||||||
|
return nativeProvider.showWindow( window, cmd );
|
||||||
|
}
|
||||||
|
|
||||||
private static void initialize() {
|
private static void initialize() {
|
||||||
if( supported != null )
|
if( supported != null )
|
||||||
return;
|
return;
|
||||||
@@ -226,8 +242,8 @@ public class FlatNativeWindowBorder
|
|||||||
if( !SystemInfo.isWindows_10_orLater )
|
if( !SystemInfo.isWindows_10_orLater )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// do not use when running in JetBrains Projector
|
// do not use when running in JetBrains Projector or WinPE
|
||||||
if( SystemInfo.isProjector )
|
if( SystemInfo.isProjector || SystemInfo.isWinPE )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// check whether disabled via system property
|
// check whether disabled via system property
|
||||||
@@ -238,16 +254,25 @@ public class FlatNativeWindowBorder
|
|||||||
/*
|
/*
|
||||||
Class<?> cls = Class.forName( "com.formdev.flatlaf.natives.jna.windows.FlatWindowsNativeWindowBorder" );
|
Class<?> cls = Class.forName( "com.formdev.flatlaf.natives.jna.windows.FlatWindowsNativeWindowBorder" );
|
||||||
Method m = cls.getMethod( "getInstance" );
|
Method m = cls.getMethod( "getInstance" );
|
||||||
nativeProvider = (Provider) m.invoke( null );
|
setNativeProvider( (Provider) m.invoke( null ) );
|
||||||
*/
|
*/
|
||||||
nativeProvider = FlatWindowsNativeWindowBorder.getInstance();
|
setNativeProvider( FlatWindowsNativeWindowBorder.getInstance() );
|
||||||
|
|
||||||
supported = (nativeProvider != null);
|
|
||||||
} catch( Exception ex ) {
|
} catch( Exception ex ) {
|
||||||
// ignore
|
// ignore
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @since 1.1.1
|
||||||
|
*/
|
||||||
|
public static void setNativeProvider( Provider provider ) {
|
||||||
|
if( nativeProvider != null )
|
||||||
|
throw new IllegalStateException();
|
||||||
|
|
||||||
|
nativeProvider = provider;
|
||||||
|
supported = (nativeProvider != null);
|
||||||
|
}
|
||||||
|
|
||||||
//---- interface Provider -------------------------------------------------
|
//---- interface Provider -------------------------------------------------
|
||||||
|
|
||||||
public interface Provider
|
public interface Provider
|
||||||
@@ -258,6 +283,13 @@ public class FlatNativeWindowBorder
|
|||||||
void setTitleBarHitTestSpots( Window window, List<Rectangle> hitTestSpots );
|
void setTitleBarHitTestSpots( Window window, List<Rectangle> hitTestSpots );
|
||||||
void setTitleBarAppIconBounds( Window window, Rectangle appIconBounds );
|
void setTitleBarAppIconBounds( Window window, Rectangle appIconBounds );
|
||||||
|
|
||||||
|
// commands for showWindow(); values must match Win32 API
|
||||||
|
// https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-showwindow
|
||||||
|
int SW_MAXIMIZE = 3;
|
||||||
|
int SW_MINIMIZE = 6;
|
||||||
|
int SW_RESTORE = 9;
|
||||||
|
boolean showWindow( Window window, int cmd );
|
||||||
|
|
||||||
boolean isColorizationColorAffectsBorders();
|
boolean isColorizationColorAffectsBorders();
|
||||||
Color getColorizationColor();
|
Color getColorizationColor();
|
||||||
int getColorizationColorBalance();
|
int getColorizationColorBalance();
|
||||||
|
|||||||
@@ -431,7 +431,9 @@ public class FlatRootPaneUI
|
|||||||
(parent instanceof JFrame &&
|
(parent instanceof JFrame &&
|
||||||
(((JFrame)parent).getJMenuBar() == null ||
|
(((JFrame)parent).getJMenuBar() == null ||
|
||||||
!((JFrame)parent).getJMenuBar().isVisible())) ||
|
!((JFrame)parent).getJMenuBar().isVisible())) ||
|
||||||
parent instanceof JDialog;
|
(parent instanceof JDialog &&
|
||||||
|
(((JDialog)parent).getJMenuBar() == null ||
|
||||||
|
!((JDialog)parent).getJMenuBar().isVisible()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -87,6 +87,7 @@ import com.formdev.flatlaf.util.UIScale;
|
|||||||
* @uiDefault TitlePane.centerTitle boolean
|
* @uiDefault TitlePane.centerTitle boolean
|
||||||
* @uiDefault TitlePane.centerTitleIfMenuBarEmbedded boolean
|
* @uiDefault TitlePane.centerTitleIfMenuBarEmbedded boolean
|
||||||
* @uiDefault TitlePane.menuBarTitleGap int
|
* @uiDefault TitlePane.menuBarTitleGap int
|
||||||
|
* @uiDefault TitlePane.icon Icon
|
||||||
* @uiDefault TitlePane.closeIcon Icon
|
* @uiDefault TitlePane.closeIcon Icon
|
||||||
* @uiDefault TitlePane.iconifyIcon Icon
|
* @uiDefault TitlePane.iconifyIcon Icon
|
||||||
* @uiDefault TitlePane.maximizeIcon Icon
|
* @uiDefault TitlePane.maximizeIcon Icon
|
||||||
@@ -197,14 +198,16 @@ public class FlatTitlePane
|
|||||||
}
|
}
|
||||||
|
|
||||||
// If menu bar is embedded and contains a horizontal glue component,
|
// If menu bar is embedded and contains a horizontal glue component,
|
||||||
// then move the title label to the same location as the glue component.
|
// then move the title label to the same location as the glue component
|
||||||
|
// and give it the same width.
|
||||||
// This allows placing any component on the trailing side of the title pane.
|
// This allows placing any component on the trailing side of the title pane.
|
||||||
JMenuBar menuBar = rootPane.getJMenuBar();
|
JMenuBar menuBar = rootPane.getJMenuBar();
|
||||||
if( hasVisibleEmbeddedMenuBar( menuBar ) ) {
|
if( hasVisibleEmbeddedMenuBar( menuBar ) ) {
|
||||||
Component horizontalGlue = findHorizontalGlue( menuBar );
|
Component horizontalGlue = findHorizontalGlue( menuBar );
|
||||||
if( horizontalGlue != null ) {
|
if( horizontalGlue != null ) {
|
||||||
Point glueLocation = SwingUtilities.convertPoint( horizontalGlue, 0, 0, titleLabel );
|
Point glueLocation = SwingUtilities.convertPoint( horizontalGlue, 0, 0, titleLabel );
|
||||||
titleLabel.setLocation( titleLabel.getX() + glueLocation.x, titleLabel.getY() );
|
titleLabel.setBounds( titleLabel.getX() + glueLocation.x, titleLabel.getY(),
|
||||||
|
horizontalGlue.getWidth(), titleLabel.getHeight() );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -344,7 +347,7 @@ public class FlatTitlePane
|
|||||||
iconLabel.setIcon( FlatTitlePaneIcon.create( images, iconSize ) );
|
iconLabel.setIcon( FlatTitlePaneIcon.create( images, iconSize ) );
|
||||||
else {
|
else {
|
||||||
// no icon set on window --> use default icon
|
// no icon set on window --> use default icon
|
||||||
Icon defaultIcon = UIManager.getIcon( "InternalFrame.icon" );
|
Icon defaultIcon = UIManager.getIcon( "TitlePane.icon" );
|
||||||
if( defaultIcon != null && (defaultIcon.getIconWidth() == 0 || defaultIcon.getIconHeight() == 0) )
|
if( defaultIcon != null && (defaultIcon.getIconWidth() == 0 || defaultIcon.getIconHeight() == 0) )
|
||||||
defaultIcon = null;
|
defaultIcon = null;
|
||||||
if( defaultIcon != null ) {
|
if( defaultIcon != null ) {
|
||||||
@@ -450,9 +453,13 @@ public class FlatTitlePane
|
|||||||
// This allows placing any component on the trailing side of the title pane.
|
// This allows placing any component on the trailing side of the title pane.
|
||||||
Component horizontalGlue = findHorizontalGlue( rootPane.getJMenuBar() );
|
Component horizontalGlue = findHorizontalGlue( rootPane.getJMenuBar() );
|
||||||
if( horizontalGlue != null ) {
|
if( horizontalGlue != null ) {
|
||||||
int titleWidth = Math.max( titleLabel.getWidth(), 0 ); // title width may be negative
|
boolean leftToRight = getComponentOrientation().isLeftToRight();
|
||||||
|
int titleWidth = leftToRight
|
||||||
|
? buttonPanel.getX() - (leftPanel.getX() + leftPanel.getWidth())
|
||||||
|
: leftPanel.getX() - (buttonPanel.getX() + buttonPanel.getWidth());
|
||||||
|
titleWidth = Math.max( titleWidth, 0 ); // title width may be negative
|
||||||
bounds.width += titleWidth;
|
bounds.width += titleWidth;
|
||||||
if( !getComponentOrientation().isLeftToRight() )
|
if( !leftToRight )
|
||||||
bounds.x -= titleWidth;
|
bounds.x -= titleWidth;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -460,6 +467,9 @@ public class FlatTitlePane
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected Component findHorizontalGlue( JMenuBar menuBar ) {
|
protected Component findHorizontalGlue( JMenuBar menuBar ) {
|
||||||
|
if( menuBar == null )
|
||||||
|
return null;
|
||||||
|
|
||||||
int count = menuBar.getComponentCount();
|
int count = menuBar.getComponentCount();
|
||||||
for( int i = count - 1; i >= 0; i-- ) {
|
for( int i = count - 1; i >= 0; i-- ) {
|
||||||
Component c = menuBar.getComponent( i );
|
Component c = menuBar.getComponent( i );
|
||||||
@@ -533,11 +543,13 @@ debug*/
|
|||||||
* Iconifies the window.
|
* Iconifies the window.
|
||||||
*/
|
*/
|
||||||
protected void iconify() {
|
protected void iconify() {
|
||||||
if( window instanceof Frame ) {
|
if( !(window instanceof Frame) )
|
||||||
|
return;
|
||||||
|
|
||||||
Frame frame = (Frame) window;
|
Frame frame = (Frame) window;
|
||||||
|
if( !FlatNativeWindowBorder.showWindow( window, FlatNativeWindowBorder.Provider.SW_MINIMIZE ) )
|
||||||
frame.setExtendedState( frame.getExtendedState() | Frame.ICONIFIED );
|
frame.setExtendedState( frame.getExtendedState() | Frame.ICONIFIED );
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Maximizes the window.
|
* Maximizes the window.
|
||||||
@@ -554,6 +566,7 @@ debug*/
|
|||||||
rootPane.putClientProperty( "_flatlaf.maximizedBoundsUpToDate", true );
|
rootPane.putClientProperty( "_flatlaf.maximizedBoundsUpToDate", true );
|
||||||
|
|
||||||
// maximize window
|
// maximize window
|
||||||
|
if( !FlatNativeWindowBorder.showWindow( frame, FlatNativeWindowBorder.Provider.SW_MAXIMIZE ) )
|
||||||
frame.setExtendedState( frame.getExtendedState() | Frame.MAXIMIZED_BOTH );
|
frame.setExtendedState( frame.getExtendedState() | Frame.MAXIMIZED_BOTH );
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -642,8 +655,11 @@ debug*/
|
|||||||
* Restores the window size.
|
* Restores the window size.
|
||||||
*/
|
*/
|
||||||
protected void restore() {
|
protected void restore() {
|
||||||
if( window instanceof Frame ) {
|
if( !(window instanceof Frame) )
|
||||||
|
return;
|
||||||
|
|
||||||
Frame frame = (Frame) window;
|
Frame frame = (Frame) window;
|
||||||
|
if( !FlatNativeWindowBorder.showWindow( window, FlatNativeWindowBorder.Provider.SW_RESTORE ) ) {
|
||||||
int state = frame.getExtendedState();
|
int state = frame.getExtendedState();
|
||||||
frame.setExtendedState( ((state & Frame.ICONIFIED) != 0)
|
frame.setExtendedState( ((state & Frame.ICONIFIED) != 0)
|
||||||
? (state & ~Frame.ICONIFIED)
|
? (state & ~Frame.ICONIFIED)
|
||||||
@@ -710,9 +726,11 @@ debug*/
|
|||||||
if( r != null )
|
if( r != null )
|
||||||
hitTestSpots.add( r );
|
hitTestSpots.add( r );
|
||||||
|
|
||||||
|
JMenuBar menuBar = rootPane.getJMenuBar();
|
||||||
|
if( hasVisibleEmbeddedMenuBar( menuBar ) ) {
|
||||||
r = getNativeHitTestSpot( menuBarPlaceholder );
|
r = getNativeHitTestSpot( menuBarPlaceholder );
|
||||||
if( r != null ) {
|
if( r != null ) {
|
||||||
Component horizontalGlue = findHorizontalGlue( rootPane.getJMenuBar() );
|
Component horizontalGlue = findHorizontalGlue( menuBar );
|
||||||
if( horizontalGlue != null ) {
|
if( horizontalGlue != null ) {
|
||||||
// If menu bar is embedded and contains a horizontal glue component,
|
// If menu bar is embedded and contains a horizontal glue component,
|
||||||
// then split the hit test spot into two spots so that
|
// then split the hit test spot into two spots so that
|
||||||
@@ -736,6 +754,7 @@ debug*/
|
|||||||
|
|
||||||
hitTestSpots.add( r );
|
hitTestSpots.add( r );
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
FlatNativeWindowBorder.setTitleBarHeightAndHitTestSpots( window, titleBarHeight, hitTestSpots, appIconBounds );
|
FlatNativeWindowBorder.setTitleBarHeightAndHitTestSpots( window, titleBarHeight, hitTestSpots, appIconBounds );
|
||||||
|
|
||||||
|
|||||||
@@ -185,7 +185,8 @@ public class FlatUIUtils
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns whether the given component is the permanent focus owner and
|
* Returns whether the given component is the permanent focus owner and
|
||||||
* is in the active window. Used to paint focus indicators.
|
* is in the active window or in a popup window owned by the active window.
|
||||||
|
* Used to paint focus indicators.
|
||||||
*/
|
*/
|
||||||
@SuppressWarnings( "unchecked" )
|
@SuppressWarnings( "unchecked" )
|
||||||
public static boolean isPermanentFocusOwner( Component c ) {
|
public static boolean isPermanentFocusOwner( Component c ) {
|
||||||
@@ -195,12 +196,18 @@ public class FlatUIUtils
|
|||||||
Object value = ((JComponent)c).getClientProperty( FlatClientProperties.COMPONENT_FOCUS_OWNER );
|
Object value = ((JComponent)c).getClientProperty( FlatClientProperties.COMPONENT_FOCUS_OWNER );
|
||||||
if( value instanceof Predicate ) {
|
if( value instanceof Predicate ) {
|
||||||
return ((Predicate<JComponent>)value).test( (JComponent) c ) &&
|
return ((Predicate<JComponent>)value).test( (JComponent) c ) &&
|
||||||
keyboardFocusManager.getActiveWindow() == SwingUtilities.windowForComponent( c );
|
isInActiveWindow( c, keyboardFocusManager.getActiveWindow() );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return keyboardFocusManager.getPermanentFocusOwner() == c &&
|
return keyboardFocusManager.getPermanentFocusOwner() == c &&
|
||||||
keyboardFocusManager.getActiveWindow() == SwingUtilities.windowForComponent( c );
|
isInActiveWindow( c, keyboardFocusManager.getActiveWindow() );
|
||||||
|
}
|
||||||
|
|
||||||
|
private static boolean isInActiveWindow( Component c, Window activeWindow ) {
|
||||||
|
Window window = SwingUtilities.windowForComponent( c );
|
||||||
|
return window == activeWindow ||
|
||||||
|
(window != null && window.getType() == Window.Type.POPUP && window.getOwner() == activeWindow);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -197,6 +197,16 @@ class FlatWindowsNativeWindowBorder
|
|||||||
wndProc.appIconBounds = (appIconBounds != null) ? new Rectangle( appIconBounds ) : null;
|
wndProc.appIconBounds = (appIconBounds != null) ? new Rectangle( appIconBounds ) : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean showWindow( Window window, int cmd ) {
|
||||||
|
WndProc wndProc = windowsMap.get( window );
|
||||||
|
if( wndProc == null )
|
||||||
|
return false;
|
||||||
|
|
||||||
|
wndProc.showWindow( wndProc.hwnd, cmd );
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isColorizationColorAffectsBorders() {
|
public boolean isColorizationColorAffectsBorders() {
|
||||||
updateColorization();
|
updateColorization();
|
||||||
@@ -299,6 +309,18 @@ class FlatWindowsNativeWindowBorder
|
|||||||
this.window = window;
|
this.window = window;
|
||||||
|
|
||||||
hwnd = installImpl( window );
|
hwnd = installImpl( window );
|
||||||
|
|
||||||
|
// remove the OS window title bar
|
||||||
|
if( window instanceof JFrame && ((JFrame)window).getExtendedState() != 0 ) {
|
||||||
|
// In case that the frame should be maximized or minimized immediately
|
||||||
|
// when showing, then it is necessary to defer ::SetWindowPos() invocation.
|
||||||
|
// Otherwise the frame will not be maximized or minimized.
|
||||||
|
// This occurs only if frame.pack() was no invoked.
|
||||||
|
EventQueue.invokeLater( () -> {
|
||||||
|
updateFrame( hwnd );
|
||||||
|
});
|
||||||
|
} else
|
||||||
|
updateFrame( hwnd );
|
||||||
}
|
}
|
||||||
|
|
||||||
void uninstall() {
|
void uninstall() {
|
||||||
@@ -310,6 +332,8 @@ class FlatWindowsNativeWindowBorder
|
|||||||
|
|
||||||
private native long installImpl( Window window );
|
private native long installImpl( Window window );
|
||||||
private native void uninstallImpl( long hwnd );
|
private native void uninstallImpl( long hwnd );
|
||||||
|
private native void updateFrame( long hwnd );
|
||||||
|
private native void showWindow( long hwnd, int cmd );
|
||||||
|
|
||||||
// invoked from native code
|
// invoked from native code
|
||||||
private int onNcHitTest( int x, int y, boolean isOnResizeBorder ) {
|
private int onNcHitTest( int x, int y, boolean isOnResizeBorder ) {
|
||||||
|
|||||||
@@ -56,6 +56,7 @@ public class SystemInfo
|
|||||||
|
|
||||||
// other
|
// other
|
||||||
/** @since 1.1 */ public static final boolean isProjector;
|
/** @since 1.1 */ public static final boolean isProjector;
|
||||||
|
/** @since 1.1.1 */ public static final boolean isWinPE;
|
||||||
|
|
||||||
static {
|
static {
|
||||||
// platforms
|
// platforms
|
||||||
@@ -91,6 +92,7 @@ public class SystemInfo
|
|||||||
|
|
||||||
// other
|
// other
|
||||||
isProjector = Boolean.getBoolean( "org.jetbrains.projector.server.enable" );
|
isProjector = Boolean.getBoolean( "org.jetbrains.projector.server.enable" );
|
||||||
|
isWinPE = isWindows && "X:\\Windows\\System32".equalsIgnoreCase( System.getProperty( "user.dir" ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
public static long scanVersion( String version ) {
|
public static long scanVersion( String version ) {
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
@@ -475,7 +475,7 @@ public class FlatInspector
|
|||||||
f.setAccessible( true );
|
f.setAccessible( true );
|
||||||
Object ui = f.get( c );
|
Object ui = f.get( c );
|
||||||
appendRow( buf, "UI", (ui != null ? ui.getClass().getName() : "null") );
|
appendRow( buf, "UI", (ui != null ? ui.getClass().getName() : "null") );
|
||||||
} catch( NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException ex ) {
|
} catch( Exception ex ) {
|
||||||
// ignore
|
// ignore
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -183,6 +183,16 @@ public class FlatWindowsNativeWindowBorder
|
|||||||
wndProc.appIconBounds = (appIconBounds != null) ? new Rectangle( appIconBounds ) : null;
|
wndProc.appIconBounds = (appIconBounds != null) ? new Rectangle( appIconBounds ) : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean showWindow( Window window, int cmd ) {
|
||||||
|
WndProc wndProc = windowsMap.get( window );
|
||||||
|
if( wndProc == null )
|
||||||
|
return false;
|
||||||
|
|
||||||
|
User32.INSTANCE.ShowWindow( wndProc.hwnd, cmd );
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isColorizationColorAffectsBorders() {
|
public boolean isColorizationColorAffectsBorders() {
|
||||||
updateColorization();
|
updateColorization();
|
||||||
@@ -328,6 +338,15 @@ public class FlatWindowsNativeWindowBorder
|
|||||||
defaultWndProc = User32Ex.INSTANCE.SetWindowLong( hwnd, GWLP_WNDPROC, this );
|
defaultWndProc = User32Ex.INSTANCE.SetWindowLong( hwnd, GWLP_WNDPROC, this );
|
||||||
|
|
||||||
// remove the OS window title bar
|
// remove the OS window title bar
|
||||||
|
if( window instanceof JFrame && ((JFrame)window).getExtendedState() != 0 ) {
|
||||||
|
// In case that the frame should be maximized or minimized immediately
|
||||||
|
// when showing, then it is necessary to defer ::SetWindowPos() invocation.
|
||||||
|
// Otherwise the frame will not be maximized or minimized.
|
||||||
|
// This occurs only if frame.pack() was no invoked.
|
||||||
|
EventQueue.invokeLater( () -> {
|
||||||
|
updateFrame();
|
||||||
|
});
|
||||||
|
} else
|
||||||
updateFrame();
|
updateFrame();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -348,7 +367,7 @@ public class FlatWindowsNativeWindowBorder
|
|||||||
private void updateFrame() {
|
private void updateFrame() {
|
||||||
// this sends WM_NCCALCSIZE and removes/shows the window title bar
|
// this sends WM_NCCALCSIZE and removes/shows the window title bar
|
||||||
User32.INSTANCE.SetWindowPos( hwnd, hwnd, 0, 0, 0, 0,
|
User32.INSTANCE.SetWindowPos( hwnd, hwnd, 0, 0, 0, 0,
|
||||||
SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER );
|
SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE );
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -45,6 +45,20 @@ JNIEXPORT void JNICALL Java_com_formdev_flatlaf_ui_FlatWindowsNativeWindowBorder
|
|||||||
FlatWndProc::uninstall( env, obj, reinterpret_cast<HWND>( hwnd ) );
|
FlatWndProc::uninstall( env, obj, reinterpret_cast<HWND>( hwnd ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
extern "C"
|
||||||
|
JNIEXPORT void JNICALL Java_com_formdev_flatlaf_ui_FlatWindowsNativeWindowBorder_00024WndProc_updateFrame
|
||||||
|
( JNIEnv* env, jobject obj, jlong hwnd )
|
||||||
|
{
|
||||||
|
FlatWndProc::updateFrame( reinterpret_cast<HWND>( hwnd ) );
|
||||||
|
}
|
||||||
|
|
||||||
|
extern "C"
|
||||||
|
JNIEXPORT void JNICALL Java_com_formdev_flatlaf_ui_FlatWindowsNativeWindowBorder_00024WndProc_showWindow
|
||||||
|
( JNIEnv* env, jobject obj, jlong hwnd, jint cmd )
|
||||||
|
{
|
||||||
|
::ShowWindow( reinterpret_cast<HWND>( hwnd ), cmd );
|
||||||
|
}
|
||||||
|
|
||||||
//---- class FlatWndProc fields -----------------------------------------------
|
//---- class FlatWndProc fields -----------------------------------------------
|
||||||
|
|
||||||
int FlatWndProc::initialized = 0;
|
int FlatWndProc::initialized = 0;
|
||||||
@@ -89,9 +103,6 @@ HWND FlatWndProc::install( JNIEnv *env, jobject obj, jobject window ) {
|
|||||||
fwp->defaultWndProc = reinterpret_cast<WNDPROC>(
|
fwp->defaultWndProc = reinterpret_cast<WNDPROC>(
|
||||||
::SetWindowLongPtr( hwnd, GWLP_WNDPROC, (LONG_PTR) FlatWndProc::StaticWindowProc ) );
|
::SetWindowLongPtr( hwnd, GWLP_WNDPROC, (LONG_PTR) FlatWndProc::StaticWindowProc ) );
|
||||||
|
|
||||||
// remove the OS window title bar
|
|
||||||
fwp->updateFrame();
|
|
||||||
|
|
||||||
return hwnd;
|
return hwnd;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -109,7 +120,7 @@ void FlatWndProc::uninstall( JNIEnv *env, jobject obj, HWND hwnd ) {
|
|||||||
::SetWindowLongPtr( hwnd, GWLP_WNDPROC, (LONG_PTR) fwp->defaultWndProc );
|
::SetWindowLongPtr( hwnd, GWLP_WNDPROC, (LONG_PTR) fwp->defaultWndProc );
|
||||||
|
|
||||||
// show the OS window title bar
|
// show the OS window title bar
|
||||||
fwp->updateFrame();
|
updateFrame( hwnd );
|
||||||
|
|
||||||
// cleanup
|
// cleanup
|
||||||
env->DeleteGlobalRef( fwp->obj );
|
env->DeleteGlobalRef( fwp->obj );
|
||||||
@@ -134,10 +145,10 @@ void FlatWndProc::initIDs( JNIEnv *env, jobject obj ) {
|
|||||||
initialized = 1;
|
initialized = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
void FlatWndProc::updateFrame() {
|
void FlatWndProc::updateFrame( HWND hwnd ) {
|
||||||
// this sends WM_NCCALCSIZE and removes/shows the window title bar
|
// this sends WM_NCCALCSIZE and removes/shows the window title bar
|
||||||
::SetWindowPos( hwnd, hwnd, 0, 0, 0, 0,
|
::SetWindowPos( hwnd, hwnd, 0, 0, 0, 0,
|
||||||
SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER );
|
SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE );
|
||||||
}
|
}
|
||||||
|
|
||||||
LRESULT CALLBACK FlatWndProc::StaticWindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) {
|
LRESULT CALLBACK FlatWndProc::StaticWindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) {
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ class FlatWndProc
|
|||||||
public:
|
public:
|
||||||
static HWND install( JNIEnv *env, jobject obj, jobject window );
|
static HWND install( JNIEnv *env, jobject obj, jobject window );
|
||||||
static void uninstall( JNIEnv *env, jobject obj, HWND hwnd );
|
static void uninstall( JNIEnv *env, jobject obj, HWND hwnd );
|
||||||
|
static void updateFrame( HWND hwnd );
|
||||||
|
|
||||||
private:
|
private:
|
||||||
static int initialized;
|
static int initialized;
|
||||||
@@ -42,7 +43,6 @@ private:
|
|||||||
|
|
||||||
FlatWndProc();
|
FlatWndProc();
|
||||||
static void initIDs( JNIEnv *env, jobject obj );
|
static void initIDs( JNIEnv *env, jobject obj );
|
||||||
void updateFrame();
|
|
||||||
|
|
||||||
static LRESULT CALLBACK StaticWindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
|
static LRESULT CALLBACK StaticWindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
|
||||||
LRESULT CALLBACK WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
|
LRESULT CALLBACK WindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
|
||||||
|
|||||||
@@ -31,6 +31,22 @@ JNIEXPORT jlong JNICALL Java_com_formdev_flatlaf_ui_FlatWindowsNativeWindowBorde
|
|||||||
JNIEXPORT void JNICALL Java_com_formdev_flatlaf_ui_FlatWindowsNativeWindowBorder_00024WndProc_uninstallImpl
|
JNIEXPORT void JNICALL Java_com_formdev_flatlaf_ui_FlatWindowsNativeWindowBorder_00024WndProc_uninstallImpl
|
||||||
(JNIEnv *, jobject, jlong);
|
(JNIEnv *, jobject, jlong);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Class: com_formdev_flatlaf_ui_FlatWindowsNativeWindowBorder_WndProc
|
||||||
|
* Method: updateFrame
|
||||||
|
* Signature: (J)V
|
||||||
|
*/
|
||||||
|
JNIEXPORT void JNICALL Java_com_formdev_flatlaf_ui_FlatWindowsNativeWindowBorder_00024WndProc_updateFrame
|
||||||
|
(JNIEnv *, jobject, jlong);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Class: com_formdev_flatlaf_ui_FlatWindowsNativeWindowBorder_WndProc
|
||||||
|
* Method: showWindow
|
||||||
|
* Signature: (JI)V
|
||||||
|
*/
|
||||||
|
JNIEXPORT void JNICALL Java_com_formdev_flatlaf_ui_FlatWindowsNativeWindowBorder_00024WndProc_showWindow
|
||||||
|
(JNIEnv *, jobject, jlong, jint);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -1175,6 +1175,7 @@ TitlePane.closePressedBackground #e8112399 60% javax.swing.plaf.ColorUIResou
|
|||||||
TitlePane.closePressedForeground #ffffff javax.swing.plaf.ColorUIResource [UI]
|
TitlePane.closePressedForeground #ffffff javax.swing.plaf.ColorUIResource [UI]
|
||||||
TitlePane.embeddedForeground #959595 javax.swing.plaf.ColorUIResource [UI]
|
TitlePane.embeddedForeground #959595 javax.swing.plaf.ColorUIResource [UI]
|
||||||
TitlePane.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
|
TitlePane.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
|
||||||
|
TitlePane.icon [lazy] 16,16 sun.swing.ImageIconUIResource [UI] (sun.awt.image.ToolkitImage)
|
||||||
TitlePane.iconMargins 3,8,3,8 javax.swing.plaf.InsetsUIResource [UI]
|
TitlePane.iconMargins 3,8,3,8 javax.swing.plaf.InsetsUIResource [UI]
|
||||||
TitlePane.iconSize 16,16 javax.swing.plaf.DimensionUIResource [UI]
|
TitlePane.iconSize 16,16 javax.swing.plaf.DimensionUIResource [UI]
|
||||||
TitlePane.iconifyIcon [lazy] 44,30 com.formdev.flatlaf.icons.FlatWindowIconifyIcon [UI]
|
TitlePane.iconifyIcon [lazy] 44,30 com.formdev.flatlaf.icons.FlatWindowIconifyIcon [UI]
|
||||||
|
|||||||
@@ -1180,6 +1180,7 @@ TitlePane.closePressedBackground #e8112399 60% javax.swing.plaf.ColorUIResou
|
|||||||
TitlePane.closePressedForeground #ffffff javax.swing.plaf.ColorUIResource [UI]
|
TitlePane.closePressedForeground #ffffff javax.swing.plaf.ColorUIResource [UI]
|
||||||
TitlePane.embeddedForeground #595959 javax.swing.plaf.ColorUIResource [UI]
|
TitlePane.embeddedForeground #595959 javax.swing.plaf.ColorUIResource [UI]
|
||||||
TitlePane.foreground #000000 javax.swing.plaf.ColorUIResource [UI]
|
TitlePane.foreground #000000 javax.swing.plaf.ColorUIResource [UI]
|
||||||
|
TitlePane.icon [lazy] 16,16 sun.swing.ImageIconUIResource [UI] (sun.awt.image.ToolkitImage)
|
||||||
TitlePane.iconMargins 3,8,3,8 javax.swing.plaf.InsetsUIResource [UI]
|
TitlePane.iconMargins 3,8,3,8 javax.swing.plaf.InsetsUIResource [UI]
|
||||||
TitlePane.iconSize 16,16 javax.swing.plaf.DimensionUIResource [UI]
|
TitlePane.iconSize 16,16 javax.swing.plaf.DimensionUIResource [UI]
|
||||||
TitlePane.iconifyIcon [lazy] 44,30 com.formdev.flatlaf.icons.FlatWindowIconifyIcon [UI]
|
TitlePane.iconifyIcon [lazy] 44,30 com.formdev.flatlaf.icons.FlatWindowIconifyIcon [UI]
|
||||||
|
|||||||
@@ -1165,6 +1165,7 @@ TextPaneUI com.formdev.flatlaf.ui.FlatTextPaneUI
|
|||||||
#---- TitlePane ----
|
#---- TitlePane ----
|
||||||
|
|
||||||
TitlePane.background #00ff00 javax.swing.plaf.ColorUIResource [UI]
|
TitlePane.background #00ff00 javax.swing.plaf.ColorUIResource [UI]
|
||||||
|
TitlePane.borderColor #ff0000 javax.swing.plaf.ColorUIResource [UI]
|
||||||
TitlePane.buttonMaximizedHeight 22
|
TitlePane.buttonMaximizedHeight 22
|
||||||
TitlePane.buttonSize 44,30 javax.swing.plaf.DimensionUIResource [UI]
|
TitlePane.buttonSize 44,30 javax.swing.plaf.DimensionUIResource [UI]
|
||||||
TitlePane.centerTitle false
|
TitlePane.centerTitle false
|
||||||
@@ -1175,6 +1176,7 @@ TitlePane.closeIcon [lazy] 44,30 com.formdev.flatlaf.icons.FlatWin
|
|||||||
TitlePane.closePressedBackground #e8112399 60% javax.swing.plaf.ColorUIResource [UI]
|
TitlePane.closePressedBackground #e8112399 60% javax.swing.plaf.ColorUIResource [UI]
|
||||||
TitlePane.closePressedForeground #ffffff javax.swing.plaf.ColorUIResource [UI]
|
TitlePane.closePressedForeground #ffffff javax.swing.plaf.ColorUIResource [UI]
|
||||||
TitlePane.foreground #0000ff javax.swing.plaf.ColorUIResource [UI]
|
TitlePane.foreground #0000ff javax.swing.plaf.ColorUIResource [UI]
|
||||||
|
TitlePane.icon [lazy] 16,16 sun.swing.ImageIconUIResource [UI] (sun.awt.image.ToolkitImage)
|
||||||
TitlePane.iconMargins 3,8,3,8 javax.swing.plaf.InsetsUIResource [UI]
|
TitlePane.iconMargins 3,8,3,8 javax.swing.plaf.InsetsUIResource [UI]
|
||||||
TitlePane.iconSize 16,16 javax.swing.plaf.DimensionUIResource [UI]
|
TitlePane.iconSize 16,16 javax.swing.plaf.DimensionUIResource [UI]
|
||||||
TitlePane.iconifyIcon [lazy] 44,30 com.formdev.flatlaf.icons.FlatWindowIconifyIcon [UI]
|
TitlePane.iconifyIcon [lazy] 44,30 com.formdev.flatlaf.icons.FlatWindowIconifyIcon [UI]
|
||||||
|
|||||||
@@ -26,10 +26,18 @@ import java.awt.event.WindowEvent;
|
|||||||
import java.awt.event.WindowListener;
|
import java.awt.event.WindowListener;
|
||||||
import java.util.WeakHashMap;
|
import java.util.WeakHashMap;
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
|
import javax.swing.plaf.metal.MetalLookAndFeel;
|
||||||
|
import javax.swing.plaf.nimbus.NimbusLookAndFeel;
|
||||||
|
import com.formdev.flatlaf.FlatClientProperties;
|
||||||
|
import com.formdev.flatlaf.FlatDarculaLaf;
|
||||||
|
import com.formdev.flatlaf.FlatDarkLaf;
|
||||||
|
import com.formdev.flatlaf.FlatIntelliJLaf;
|
||||||
|
import com.formdev.flatlaf.FlatLaf;
|
||||||
import com.formdev.flatlaf.FlatLightLaf;
|
import com.formdev.flatlaf.FlatLightLaf;
|
||||||
import com.formdev.flatlaf.extras.FlatInspector;
|
import com.formdev.flatlaf.extras.FlatInspector;
|
||||||
import com.formdev.flatlaf.ui.FlatLineBorder;
|
import com.formdev.flatlaf.ui.FlatLineBorder;
|
||||||
import com.formdev.flatlaf.ui.FlatNativeWindowBorder;
|
import com.formdev.flatlaf.ui.FlatNativeWindowBorder;
|
||||||
|
import com.formdev.flatlaf.util.SystemInfo;
|
||||||
import net.miginfocom.swing.*;
|
import net.miginfocom.swing.*;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -63,7 +71,7 @@ public class FlatNativeWindowBorderTest
|
|||||||
frame.dispose();
|
frame.dispose();
|
||||||
}, KeyStroke.getKeyStroke( KeyEvent.VK_ESCAPE, 0, false ), JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT );
|
}, KeyStroke.getKeyStroke( KeyEvent.VK_ESCAPE, 0, false ), JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT );
|
||||||
|
|
||||||
frame.pack();
|
frame.setSize( new Dimension( 800, 600 ) );
|
||||||
frame.setLocationRelativeTo( null );
|
frame.setLocationRelativeTo( null );
|
||||||
int offset = 20 * Window.getWindows().length;
|
int offset = 20 * Window.getWindows().length;
|
||||||
frame.setLocation( frame.getX() + offset, frame.getY() + offset );
|
frame.setLocation( frame.getX() + offset, frame.getY() + offset );
|
||||||
@@ -80,7 +88,7 @@ public class FlatNativeWindowBorderTest
|
|||||||
dialog.dispose();
|
dialog.dispose();
|
||||||
}, KeyStroke.getKeyStroke( KeyEvent.VK_ESCAPE, 0, false ), JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT );
|
}, KeyStroke.getKeyStroke( KeyEvent.VK_ESCAPE, 0, false ), JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT );
|
||||||
|
|
||||||
dialog.pack();
|
dialog.setSize( new Dimension( 800, 600 ) );
|
||||||
dialog.setLocationRelativeTo( owner );
|
dialog.setLocationRelativeTo( owner );
|
||||||
dialog.setLocation( dialog.getX() + 20, dialog.getY() + 20 );
|
dialog.setLocation( dialog.getX() + 20, dialog.getY() + 20 );
|
||||||
dialog.setVisible( true );
|
dialog.setVisible( true );
|
||||||
@@ -96,7 +104,6 @@ public class FlatNativeWindowBorderTest
|
|||||||
hideWindowButton.setEnabled( false );
|
hideWindowButton.setEnabled( false );
|
||||||
|
|
||||||
setBorder( new FlatLineBorder( new Insets( 0, 0, 0, 0 ), Color.red ) );
|
setBorder( new FlatLineBorder( new Insets( 0, 0, 0, 0 ), Color.red ) );
|
||||||
setPreferredSize( new Dimension( 800, 600 ) );
|
|
||||||
|
|
||||||
updateInfo();
|
updateInfo();
|
||||||
|
|
||||||
@@ -144,6 +151,26 @@ public class FlatNativeWindowBorderTest
|
|||||||
System.out.println( windowId + " windowDeactivated" );
|
System.out.println( windowId + " windowDeactivated" );
|
||||||
}
|
}
|
||||||
} );
|
} );
|
||||||
|
|
||||||
|
window.addWindowStateListener( e -> {
|
||||||
|
System.out.println( windowId + " windowStateChanged " + e.getOldState() + " --> " + e.getNewState() );
|
||||||
|
} );
|
||||||
|
|
||||||
|
registerSwitchToLookAndFeel( "F1", FlatLightLaf.class.getName() );
|
||||||
|
registerSwitchToLookAndFeel( "F2", FlatDarkLaf.class.getName() );
|
||||||
|
registerSwitchToLookAndFeel( "F3", FlatIntelliJLaf.class.getName() );
|
||||||
|
registerSwitchToLookAndFeel( "F4", FlatDarculaLaf.class.getName() );
|
||||||
|
|
||||||
|
registerSwitchToLookAndFeel( "F8", FlatTestLaf.class.getName() );
|
||||||
|
|
||||||
|
if( SystemInfo.isWindows )
|
||||||
|
registerSwitchToLookAndFeel( "F9", "com.sun.java.swing.plaf.windows.WindowsLookAndFeel" );
|
||||||
|
else if( SystemInfo.isMacOS )
|
||||||
|
registerSwitchToLookAndFeel( "F9", "com.apple.laf.AquaLookAndFeel" );
|
||||||
|
else if( SystemInfo.isLinux )
|
||||||
|
registerSwitchToLookAndFeel( "F9", "com.sun.java.swing.plaf.gtk.GTKLookAndFeel" );
|
||||||
|
registerSwitchToLookAndFeel( "F12", MetalLookAndFeel.class.getName() );
|
||||||
|
registerSwitchToLookAndFeel( "F11", NimbusLookAndFeel.class.getName() );
|
||||||
}
|
}
|
||||||
|
|
||||||
private void updateInfo() {
|
private void updateInfo() {
|
||||||
@@ -220,6 +247,28 @@ public class FlatNativeWindowBorderTest
|
|||||||
(r1.y + r1.height) - (r2.y + r2.height) );
|
(r1.y + r1.height) - (r2.y + r2.height) );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void registerSwitchToLookAndFeel( String keyStrokeStr, String lafClassName ) {
|
||||||
|
KeyStroke keyStroke = KeyStroke.getKeyStroke( keyStrokeStr );
|
||||||
|
if( keyStroke == null )
|
||||||
|
throw new IllegalArgumentException( "Invalid key stroke '" + keyStrokeStr + "'" );
|
||||||
|
|
||||||
|
((JComponent)((RootPaneContainer)window).getContentPane()).registerKeyboardAction(
|
||||||
|
e -> applyLookAndFeel( lafClassName ),
|
||||||
|
keyStroke,
|
||||||
|
JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT );
|
||||||
|
}
|
||||||
|
|
||||||
|
private void applyLookAndFeel( String lafClassName ) {
|
||||||
|
EventQueue.invokeLater( () -> {
|
||||||
|
try {
|
||||||
|
UIManager.setLookAndFeel( lafClassName );
|
||||||
|
FlatLaf.updateUI();
|
||||||
|
} catch( Exception ex ) {
|
||||||
|
ex.printStackTrace();
|
||||||
|
}
|
||||||
|
} );
|
||||||
|
}
|
||||||
|
|
||||||
private void resizableChanged() {
|
private void resizableChanged() {
|
||||||
if( window instanceof Frame )
|
if( window instanceof Frame )
|
||||||
((Frame)window).setResizable( resizableCheckBox.isSelected() );
|
((Frame)window).setResizable( resizableCheckBox.isSelected() );
|
||||||
@@ -258,6 +307,12 @@ public class FlatNativeWindowBorderTest
|
|||||||
FlatNativeWindowBorder.setHasCustomDecoration( window, nativeCheckBox.isSelected() );
|
FlatNativeWindowBorder.setHasCustomDecoration( window, nativeCheckBox.isSelected() );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void native2Changed() {
|
||||||
|
((RootPaneContainer)window).getRootPane().putClientProperty( FlatClientProperties.USE_WINDOW_DECORATIONS, native2CheckBox.isSelected() );
|
||||||
|
window.dispose();
|
||||||
|
window.setVisible( true );
|
||||||
|
}
|
||||||
|
|
||||||
private void revalidateLayout() {
|
private void revalidateLayout() {
|
||||||
window.revalidate();
|
window.revalidate();
|
||||||
}
|
}
|
||||||
@@ -298,6 +353,23 @@ public class FlatNativeWindowBorderTest
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void reopen() {
|
||||||
|
window.dispose();
|
||||||
|
window.setVisible( true );
|
||||||
|
}
|
||||||
|
|
||||||
|
private void reshow() {
|
||||||
|
window.setVisible( false );
|
||||||
|
|
||||||
|
try {
|
||||||
|
Thread.sleep( 100 );
|
||||||
|
} catch( InterruptedException ex ) {
|
||||||
|
// ignore
|
||||||
|
}
|
||||||
|
|
||||||
|
window.setVisible( true );
|
||||||
|
}
|
||||||
|
|
||||||
private void close() {
|
private void close() {
|
||||||
window.dispose();
|
window.dispose();
|
||||||
}
|
}
|
||||||
@@ -310,12 +382,15 @@ public class FlatNativeWindowBorderTest
|
|||||||
undecoratedCheckBox = new JCheckBox();
|
undecoratedCheckBox = new JCheckBox();
|
||||||
fullScreenCheckBox = new JCheckBox();
|
fullScreenCheckBox = new JCheckBox();
|
||||||
nativeCheckBox = new JCheckBox();
|
nativeCheckBox = new JCheckBox();
|
||||||
revalidateButton = new JButton();
|
native2CheckBox = new JCheckBox();
|
||||||
replaceRootPaneButton = new JButton();
|
|
||||||
openDialogButton = new JButton();
|
openDialogButton = new JButton();
|
||||||
openFrameButton = new JButton();
|
|
||||||
hideWindowButton = new JButton();
|
hideWindowButton = new JButton();
|
||||||
|
reopenButton = new JButton();
|
||||||
|
replaceRootPaneButton = new JButton();
|
||||||
|
openFrameButton = new JButton();
|
||||||
showHiddenWindowButton = new JButton();
|
showHiddenWindowButton = new JButton();
|
||||||
|
reshowButton = new JButton();
|
||||||
|
revalidateButton = new JButton();
|
||||||
hSpacer1 = new JPanel(null);
|
hSpacer1 = new JPanel(null);
|
||||||
closeButton = new JButton();
|
closeButton = new JButton();
|
||||||
|
|
||||||
@@ -331,6 +406,7 @@ public class FlatNativeWindowBorderTest
|
|||||||
"[]0" +
|
"[]0" +
|
||||||
"[]0" +
|
"[]0" +
|
||||||
"[]" +
|
"[]" +
|
||||||
|
"[]" +
|
||||||
"[]"));
|
"[]"));
|
||||||
|
|
||||||
//---- info ----
|
//---- info ----
|
||||||
@@ -368,15 +444,11 @@ public class FlatNativeWindowBorderTest
|
|||||||
nativeCheckBox.addActionListener(e -> nativeChanged());
|
nativeCheckBox.addActionListener(e -> nativeChanged());
|
||||||
add(nativeCheckBox, "cell 0 3 3 1");
|
add(nativeCheckBox, "cell 0 3 3 1");
|
||||||
|
|
||||||
//---- revalidateButton ----
|
//---- native2CheckBox ----
|
||||||
revalidateButton.setText("revalidate");
|
native2CheckBox.setText("JRootPane.useWindowDecorations");
|
||||||
revalidateButton.addActionListener(e -> revalidateLayout());
|
native2CheckBox.setSelected(true);
|
||||||
add(revalidateButton, "cell 0 3 3 1");
|
native2CheckBox.addActionListener(e -> native2Changed());
|
||||||
|
add(native2CheckBox, "cell 0 3 3 1");
|
||||||
//---- replaceRootPaneButton ----
|
|
||||||
replaceRootPaneButton.setText("replace rootpane");
|
|
||||||
replaceRootPaneButton.addActionListener(e -> replaceRootPane());
|
|
||||||
add(replaceRootPaneButton, "cell 0 3 3 1");
|
|
||||||
|
|
||||||
//---- openDialogButton ----
|
//---- openDialogButton ----
|
||||||
openDialogButton.setText("Open Dialog");
|
openDialogButton.setText("Open Dialog");
|
||||||
@@ -384,27 +456,47 @@ public class FlatNativeWindowBorderTest
|
|||||||
openDialogButton.addActionListener(e -> openDialog());
|
openDialogButton.addActionListener(e -> openDialog());
|
||||||
add(openDialogButton, "cell 0 4 3 1");
|
add(openDialogButton, "cell 0 4 3 1");
|
||||||
|
|
||||||
//---- openFrameButton ----
|
|
||||||
openFrameButton.setText("Open Frame");
|
|
||||||
openFrameButton.setMnemonic('A');
|
|
||||||
openFrameButton.addActionListener(e -> openFrame());
|
|
||||||
add(openFrameButton, "cell 0 4 3 1");
|
|
||||||
|
|
||||||
//---- hideWindowButton ----
|
//---- hideWindowButton ----
|
||||||
hideWindowButton.setText("Hide");
|
hideWindowButton.setText("Hide");
|
||||||
hideWindowButton.addActionListener(e -> hideWindow());
|
hideWindowButton.addActionListener(e -> hideWindow());
|
||||||
add(hideWindowButton, "cell 0 4 3 1");
|
add(hideWindowButton, "cell 0 4 3 1");
|
||||||
|
|
||||||
|
//---- reopenButton ----
|
||||||
|
reopenButton.setText("Dispose and Reopen");
|
||||||
|
reopenButton.addActionListener(e -> reopen());
|
||||||
|
add(reopenButton, "cell 0 4 3 1");
|
||||||
|
|
||||||
|
//---- replaceRootPaneButton ----
|
||||||
|
replaceRootPaneButton.setText("replace rootpane");
|
||||||
|
replaceRootPaneButton.addActionListener(e -> replaceRootPane());
|
||||||
|
add(replaceRootPaneButton, "cell 0 4 3 1");
|
||||||
|
|
||||||
|
//---- openFrameButton ----
|
||||||
|
openFrameButton.setText("Open Frame");
|
||||||
|
openFrameButton.setMnemonic('A');
|
||||||
|
openFrameButton.addActionListener(e -> openFrame());
|
||||||
|
add(openFrameButton, "cell 0 5 3 1");
|
||||||
|
|
||||||
//---- showHiddenWindowButton ----
|
//---- showHiddenWindowButton ----
|
||||||
showHiddenWindowButton.setText("Show hidden");
|
showHiddenWindowButton.setText("Show hidden");
|
||||||
showHiddenWindowButton.addActionListener(e -> showHiddenWindow());
|
showHiddenWindowButton.addActionListener(e -> showHiddenWindow());
|
||||||
add(showHiddenWindowButton, "cell 0 4 3 1");
|
add(showHiddenWindowButton, "cell 0 5 3 1");
|
||||||
add(hSpacer1, "cell 0 4 3 1,growx");
|
|
||||||
|
//---- reshowButton ----
|
||||||
|
reshowButton.setText("Hide and Show");
|
||||||
|
reshowButton.addActionListener(e -> reshow());
|
||||||
|
add(reshowButton, "cell 0 5 3 1");
|
||||||
|
|
||||||
|
//---- revalidateButton ----
|
||||||
|
revalidateButton.setText("revalidate");
|
||||||
|
revalidateButton.addActionListener(e -> revalidateLayout());
|
||||||
|
add(revalidateButton, "cell 0 5 3 1");
|
||||||
|
add(hSpacer1, "cell 0 5 3 1,growx");
|
||||||
|
|
||||||
//---- closeButton ----
|
//---- closeButton ----
|
||||||
closeButton.setText("Close");
|
closeButton.setText("Close");
|
||||||
closeButton.addActionListener(e -> close());
|
closeButton.addActionListener(e -> close());
|
||||||
add(closeButton, "cell 0 4 3 1");
|
add(closeButton, "cell 0 5 3 1");
|
||||||
// JFormDesigner - End of component initialization //GEN-END:initComponents
|
// JFormDesigner - End of component initialization //GEN-END:initComponents
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -415,12 +507,15 @@ public class FlatNativeWindowBorderTest
|
|||||||
private JCheckBox undecoratedCheckBox;
|
private JCheckBox undecoratedCheckBox;
|
||||||
private JCheckBox fullScreenCheckBox;
|
private JCheckBox fullScreenCheckBox;
|
||||||
private JCheckBox nativeCheckBox;
|
private JCheckBox nativeCheckBox;
|
||||||
private JButton revalidateButton;
|
private JCheckBox native2CheckBox;
|
||||||
private JButton replaceRootPaneButton;
|
|
||||||
private JButton openDialogButton;
|
private JButton openDialogButton;
|
||||||
private JButton openFrameButton;
|
|
||||||
private JButton hideWindowButton;
|
private JButton hideWindowButton;
|
||||||
|
private JButton reopenButton;
|
||||||
|
private JButton replaceRootPaneButton;
|
||||||
|
private JButton openFrameButton;
|
||||||
private JButton showHiddenWindowButton;
|
private JButton showHiddenWindowButton;
|
||||||
|
private JButton reshowButton;
|
||||||
|
private JButton revalidateButton;
|
||||||
private JPanel hSpacer1;
|
private JPanel hSpacer1;
|
||||||
private JButton closeButton;
|
private JButton closeButton;
|
||||||
// JFormDesigner - End of variables declaration //GEN-END:variables
|
// JFormDesigner - End of variables declaration //GEN-END:variables
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
JFDML JFormDesigner: "7.0.3.1.342" Java: "15" encoding: "UTF-8"
|
JFDML JFormDesigner: "7.0.3.1.342" Java: "16" encoding: "UTF-8"
|
||||||
|
|
||||||
new FormModel {
|
new FormModel {
|
||||||
contentType: "form/swing"
|
contentType: "form/swing"
|
||||||
@@ -6,7 +6,7 @@ new FormModel {
|
|||||||
add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
|
add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
|
||||||
"$layoutConstraints": "insets dialog,hidemode 3"
|
"$layoutConstraints": "insets dialog,hidemode 3"
|
||||||
"$columnConstraints": "[][][grow,fill]"
|
"$columnConstraints": "[][][grow,fill]"
|
||||||
"$rowConstraints": "[grow,top]para[]0[]0[][]"
|
"$rowConstraints": "[grow,top]para[]0[]0[][][]"
|
||||||
} ) {
|
} ) {
|
||||||
name: "this"
|
name: "this"
|
||||||
add( new FormComponent( "javax.swing.JLabel" ) {
|
add( new FormComponent( "javax.swing.JLabel" ) {
|
||||||
@@ -65,17 +65,11 @@ new FormModel {
|
|||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 0 3 3 1"
|
"value": "cell 0 3 3 1"
|
||||||
} )
|
} )
|
||||||
add( new FormComponent( "javax.swing.JButton" ) {
|
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
||||||
name: "revalidateButton"
|
name: "native2CheckBox"
|
||||||
"text": "revalidate"
|
"text": "JRootPane.useWindowDecorations"
|
||||||
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "revalidateLayout", false ) )
|
"selected": true
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "native2Changed", false ) )
|
||||||
"value": "cell 0 3 3 1"
|
|
||||||
} )
|
|
||||||
add( new FormComponent( "javax.swing.JButton" ) {
|
|
||||||
name: "replaceRootPaneButton"
|
|
||||||
"text": "replace rootpane"
|
|
||||||
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "replaceRootPane", false ) )
|
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 0 3 3 1"
|
"value": "cell 0 3 3 1"
|
||||||
} )
|
} )
|
||||||
@@ -87,14 +81,6 @@ new FormModel {
|
|||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 0 4 3 1"
|
"value": "cell 0 4 3 1"
|
||||||
} )
|
} )
|
||||||
add( new FormComponent( "javax.swing.JButton" ) {
|
|
||||||
name: "openFrameButton"
|
|
||||||
"text": "Open Frame"
|
|
||||||
"mnemonic": 65
|
|
||||||
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "openFrame", false ) )
|
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
|
||||||
"value": "cell 0 4 3 1"
|
|
||||||
} )
|
|
||||||
add( new FormComponent( "javax.swing.JButton" ) {
|
add( new FormComponent( "javax.swing.JButton" ) {
|
||||||
name: "hideWindowButton"
|
name: "hideWindowButton"
|
||||||
"text": "Hide"
|
"text": "Hide"
|
||||||
@@ -102,28 +88,64 @@ new FormModel {
|
|||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 0 4 3 1"
|
"value": "cell 0 4 3 1"
|
||||||
} )
|
} )
|
||||||
|
add( new FormComponent( "javax.swing.JButton" ) {
|
||||||
|
name: "reopenButton"
|
||||||
|
"text": "Dispose and Reopen"
|
||||||
|
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "reopen", false ) )
|
||||||
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
|
"value": "cell 0 4 3 1"
|
||||||
|
} )
|
||||||
|
add( new FormComponent( "javax.swing.JButton" ) {
|
||||||
|
name: "replaceRootPaneButton"
|
||||||
|
"text": "replace rootpane"
|
||||||
|
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "replaceRootPane", false ) )
|
||||||
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
|
"value": "cell 0 4 3 1"
|
||||||
|
} )
|
||||||
|
add( new FormComponent( "javax.swing.JButton" ) {
|
||||||
|
name: "openFrameButton"
|
||||||
|
"text": "Open Frame"
|
||||||
|
"mnemonic": 65
|
||||||
|
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "openFrame", false ) )
|
||||||
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
|
"value": "cell 0 5 3 1"
|
||||||
|
} )
|
||||||
add( new FormComponent( "javax.swing.JButton" ) {
|
add( new FormComponent( "javax.swing.JButton" ) {
|
||||||
name: "showHiddenWindowButton"
|
name: "showHiddenWindowButton"
|
||||||
"text": "Show hidden"
|
"text": "Show hidden"
|
||||||
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "showHiddenWindow", false ) )
|
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "showHiddenWindow", false ) )
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 0 4 3 1"
|
"value": "cell 0 5 3 1"
|
||||||
|
} )
|
||||||
|
add( new FormComponent( "javax.swing.JButton" ) {
|
||||||
|
name: "reshowButton"
|
||||||
|
"text": "Hide and Show"
|
||||||
|
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "reshow", false ) )
|
||||||
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
|
"value": "cell 0 5 3 1"
|
||||||
|
} )
|
||||||
|
add( new FormComponent( "javax.swing.JButton" ) {
|
||||||
|
name: "revalidateButton"
|
||||||
|
"text": "revalidate"
|
||||||
|
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "revalidateLayout", false ) )
|
||||||
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
|
"value": "cell 0 5 3 1"
|
||||||
} )
|
} )
|
||||||
add( new FormComponent( "com.jformdesigner.designer.wrapper.HSpacer" ) {
|
add( new FormComponent( "com.jformdesigner.designer.wrapper.HSpacer" ) {
|
||||||
name: "hSpacer1"
|
name: "hSpacer1"
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 0 4 3 1,growx"
|
"value": "cell 0 5 3 1,growx"
|
||||||
} )
|
} )
|
||||||
add( new FormComponent( "javax.swing.JButton" ) {
|
add( new FormComponent( "javax.swing.JButton" ) {
|
||||||
name: "closeButton"
|
name: "closeButton"
|
||||||
"text": "Close"
|
"text": "Close"
|
||||||
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "close", false ) )
|
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "close", false ) )
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 0 4 3 1"
|
"value": "cell 0 5 3 1"
|
||||||
} )
|
} )
|
||||||
}, new FormLayoutConstraints( null ) {
|
}, new FormLayoutConstraints( null ) {
|
||||||
"location": new java.awt.Point( 0, 0 )
|
"location": new java.awt.Point( 0, 0 )
|
||||||
"size": new java.awt.Dimension( 500, 300 )
|
"size": new java.awt.Dimension( 520, 300 )
|
||||||
} )
|
} )
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -75,14 +75,14 @@ public class FlatWindowDecorationsTest
|
|||||||
super.addNotify();
|
super.addNotify();
|
||||||
|
|
||||||
Window window = SwingUtilities.windowForComponent( this );
|
Window window = SwingUtilities.windowForComponent( this );
|
||||||
menuBarCheckBox.setEnabled( window instanceof JFrame );
|
menuBarCheckBox.setSelected( window instanceof JFrame );
|
||||||
menuBarEmbeddedCheckBox.setEnabled( window instanceof JFrame );
|
|
||||||
menuBarVisibleCheckBox.setEnabled( window instanceof JFrame );
|
|
||||||
maximizedBoundsCheckBox.setEnabled( window instanceof Frame );
|
maximizedBoundsCheckBox.setEnabled( window instanceof Frame );
|
||||||
|
|
||||||
addMenuButton.setEnabled( menuBarCheckBox.isEnabled() );
|
addMenuButton.setEnabled( menuBarCheckBox.isEnabled() );
|
||||||
|
addGlueButton.setEnabled( menuBarCheckBox.isEnabled() );
|
||||||
removeMenuButton.setEnabled( menuBarCheckBox.isEnabled() );
|
removeMenuButton.setEnabled( menuBarCheckBox.isEnabled() );
|
||||||
changeMenuButton.setEnabled( menuBarCheckBox.isEnabled() );
|
changeMenuButton.setEnabled( menuBarCheckBox.isEnabled() );
|
||||||
|
changeTitleButton.setEnabled( menuBarCheckBox.isEnabled() );
|
||||||
|
|
||||||
boolean windowHasIcons = (window != null && !window.getIconImages().isEmpty());
|
boolean windowHasIcons = (window != null && !window.getIconImages().isEmpty());
|
||||||
iconNoneRadioButton.setEnabled( windowHasIcons );
|
iconNoneRadioButton.setEnabled( windowHasIcons );
|
||||||
@@ -117,12 +117,13 @@ public class FlatWindowDecorationsTest
|
|||||||
|
|
||||||
private void menuBarChanged() {
|
private void menuBarChanged() {
|
||||||
Window window = SwingUtilities.windowForComponent( this );
|
Window window = SwingUtilities.windowForComponent( this );
|
||||||
if( window instanceof JFrame ) {
|
if( window instanceof JFrame )
|
||||||
((JFrame)window).setJMenuBar( menuBarCheckBox.isSelected() ? menuBar : null );
|
((JFrame)window).setJMenuBar( menuBarCheckBox.isSelected() ? menuBar : null );
|
||||||
|
else if( window instanceof JDialog )
|
||||||
|
((JDialog)window).setJMenuBar( menuBarCheckBox.isSelected() ? menuBar : null );
|
||||||
window.revalidate();
|
window.revalidate();
|
||||||
window.repaint();
|
window.repaint();
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
private void menuBarEmbeddedChanged() {
|
private void menuBarEmbeddedChanged() {
|
||||||
JRootPane rootPane = getWindowRootPane();
|
JRootPane rootPane = getWindowRootPane();
|
||||||
@@ -134,6 +135,48 @@ public class FlatWindowDecorationsTest
|
|||||||
menuBar.setVisible( menuBarVisibleCheckBox.isSelected() );
|
menuBar.setVisible( menuBarVisibleCheckBox.isSelected() );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void rightCompChanged() {
|
||||||
|
removeNonMenusFromMenuBar();
|
||||||
|
|
||||||
|
if( rightCompCheckBox.isSelected() ) {
|
||||||
|
rightStretchCompCheckBox.setSelected( false );
|
||||||
|
|
||||||
|
JButton myButton = new JButton( "?" );
|
||||||
|
myButton.putClientProperty( "JButton.buttonType", "toolBarButton" );
|
||||||
|
myButton.setFocusable( false );
|
||||||
|
|
||||||
|
menuBar.add( Box.createGlue() );
|
||||||
|
menuBar.add( myButton );
|
||||||
|
}
|
||||||
|
|
||||||
|
menuBar.revalidate();
|
||||||
|
menuBar.repaint();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void rightStretchCompChanged() {
|
||||||
|
removeNonMenusFromMenuBar();
|
||||||
|
|
||||||
|
if( rightStretchCompCheckBox.isSelected() ) {
|
||||||
|
rightCompCheckBox.setSelected( false );
|
||||||
|
|
||||||
|
menuBar.add( Box.createGlue() );
|
||||||
|
menuBar.add( new JProgressBar() );
|
||||||
|
}
|
||||||
|
|
||||||
|
menuBar.revalidate();
|
||||||
|
menuBar.repaint();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void removeNonMenusFromMenuBar() {
|
||||||
|
Component[] components = menuBar.getComponents();
|
||||||
|
for( int i = components.length - 1; i >= 0; i-- ) {
|
||||||
|
if( !(components[i] instanceof JMenu) )
|
||||||
|
menuBar.remove( i );
|
||||||
|
else
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void colorizeMenuBar() {
|
private void colorizeMenuBar() {
|
||||||
boolean colorize = colorizeMenuBarCheckBox.isSelected();
|
boolean colorize = colorizeMenuBarCheckBox.isSelected();
|
||||||
Color menuBarBackground = colorize ? new Color( 0xffccff ) : UIManager.getColor( "MenuBar.background" );
|
Color menuBarBackground = colorize ? new Color( 0xffccff ) : UIManager.getColor( "MenuBar.background" );
|
||||||
@@ -250,7 +293,7 @@ public class FlatWindowDecorationsTest
|
|||||||
|
|
||||||
private void openDialog() {
|
private void openDialog() {
|
||||||
Window owner = SwingUtilities.windowForComponent( this );
|
Window owner = SwingUtilities.windowForComponent( this );
|
||||||
JDialog dialog = new JDialog( owner, "Dialog", ModalityType.APPLICATION_MODAL );
|
JDialog dialog = new JDialog( owner, "Dialog", ModalityType.DOCUMENT_MODAL );
|
||||||
dialog.setDefaultCloseOperation( JDialog.DISPOSE_ON_CLOSE );
|
dialog.setDefaultCloseOperation( JDialog.DISPOSE_ON_CLOSE );
|
||||||
dialog.add( new FlatWindowDecorationsTest() );
|
dialog.add( new FlatWindowDecorationsTest() );
|
||||||
dialog.pack();
|
dialog.pack();
|
||||||
@@ -258,6 +301,17 @@ public class FlatWindowDecorationsTest
|
|||||||
dialog.setVisible( true );
|
dialog.setVisible( true );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void openFrame() {
|
||||||
|
FlatWindowDecorationsTest comp = new FlatWindowDecorationsTest();
|
||||||
|
JFrame frame = new JFrame( "Frame" );
|
||||||
|
frame.setDefaultCloseOperation( JFrame.DISPOSE_ON_CLOSE );
|
||||||
|
frame.add( comp );
|
||||||
|
frame.setJMenuBar( comp.menuBar );
|
||||||
|
frame.pack();
|
||||||
|
frame.setLocationRelativeTo( this );
|
||||||
|
frame.setVisible( true );
|
||||||
|
}
|
||||||
|
|
||||||
private void decorationStyleChanged() {
|
private void decorationStyleChanged() {
|
||||||
int style;
|
int style;
|
||||||
if( styleFrameRadioButton.isSelected() )
|
if( styleFrameRadioButton.isSelected() )
|
||||||
@@ -312,16 +366,18 @@ public class FlatWindowDecorationsTest
|
|||||||
private void initComponents() {
|
private void initComponents() {
|
||||||
// JFormDesigner - Component initialization - DO NOT MODIFY //GEN-BEGIN:initComponents
|
// JFormDesigner - Component initialization - DO NOT MODIFY //GEN-BEGIN:initComponents
|
||||||
menuBarCheckBox = new JCheckBox();
|
menuBarCheckBox = new JCheckBox();
|
||||||
unifiedBackgroundCheckBox = new JCheckBox();
|
rightCompCheckBox = new JCheckBox();
|
||||||
JPanel panel3 = new JPanel();
|
JPanel panel3 = new JPanel();
|
||||||
addMenuButton = new JButton();
|
addMenuButton = new JButton();
|
||||||
JButton addGlueButton = new JButton();
|
addGlueButton = new JButton();
|
||||||
removeMenuButton = new JButton();
|
removeMenuButton = new JButton();
|
||||||
changeMenuButton = new JButton();
|
changeMenuButton = new JButton();
|
||||||
JButton changeTitleButton = new JButton();
|
changeTitleButton = new JButton();
|
||||||
menuBarEmbeddedCheckBox = new JCheckBox();
|
menuBarEmbeddedCheckBox = new JCheckBox();
|
||||||
colorizeMenuBarCheckBox = new JCheckBox();
|
rightStretchCompCheckBox = new JCheckBox();
|
||||||
menuBarVisibleCheckBox = new JCheckBox();
|
menuBarVisibleCheckBox = new JCheckBox();
|
||||||
|
colorizeMenuBarCheckBox = new JCheckBox();
|
||||||
|
unifiedBackgroundCheckBox = new JCheckBox();
|
||||||
colorizeMenusCheckBox = new JCheckBox();
|
colorizeMenusCheckBox = new JCheckBox();
|
||||||
resizableCheckBox = new JCheckBox();
|
resizableCheckBox = new JCheckBox();
|
||||||
maximizedBoundsCheckBox = new JCheckBox();
|
maximizedBoundsCheckBox = new JCheckBox();
|
||||||
@@ -344,6 +400,7 @@ public class FlatWindowDecorationsTest
|
|||||||
iconTestAllRadioButton = new JRadioButton();
|
iconTestAllRadioButton = new JRadioButton();
|
||||||
iconTestRandomRadioButton = new JRadioButton();
|
iconTestRandomRadioButton = new JRadioButton();
|
||||||
JButton openDialogButton = new JButton();
|
JButton openDialogButton = new JButton();
|
||||||
|
JButton openFrameButton = new JButton();
|
||||||
menuBar = new JMenuBar();
|
menuBar = new JMenuBar();
|
||||||
JMenu fileMenu = new JMenu();
|
JMenu fileMenu = new JMenu();
|
||||||
JMenuItem newMenuItem = new JMenuItem();
|
JMenuItem newMenuItem = new JMenuItem();
|
||||||
@@ -381,6 +438,7 @@ public class FlatWindowDecorationsTest
|
|||||||
// rows
|
// rows
|
||||||
"para[]0" +
|
"para[]0" +
|
||||||
"[]0" +
|
"[]0" +
|
||||||
|
"[]0" +
|
||||||
"[]unrel" +
|
"[]unrel" +
|
||||||
"[]0" +
|
"[]0" +
|
||||||
"[]unrel" +
|
"[]unrel" +
|
||||||
@@ -394,10 +452,10 @@ public class FlatWindowDecorationsTest
|
|||||||
menuBarCheckBox.addActionListener(e -> menuBarChanged());
|
menuBarCheckBox.addActionListener(e -> menuBarChanged());
|
||||||
add(menuBarCheckBox, "cell 0 0");
|
add(menuBarCheckBox, "cell 0 0");
|
||||||
|
|
||||||
//---- unifiedBackgroundCheckBox ----
|
//---- rightCompCheckBox ----
|
||||||
unifiedBackgroundCheckBox.setText("unified background");
|
rightCompCheckBox.setText("right aligned component");
|
||||||
unifiedBackgroundCheckBox.addActionListener(e -> unifiedBackgroundChanged());
|
rightCompCheckBox.addActionListener(e -> rightCompChanged());
|
||||||
add(unifiedBackgroundCheckBox, "cell 1 0");
|
add(rightCompCheckBox, "cell 1 0");
|
||||||
|
|
||||||
//======== panel3 ========
|
//======== panel3 ========
|
||||||
{
|
{
|
||||||
@@ -437,7 +495,7 @@ public class FlatWindowDecorationsTest
|
|||||||
changeTitleButton.addActionListener(e -> changeTitle());
|
changeTitleButton.addActionListener(e -> changeTitle());
|
||||||
panel3.add(changeTitleButton, "cell 0 4");
|
panel3.add(changeTitleButton, "cell 0 4");
|
||||||
}
|
}
|
||||||
add(panel3, "cell 2 0 1 6,aligny top,growy 0");
|
add(panel3, "cell 2 0 1 7,aligny top,growy 0");
|
||||||
|
|
||||||
//---- menuBarEmbeddedCheckBox ----
|
//---- menuBarEmbeddedCheckBox ----
|
||||||
menuBarEmbeddedCheckBox.setText("embedded menu bar");
|
menuBarEmbeddedCheckBox.setText("embedded menu bar");
|
||||||
@@ -445,10 +503,10 @@ public class FlatWindowDecorationsTest
|
|||||||
menuBarEmbeddedCheckBox.addActionListener(e -> menuBarEmbeddedChanged());
|
menuBarEmbeddedCheckBox.addActionListener(e -> menuBarEmbeddedChanged());
|
||||||
add(menuBarEmbeddedCheckBox, "cell 0 1");
|
add(menuBarEmbeddedCheckBox, "cell 0 1");
|
||||||
|
|
||||||
//---- colorizeMenuBarCheckBox ----
|
//---- rightStretchCompCheckBox ----
|
||||||
colorizeMenuBarCheckBox.setText("colorize menu bar");
|
rightStretchCompCheckBox.setText("right aligned stretching component");
|
||||||
colorizeMenuBarCheckBox.addActionListener(e -> colorizeMenuBar());
|
rightStretchCompCheckBox.addActionListener(e -> rightStretchCompChanged());
|
||||||
add(colorizeMenuBarCheckBox, "cell 1 1");
|
add(rightStretchCompCheckBox, "cell 1 1");
|
||||||
|
|
||||||
//---- menuBarVisibleCheckBox ----
|
//---- menuBarVisibleCheckBox ----
|
||||||
menuBarVisibleCheckBox.setText("menu bar visible");
|
menuBarVisibleCheckBox.setText("menu bar visible");
|
||||||
@@ -456,39 +514,49 @@ public class FlatWindowDecorationsTest
|
|||||||
menuBarVisibleCheckBox.addActionListener(e -> menuBarVisibleChanged());
|
menuBarVisibleCheckBox.addActionListener(e -> menuBarVisibleChanged());
|
||||||
add(menuBarVisibleCheckBox, "cell 0 2");
|
add(menuBarVisibleCheckBox, "cell 0 2");
|
||||||
|
|
||||||
|
//---- colorizeMenuBarCheckBox ----
|
||||||
|
colorizeMenuBarCheckBox.setText("colorize menu bar");
|
||||||
|
colorizeMenuBarCheckBox.addActionListener(e -> colorizeMenuBar());
|
||||||
|
add(colorizeMenuBarCheckBox, "cell 1 2");
|
||||||
|
|
||||||
|
//---- unifiedBackgroundCheckBox ----
|
||||||
|
unifiedBackgroundCheckBox.setText("unified background");
|
||||||
|
unifiedBackgroundCheckBox.addActionListener(e -> unifiedBackgroundChanged());
|
||||||
|
add(unifiedBackgroundCheckBox, "cell 0 3");
|
||||||
|
|
||||||
//---- colorizeMenusCheckBox ----
|
//---- colorizeMenusCheckBox ----
|
||||||
colorizeMenusCheckBox.setText("colorize menus");
|
colorizeMenusCheckBox.setText("colorize menus");
|
||||||
colorizeMenusCheckBox.addActionListener(e -> colorizeMenus());
|
colorizeMenusCheckBox.addActionListener(e -> colorizeMenus());
|
||||||
add(colorizeMenusCheckBox, "cell 1 2");
|
add(colorizeMenusCheckBox, "cell 1 3");
|
||||||
|
|
||||||
//---- resizableCheckBox ----
|
//---- resizableCheckBox ----
|
||||||
resizableCheckBox.setText("resizable");
|
resizableCheckBox.setText("resizable");
|
||||||
resizableCheckBox.setSelected(true);
|
resizableCheckBox.setSelected(true);
|
||||||
resizableCheckBox.addActionListener(e -> resizableChanged());
|
resizableCheckBox.addActionListener(e -> resizableChanged());
|
||||||
add(resizableCheckBox, "cell 0 3");
|
add(resizableCheckBox, "cell 0 4");
|
||||||
|
|
||||||
//---- maximizedBoundsCheckBox ----
|
//---- maximizedBoundsCheckBox ----
|
||||||
maximizedBoundsCheckBox.setText("maximized bounds (50,100, 1000,700)");
|
maximizedBoundsCheckBox.setText("maximized bounds (50,100, 1000,700)");
|
||||||
maximizedBoundsCheckBox.addActionListener(e -> maximizedBoundsChanged());
|
maximizedBoundsCheckBox.addActionListener(e -> maximizedBoundsChanged());
|
||||||
add(maximizedBoundsCheckBox, "cell 1 3");
|
add(maximizedBoundsCheckBox, "cell 1 4");
|
||||||
|
|
||||||
//---- undecoratedCheckBox ----
|
//---- undecoratedCheckBox ----
|
||||||
undecoratedCheckBox.setText("undecorated");
|
undecoratedCheckBox.setText("undecorated");
|
||||||
undecoratedCheckBox.addActionListener(e -> undecoratedChanged());
|
undecoratedCheckBox.addActionListener(e -> undecoratedChanged());
|
||||||
add(undecoratedCheckBox, "cell 0 4");
|
add(undecoratedCheckBox, "cell 0 5");
|
||||||
|
|
||||||
//---- fullScreenCheckBox ----
|
//---- fullScreenCheckBox ----
|
||||||
fullScreenCheckBox.setText("full screen");
|
fullScreenCheckBox.setText("full screen");
|
||||||
fullScreenCheckBox.addActionListener(e -> fullScreenChanged());
|
fullScreenCheckBox.addActionListener(e -> fullScreenChanged());
|
||||||
add(fullScreenCheckBox, "cell 1 4");
|
add(fullScreenCheckBox, "cell 1 5");
|
||||||
|
|
||||||
//---- label1 ----
|
//---- label1 ----
|
||||||
label1.setText("Style:");
|
label1.setText("Style:");
|
||||||
add(label1, "cell 0 5");
|
add(label1, "cell 0 6");
|
||||||
|
|
||||||
//---- label2 ----
|
//---- label2 ----
|
||||||
label2.setText("Icon:");
|
label2.setText("Icon:");
|
||||||
add(label2, "cell 1 5");
|
add(label2, "cell 1 6");
|
||||||
|
|
||||||
//======== panel1 ========
|
//======== panel1 ========
|
||||||
{
|
{
|
||||||
@@ -553,7 +621,7 @@ public class FlatWindowDecorationsTest
|
|||||||
styleFileChooserRadioButton.addActionListener(e -> decorationStyleChanged());
|
styleFileChooserRadioButton.addActionListener(e -> decorationStyleChanged());
|
||||||
panel1.add(styleFileChooserRadioButton, "cell 0 8");
|
panel1.add(styleFileChooserRadioButton, "cell 0 8");
|
||||||
}
|
}
|
||||||
add(panel1, "cell 0 6");
|
add(panel1, "cell 0 7");
|
||||||
|
|
||||||
//======== panel2 ========
|
//======== panel2 ========
|
||||||
{
|
{
|
||||||
@@ -582,12 +650,18 @@ public class FlatWindowDecorationsTest
|
|||||||
iconTestRandomRadioButton.addActionListener(e -> iconChanged());
|
iconTestRandomRadioButton.addActionListener(e -> iconChanged());
|
||||||
panel2.add(iconTestRandomRadioButton, "cell 0 2");
|
panel2.add(iconTestRandomRadioButton, "cell 0 2");
|
||||||
}
|
}
|
||||||
add(panel2, "cell 1 6");
|
add(panel2, "cell 1 7");
|
||||||
|
|
||||||
//---- openDialogButton ----
|
//---- openDialogButton ----
|
||||||
openDialogButton.setText("Open Dialog");
|
openDialogButton.setText("Open Dialog");
|
||||||
openDialogButton.addActionListener(e -> openDialog());
|
openDialogButton.addActionListener(e -> openDialog());
|
||||||
add(openDialogButton, "cell 0 7");
|
add(openDialogButton, "cell 0 8 2 1");
|
||||||
|
|
||||||
|
//---- openFrameButton ----
|
||||||
|
openFrameButton.setText("Open Frame");
|
||||||
|
openFrameButton.setMnemonic('A');
|
||||||
|
openFrameButton.addActionListener(e -> openFrame());
|
||||||
|
add(openFrameButton, "cell 0 8 2 1");
|
||||||
|
|
||||||
//======== menuBar ========
|
//======== menuBar ========
|
||||||
{
|
{
|
||||||
@@ -779,13 +853,17 @@ public class FlatWindowDecorationsTest
|
|||||||
|
|
||||||
// JFormDesigner - Variables declaration - DO NOT MODIFY //GEN-BEGIN:variables
|
// JFormDesigner - Variables declaration - DO NOT MODIFY //GEN-BEGIN:variables
|
||||||
private JCheckBox menuBarCheckBox;
|
private JCheckBox menuBarCheckBox;
|
||||||
private JCheckBox unifiedBackgroundCheckBox;
|
private JCheckBox rightCompCheckBox;
|
||||||
private JButton addMenuButton;
|
private JButton addMenuButton;
|
||||||
|
private JButton addGlueButton;
|
||||||
private JButton removeMenuButton;
|
private JButton removeMenuButton;
|
||||||
private JButton changeMenuButton;
|
private JButton changeMenuButton;
|
||||||
|
private JButton changeTitleButton;
|
||||||
private JCheckBox menuBarEmbeddedCheckBox;
|
private JCheckBox menuBarEmbeddedCheckBox;
|
||||||
private JCheckBox colorizeMenuBarCheckBox;
|
private JCheckBox rightStretchCompCheckBox;
|
||||||
private JCheckBox menuBarVisibleCheckBox;
|
private JCheckBox menuBarVisibleCheckBox;
|
||||||
|
private JCheckBox colorizeMenuBarCheckBox;
|
||||||
|
private JCheckBox unifiedBackgroundCheckBox;
|
||||||
private JCheckBox colorizeMenusCheckBox;
|
private JCheckBox colorizeMenusCheckBox;
|
||||||
private JCheckBox resizableCheckBox;
|
private JCheckBox resizableCheckBox;
|
||||||
private JCheckBox maximizedBoundsCheckBox;
|
private JCheckBox maximizedBoundsCheckBox;
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
JFDML JFormDesigner: "7.0.3.1.342" Java: "15" encoding: "UTF-8"
|
JFDML JFormDesigner: "7.0.3.1.342" Java: "16" encoding: "UTF-8"
|
||||||
|
|
||||||
new FormModel {
|
new FormModel {
|
||||||
contentType: "form/swing"
|
contentType: "form/swing"
|
||||||
@@ -9,7 +9,7 @@ new FormModel {
|
|||||||
add( new FormContainer( "com.formdev.flatlaf.testing.FlatTestPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
|
add( new FormContainer( "com.formdev.flatlaf.testing.FlatTestPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
|
||||||
"$layoutConstraints": "ltr,insets dialog,hidemode 3"
|
"$layoutConstraints": "ltr,insets dialog,hidemode 3"
|
||||||
"$columnConstraints": "[left]para[left][fill]"
|
"$columnConstraints": "[left]para[left][fill]"
|
||||||
"$rowConstraints": "para[]0[]0[]unrel[]0[]unrel[][top][]"
|
"$rowConstraints": "para[]0[]0[]0[]unrel[]0[]unrel[][top][]"
|
||||||
} ) {
|
} ) {
|
||||||
name: "this"
|
name: "this"
|
||||||
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
||||||
@@ -24,12 +24,12 @@ new FormModel {
|
|||||||
"value": "cell 0 0"
|
"value": "cell 0 0"
|
||||||
} )
|
} )
|
||||||
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
||||||
name: "unifiedBackgroundCheckBox"
|
name: "rightCompCheckBox"
|
||||||
"text": "unified background"
|
"text": "right aligned component"
|
||||||
auxiliary() {
|
auxiliary() {
|
||||||
"JavaCodeGenerator.variableLocal": false
|
"JavaCodeGenerator.variableLocal": false
|
||||||
}
|
}
|
||||||
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "unifiedBackgroundChanged", false ) )
|
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "rightCompChanged", false ) )
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 1 0"
|
"value": "cell 1 0"
|
||||||
} )
|
} )
|
||||||
@@ -52,6 +52,9 @@ new FormModel {
|
|||||||
add( new FormComponent( "javax.swing.JButton" ) {
|
add( new FormComponent( "javax.swing.JButton" ) {
|
||||||
name: "addGlueButton"
|
name: "addGlueButton"
|
||||||
"text": "Add glue"
|
"text": "Add glue"
|
||||||
|
auxiliary() {
|
||||||
|
"JavaCodeGenerator.variableLocal": false
|
||||||
|
}
|
||||||
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "addGlue", false ) )
|
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "addGlue", false ) )
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 0 1"
|
"value": "cell 0 1"
|
||||||
@@ -79,12 +82,15 @@ new FormModel {
|
|||||||
add( new FormComponent( "javax.swing.JButton" ) {
|
add( new FormComponent( "javax.swing.JButton" ) {
|
||||||
name: "changeTitleButton"
|
name: "changeTitleButton"
|
||||||
"text": "Change title"
|
"text": "Change title"
|
||||||
|
auxiliary() {
|
||||||
|
"JavaCodeGenerator.variableLocal": false
|
||||||
|
}
|
||||||
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "changeTitle", false ) )
|
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "changeTitle", false ) )
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 0 4"
|
"value": "cell 0 4"
|
||||||
} )
|
} )
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 2 0 1 6,aligny top,growy 0"
|
"value": "cell 2 0 1 7,aligny top,growy 0"
|
||||||
} )
|
} )
|
||||||
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
||||||
name: "menuBarEmbeddedCheckBox"
|
name: "menuBarEmbeddedCheckBox"
|
||||||
@@ -98,12 +104,12 @@ new FormModel {
|
|||||||
"value": "cell 0 1"
|
"value": "cell 0 1"
|
||||||
} )
|
} )
|
||||||
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
||||||
name: "colorizeMenuBarCheckBox"
|
name: "rightStretchCompCheckBox"
|
||||||
"text": "colorize menu bar"
|
"text": "right aligned stretching component"
|
||||||
auxiliary() {
|
auxiliary() {
|
||||||
"JavaCodeGenerator.variableLocal": false
|
"JavaCodeGenerator.variableLocal": false
|
||||||
}
|
}
|
||||||
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "colorizeMenuBar", false ) )
|
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "rightStretchCompChanged", false ) )
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 1 1"
|
"value": "cell 1 1"
|
||||||
} )
|
} )
|
||||||
@@ -118,6 +124,26 @@ new FormModel {
|
|||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 0 2"
|
"value": "cell 0 2"
|
||||||
} )
|
} )
|
||||||
|
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
||||||
|
name: "colorizeMenuBarCheckBox"
|
||||||
|
"text": "colorize menu bar"
|
||||||
|
auxiliary() {
|
||||||
|
"JavaCodeGenerator.variableLocal": false
|
||||||
|
}
|
||||||
|
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "colorizeMenuBar", false ) )
|
||||||
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
|
"value": "cell 1 2"
|
||||||
|
} )
|
||||||
|
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
||||||
|
name: "unifiedBackgroundCheckBox"
|
||||||
|
"text": "unified background"
|
||||||
|
auxiliary() {
|
||||||
|
"JavaCodeGenerator.variableLocal": false
|
||||||
|
}
|
||||||
|
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "unifiedBackgroundChanged", false ) )
|
||||||
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
|
"value": "cell 0 3"
|
||||||
|
} )
|
||||||
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
||||||
name: "colorizeMenusCheckBox"
|
name: "colorizeMenusCheckBox"
|
||||||
"text": "colorize menus"
|
"text": "colorize menus"
|
||||||
@@ -126,7 +152,7 @@ new FormModel {
|
|||||||
}
|
}
|
||||||
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "colorizeMenus", false ) )
|
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "colorizeMenus", false ) )
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 1 2"
|
"value": "cell 1 3"
|
||||||
} )
|
} )
|
||||||
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
||||||
name: "resizableCheckBox"
|
name: "resizableCheckBox"
|
||||||
@@ -137,7 +163,7 @@ new FormModel {
|
|||||||
}
|
}
|
||||||
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "resizableChanged", false ) )
|
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "resizableChanged", false ) )
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 0 3"
|
"value": "cell 0 4"
|
||||||
} )
|
} )
|
||||||
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
||||||
name: "maximizedBoundsCheckBox"
|
name: "maximizedBoundsCheckBox"
|
||||||
@@ -147,7 +173,7 @@ new FormModel {
|
|||||||
}
|
}
|
||||||
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "maximizedBoundsChanged", false ) )
|
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "maximizedBoundsChanged", false ) )
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 1 3"
|
"value": "cell 1 4"
|
||||||
} )
|
} )
|
||||||
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
||||||
name: "undecoratedCheckBox"
|
name: "undecoratedCheckBox"
|
||||||
@@ -157,7 +183,7 @@ new FormModel {
|
|||||||
}
|
}
|
||||||
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "undecoratedChanged", false ) )
|
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "undecoratedChanged", false ) )
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 0 4"
|
"value": "cell 0 5"
|
||||||
} )
|
} )
|
||||||
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
add( new FormComponent( "javax.swing.JCheckBox" ) {
|
||||||
name: "fullScreenCheckBox"
|
name: "fullScreenCheckBox"
|
||||||
@@ -167,19 +193,19 @@ new FormModel {
|
|||||||
}
|
}
|
||||||
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "fullScreenChanged", false ) )
|
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "fullScreenChanged", false ) )
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 1 4"
|
"value": "cell 1 5"
|
||||||
} )
|
} )
|
||||||
add( new FormComponent( "javax.swing.JLabel" ) {
|
add( new FormComponent( "javax.swing.JLabel" ) {
|
||||||
name: "label1"
|
name: "label1"
|
||||||
"text": "Style:"
|
"text": "Style:"
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 0 5"
|
"value": "cell 0 6"
|
||||||
} )
|
} )
|
||||||
add( new FormComponent( "javax.swing.JLabel" ) {
|
add( new FormComponent( "javax.swing.JLabel" ) {
|
||||||
name: "label2"
|
name: "label2"
|
||||||
"text": "Icon:"
|
"text": "Icon:"
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 1 5"
|
"value": "cell 1 6"
|
||||||
} )
|
} )
|
||||||
add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
|
add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
|
||||||
"$columnConstraints": "[fill]"
|
"$columnConstraints": "[fill]"
|
||||||
@@ -288,7 +314,7 @@ new FormModel {
|
|||||||
"value": "cell 0 8"
|
"value": "cell 0 8"
|
||||||
} )
|
} )
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 0 6"
|
"value": "cell 0 7"
|
||||||
} )
|
} )
|
||||||
add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
|
add( new FormContainer( "javax.swing.JPanel", new FormLayoutManager( class net.miginfocom.swing.MigLayout ) {
|
||||||
"$columnConstraints": "[fill]"
|
"$columnConstraints": "[fill]"
|
||||||
@@ -331,14 +357,22 @@ new FormModel {
|
|||||||
"value": "cell 0 2"
|
"value": "cell 0 2"
|
||||||
} )
|
} )
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 1 6"
|
"value": "cell 1 7"
|
||||||
} )
|
} )
|
||||||
add( new FormComponent( "javax.swing.JButton" ) {
|
add( new FormComponent( "javax.swing.JButton" ) {
|
||||||
name: "openDialogButton"
|
name: "openDialogButton"
|
||||||
"text": "Open Dialog"
|
"text": "Open Dialog"
|
||||||
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "openDialog", false ) )
|
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "openDialog", false ) )
|
||||||
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
"value": "cell 0 7"
|
"value": "cell 0 8 2 1"
|
||||||
|
} )
|
||||||
|
add( new FormComponent( "javax.swing.JButton" ) {
|
||||||
|
name: "openFrameButton"
|
||||||
|
"text": "Open Frame"
|
||||||
|
"mnemonic": 65
|
||||||
|
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "openFrame", false ) )
|
||||||
|
}, new FormLayoutConstraints( class net.miginfocom.layout.CC ) {
|
||||||
|
"value": "cell 0 8 2 1"
|
||||||
} )
|
} )
|
||||||
}, new FormLayoutConstraints( null ) {
|
}, new FormLayoutConstraints( null ) {
|
||||||
"location": new java.awt.Point( 0, 0 )
|
"location": new java.awt.Point( 0, 0 )
|
||||||
|
|||||||
@@ -344,6 +344,7 @@ TitlePane.background = #0f0
|
|||||||
TitlePane.inactiveBackground = #080
|
TitlePane.inactiveBackground = #080
|
||||||
TitlePane.foreground = #00f
|
TitlePane.foreground = #00f
|
||||||
TitlePane.inactiveForeground = #fff
|
TitlePane.inactiveForeground = #fff
|
||||||
|
TitlePane.borderColor = #f00
|
||||||
|
|
||||||
|
|
||||||
#---- ToggleButton ----
|
#---- ToggleButton ----
|
||||||
|
|||||||
@@ -873,6 +873,7 @@ TitlePane.closePressedBackground
|
|||||||
TitlePane.closePressedForeground
|
TitlePane.closePressedForeground
|
||||||
TitlePane.embeddedForeground
|
TitlePane.embeddedForeground
|
||||||
TitlePane.foreground
|
TitlePane.foreground
|
||||||
|
TitlePane.icon
|
||||||
TitlePane.iconMargins
|
TitlePane.iconMargins
|
||||||
TitlePane.iconSize
|
TitlePane.iconSize
|
||||||
TitlePane.iconifyIcon
|
TitlePane.iconifyIcon
|
||||||
|
|||||||
Reference in New Issue
Block a user