DesktopPane support implemented (issues #39 and #11)

This commit is contained in:
Karl Tauber
2020-02-11 15:38:32 +01:00
parent 686d667c4f
commit f0a49c806e
8 changed files with 360 additions and 3 deletions

View File

@@ -3,7 +3,7 @@ FlatLaf Change Log
## Unreleased
- Support `JInternalFrame`. (issues #39 and #11)
- Support `JInternalFrame` and `JDesktopPane`. (issues #39 and #11)
- Table: Support positioning the column sort arrow in header right, left, top or
bottom. (issue #34)
- ProgressBar: Fixed visual artifacts in indeterminate mode, on HiDPI screens at

View File

@@ -49,7 +49,7 @@ public class FlatInternalFrameCloseIcon
protected void paintIcon( Component c, Graphics2D g ) {
paintBackground( c, g );
g.setColor( FlatButtonUI.buttonStateColor( c, null, null, null, hoverForeground, pressedForeground ) );
g.setColor( FlatButtonUI.buttonStateColor( c, c.getForeground(), null, null, hoverForeground, pressedForeground ) );
float mx = width / 2;
float my = height / 2;

View File

@@ -0,0 +1,308 @@
/*
* Copyright 2020 FormDev Software GmbH
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.formdev.flatlaf.ui;
import java.awt.Component;
import java.awt.Container;
import java.awt.Dimension;
import java.awt.EventQueue;
import java.awt.Graphics2D;
import java.awt.Image;
import java.awt.Insets;
import java.awt.LayoutManager;
import java.awt.Point;
import java.awt.event.ActionListener;
import java.awt.event.MouseEvent;
import java.awt.image.BufferedImage;
import java.beans.PropertyVetoException;
import javax.swing.BorderFactory;
import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.event.MouseInputAdapter;
import javax.swing.event.MouseInputListener;
import javax.swing.JLabel;
import javax.swing.JLayeredPane;
import javax.swing.JRootPane;
import javax.swing.JToolTip;
import javax.swing.LookAndFeel;
import javax.swing.SwingConstants;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.basic.BasicDesktopIconUI;
import com.formdev.flatlaf.util.UIScale;
/**
* Provides the Flat LaF UI delegate for {@link javax.swing.JInternalFrame.JDesktopIcon}.
*
* <!-- BasicDesktopIconUI -->
*
* @uiDefault DesktopIcon.border Border
*
* <!-- FlatDesktopIconUI -->
*
* @uiDefault DesktopIcon.background Color
* @uiDefault DesktopIcon.foreground Color
* @uiDefault DesktopIcon.iconSize Dimension
* @uiDefault DesktopIcon.closeSize Dimension
* @uiDefault DesktopIcon.closeIcon Icon
*
* @author Karl Tauber
*/
public class FlatDesktopIconUI
extends BasicDesktopIconUI
{
private Dimension iconSize;
private Dimension closeSize;
private JLabel dockIcon;
private JButton closeButton;
private JToolTip titleTip;
private ActionListener closeListener;
private MouseInputListener mouseInputListener;
public static ComponentUI createUI( JComponent c ) {
return new FlatDesktopIconUI();
}
@Override
public void uninstallUI( JComponent c ) {
super.uninstallUI( c );
dockIcon = null;
closeButton = null;
}
@Override
protected void installComponents() {
dockIcon = new JLabel();
dockIcon.setHorizontalAlignment( SwingConstants.CENTER );
closeButton = new JButton();
closeButton.setIcon( UIManager.getIcon( "DesktopIcon.closeIcon" ) );
closeButton.setFocusable( false );
closeButton.setBorder( BorderFactory.createEmptyBorder() );
closeButton.setOpaque( true );
closeButton.setBackground( FlatUIUtils.nonUIResource( desktopIcon.getBackground() ) );
closeButton.setForeground( FlatUIUtils.nonUIResource( desktopIcon.getForeground() ) );
closeButton.setVisible( false );
desktopIcon.setLayout( new FlatDesktopIconLayout() );
desktopIcon.add( closeButton );
desktopIcon.add( dockIcon );
}
@Override
protected void uninstallComponents() {
hideTitleTip();
desktopIcon.remove( dockIcon );
desktopIcon.remove( closeButton );
desktopIcon.setLayout( null );
}
@Override
protected void installDefaults() {
super.installDefaults();
LookAndFeel.installColors( desktopIcon, "DesktopIcon.background", "DesktopIcon.foreground" );
iconSize = UIManager.getDimension( "DesktopIcon.iconSize" );
closeSize = UIManager.getDimension( "DesktopIcon.closeSize" );
}
@Override
protected void installListeners() {
super.installListeners();
closeListener = e -> {
if( frame.isClosable() )
frame.doDefaultCloseAction();
};
closeButton.addActionListener( closeListener );
closeButton.addMouseListener( mouseInputListener );
}
@Override
protected void uninstallListeners() {
super.uninstallListeners();
closeButton.removeActionListener( closeListener );
closeButton.removeMouseListener( mouseInputListener );
closeListener = null;
mouseInputListener = null;
}
@Override
protected MouseInputListener createMouseInputListener() {
mouseInputListener = new MouseInputAdapter() {
@Override
public void mouseReleased( MouseEvent e ) {
if( frame.isIcon() && desktopIcon.contains( e.getX(), e.getY() ) ) {
hideTitleTip();
closeButton.setVisible( false );
try {
frame.setIcon( false );
} catch( PropertyVetoException ex ) {
// ignore
}
}
}
@Override
public void mouseEntered( MouseEvent e ) {
showTitleTip();
if( frame.isClosable() )
closeButton.setVisible( true );
}
@Override
public void mouseExited( MouseEvent e ) {
hideTitleTip();
closeButton.setVisible( false );
}
};
return mouseInputListener;
}
private void showTitleTip() {
JRootPane rootPane = SwingUtilities.getRootPane( desktopIcon );
if( rootPane == null )
return;
if( titleTip == null ) {
titleTip = new JToolTip();
rootPane.getLayeredPane().add( titleTip, JLayeredPane.POPUP_LAYER );
}
titleTip.setTipText( frame.getTitle() );
titleTip.setSize( titleTip.getPreferredSize() );
int tx = (desktopIcon.getWidth() - titleTip.getWidth()) / 2;
int ty = -(titleTip.getHeight() + UIScale.scale( 4 ));
Point pt = SwingUtilities.convertPoint( desktopIcon, tx, ty, titleTip.getParent() );
if( pt.x + titleTip.getWidth() > rootPane.getWidth() )
pt.x = rootPane.getWidth() - titleTip.getWidth();
if( pt.x < 0 )
pt.x = 0;
titleTip.setLocation( pt );
titleTip.repaint();
}
private void hideTitleTip() {
if( titleTip == null )
return;
titleTip.setVisible( false );
titleTip.getParent().remove( titleTip );
titleTip = null;
}
@Override
public Dimension getPreferredSize( JComponent c ) {
return UIScale.scale( iconSize );
}
@Override
public Dimension getMinimumSize( JComponent c ) {
return getPreferredSize( c );
}
@Override
public Dimension getMaximumSize( JComponent c ) {
return getPreferredSize( c );
}
void updateDockIcon() {
// use invoke later to make sure that components are updated when switching LaF
EventQueue.invokeLater( () -> {
if( dockIcon != null )
updateDockIconLater();
} );
}
private void updateDockIconLater() {
// make sure that frame is not selected
if( frame.isSelected() ) {
try {
frame.setSelected( false );
} catch( PropertyVetoException ex ) {
// ignore
}
}
// paint internal frame to buffered image
int frameWidth = Math.max( frame.getWidth(), 1 );
int frameHeight = Math.max( frame.getHeight(), 1 );
BufferedImage frameImage = new BufferedImage( frameWidth, frameHeight, BufferedImage.TYPE_INT_ARGB );
Graphics2D g = frameImage.createGraphics();
try {
//TODO fix missing internal frame header when switching LaF
frame.paint( g );
} finally {
g.dispose();
}
// compute preview size (keep ratio; also works with non-square preview)
Insets insets = desktopIcon.getInsets();
int previewWidth = UIScale.scale( iconSize.width ) - insets.left - insets.right;
int previewHeight = UIScale.scale( iconSize.height ) - insets.top - insets.bottom;
float frameRatio = ((float) frameHeight / (float) frameWidth);
if( ((float) previewWidth / (float) frameWidth) > ((float) previewHeight / (float) frameHeight) )
previewWidth = Math.round( previewHeight / frameRatio );
else
previewHeight = Math.round( previewWidth * frameRatio );
// scale preview
Image previewImage = frameImage.getScaledInstance( previewWidth, previewHeight, Image.SCALE_SMOOTH );
dockIcon.setIcon( new ImageIcon( previewImage ) );
}
//---- class DockIcon -----------------------------------------------------
private class FlatDesktopIconLayout
implements LayoutManager
{
@Override public void addLayoutComponent( String name, Component comp ) {}
@Override public void removeLayoutComponent( Component comp ) {}
@Override
public Dimension preferredLayoutSize( Container parent ) {
return dockIcon.getPreferredSize();
}
@Override
public Dimension minimumLayoutSize( Container parent ) {
return dockIcon.getMinimumSize();
}
@Override
public void layoutContainer( Container parent ) {
Insets insets = parent.getInsets();
// dock icon
dockIcon.setBounds( insets.left, insets.top,
parent.getWidth() - insets.left - insets.right,
parent.getHeight() - insets.top - insets.bottom );
// close button in upper right corner
Dimension cSize = UIScale.scale( closeSize );
closeButton.setBounds( parent.getWidth() - cSize.width, 0, cSize.width, cSize.height );
}
}
}

View File

@@ -16,8 +16,11 @@
package com.formdev.flatlaf.ui;
import javax.swing.DefaultDesktopManager;
import javax.swing.JComponent;
import javax.swing.JInternalFrame;
import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.UIResource;
import javax.swing.plaf.basic.BasicDesktopPaneUI;
/**
@@ -36,4 +39,27 @@ public class FlatDesktopPaneUI
public static ComponentUI createUI( JComponent c ) {
return new FlatDesktopPaneUI();
}
@Override
protected void installDesktopManager() {
desktopManager = desktop.getDesktopManager();
if( desktopManager == null ) {
desktopManager = new FlatDesktopManager();
desktop.setDesktopManager( desktopManager );
}
}
//---- class FlatDesktopManager -------------------------------------------
private class FlatDesktopManager
extends DefaultDesktopManager
implements UIResource
{
@Override
public void iconifyFrame( JInternalFrame f ) {
super.iconifyFrame( f );
((FlatDesktopIconUI)f.getDesktopIcon().getUI()).updateDockIcon();
}
}
}

View File

@@ -136,6 +136,11 @@ Component.linkColor=#589df6
Desktop.background=#3E434C
#---- DesktopIcon ----
DesktopIcon.background=lighten($Desktop.background,10%)
#---- InternalFrame ----
InternalFrame.activeTitleBackground=darken(@background,10%)

View File

@@ -21,7 +21,7 @@ CheckBoxUI=com.formdev.flatlaf.ui.FlatCheckBoxUI
CheckBoxMenuItemUI=com.formdev.flatlaf.ui.FlatCheckBoxMenuItemUI
ColorChooserUI=com.formdev.flatlaf.ui.FlatColorChooserUI
ComboBoxUI=com.formdev.flatlaf.ui.FlatComboBoxUI
DesktopIconUI=javax.swing.plaf.basic.BasicDesktopIconUI
DesktopIconUI=com.formdev.flatlaf.ui.FlatDesktopIconUI
DesktopPaneUI=com.formdev.flatlaf.ui.FlatDesktopPaneUI
EditorPaneUI=com.formdev.flatlaf.ui.FlatEditorPaneUI
FileChooserUI=com.formdev.flatlaf.ui.FlatFileChooserUI
@@ -151,6 +151,14 @@ Component.arrowType=chevron
Component.hideMnemonics=true
#---- DesktopIcon ----
DesktopIcon.border=4,4,4,4
DesktopIcon.iconSize=64,64
DesktopIcon.closeSize=20,20
DesktopIcon.closeIcon=com.formdev.flatlaf.icons.FlatInternalFrameCloseIcon
#---- EditorPane ----
EditorPane.border=com.formdev.flatlaf.ui.FlatMarginBorder

View File

@@ -138,6 +138,11 @@ Component.linkColor=#2470B3
Desktop.background=#E6EBF0
#---- DesktopIcon ----
DesktopIcon.background=darken($Desktop.background,10%)
#---- HelpButton ----
HelpButton.questionMarkColor=#4F9EE3

View File

@@ -135,6 +135,11 @@ Component.focusColor=#97c3f3
Desktop.background=#afe
#---- DesktopIcon ----
DesktopIcon.background=darken($Desktop.background,20%)
#---- HelpButton ----
HelpButton.questionMarkColor=#0000ff