Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Animation #67

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Animation #67

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64dfe82
Animate tab selection.
Chrriis Feb 18, 2020
a30ed01
Merge branch 'master' into animation
Chrriis Feb 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 99 additions & 3 deletions flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
import javax.swing.JComponent;
import javax.swing.JTabbedPane;
import javax.swing.UIManager;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.UIResource;
import javax.swing.plaf.basic.BasicTabbedPaneUI;
Expand Down Expand Up @@ -181,6 +183,35 @@ public void propertyChange( PropertyChangeEvent e ) {
};
}

@Override
protected ChangeListener createChangeListener() {
ChangeListener changeListener = super.createChangeListener();
return new ChangeListener() {
@Override
public void stateChanged(ChangeEvent e) {
changeListener.stateChanged(e);
int newSelectedTabIndex = ((JTabbedPane)e.getSource()).getSelectedIndex();
if(animationState != null && animationState.tabIndex != newSelectedTabIndex) {
repaintTab(animationState.tabIndex);
}
animationState = new AnimationState(newSelectedTabIndex);
repaintTab(newSelectedTabIndex);
}
};
}

private class AnimationState {
public int tabIndex;
public long startTime;
public AnimationState(int tabIndex) {
this.tabIndex = tabIndex;
startTime = System.currentTimeMillis();
}
}

private AnimationState animationState;


@Override
protected JButton createScrollButton( int direction ) {
// this method is invoked before installDefaults(), so we can not use color fields here
Expand Down Expand Up @@ -208,8 +239,29 @@ private void repaintTab( int tabIndex ) {
return;

Rectangle r = getTabBounds( tabPane, tabIndex );
if( r != null )
if( r != null ) {
// Add border, or else repaint misses them (and they do change, so they need repainting).
int tabPlacement = tabPane.getTabPlacement();
Insets contentInsets = getContentBorderInsets( tabPlacement );
switch( tabPlacement ) {
case TOP:
default:
r.height += contentInsets.top;
break;
case BOTTOM:
r.height += contentInsets.bottom;
r.y -= contentInsets.bottom;
break;
case LEFT:
r.width += contentInsets.left;
break;
case RIGHT:
r.height += contentInsets.right;
r.x -= contentInsets.right;
break;
}
tabPane.repaint( r );
}
}

@Override
Expand Down Expand Up @@ -324,8 +376,52 @@ protected void paintTabBorder( Graphics g, int tabPlacement, int tabIndex,
((Graphics2D)g).fill( new Rectangle2D.Float( x, y + offset, sepWidth, h - (offset * 2) ) );
}
}

paintTabSelectionWithAnimation( g, tabPlacement, x, y, w, h, tabIndex, isSelected );
}

if( isSelected )
private void paintTabSelectionWithAnimation( Graphics g, int tabPlacement, int x, int y, int w, int h, int tabIndex, boolean isSelected ) {
if(animationState != null && animationState.tabIndex == tabIndex) {
long startTime = animationState.startTime;
long now = System.currentTimeMillis();
long pixelCount = Math.round((now - startTime) / 1.4); // Smaller factor is faster
switch( tabPlacement ) {
case BOTTOM:
case TOP:
default:
if(pixelCount > w) {
animationState = null;
}
break;
case LEFT:
case RIGHT:
if(pixelCount > h) {
animationState = null;
}
break;
}
if(animationState != null) {
int newX = x;
int newY = y;
int newWidth = w;
int newHeight = h;
switch( tabPlacement ) {
case BOTTOM:
case TOP:
default:
newWidth = (int)pixelCount;
newX += (w - newWidth) / 2;
break;
case LEFT:
case RIGHT:
newHeight = (int)pixelCount;
newY += (h - newHeight) / 2;
break;
}
paintTabSelection( g, tabPlacement, newX, newY, newWidth, newHeight );
}
repaintTab(tabIndex);
} else if( isSelected )
paintTabSelection( g, tabPlacement, x, y, w, h );
}

Expand Down Expand Up @@ -457,7 +553,7 @@ protected void paintContentBorder( Graphics g, int tabPlacement, int selectedInd

Shape oldClip = g.getClip();
g.setClip( scrollableTabViewport.getBounds() );
paintTabSelection( g, tabPlacement, tabRect.x, tabRect.y, tabRect.width, tabRect.height );
paintTabSelectionWithAnimation( g, tabPlacement, tabRect.x, tabRect.y, tabRect.width, tabRect.height, selectedIndex, true );
g.setClip( oldClip );
}
}
Expand Down