Merge PR #864: HiDPI: fix incomplete component repainting at 125% or …

…175% scaling on Windows

CHANGELOG.md

@@ -34,6 +34,9 @@ FlatLaf Change Log
 - Theme Editor: Fixed occasional empty window on startup on macOS.
 - FlatLaf window decorations: Fixed black line sometimes painted on top of
  (native) window border on Windows 11. (issue #852)
+- HiDPI: Fixed incomplete component paintings at 125% or 175% scaling on Windows
+ where sometimes a 1px wide area at the right or bottom component edge is not
+ repainted. E.g. ScrollPane focus indicator border. (issues #860 and #582)
 
 #### Incompatibilities
 

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonUI.java

@@ -29,6 +29,7 @@
 import java.awt.Graphics2D;
 import java.awt.Insets;
 import java.awt.Rectangle;
+import java.awt.event.FocusEvent;
 import java.awt.geom.RoundRectangle2D;
 import java.beans.PropertyChangeEvent;
 import java.util.Map;
@@ -61,6 +62,7 @@
 import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable;
 import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI;
 import com.formdev.flatlaf.ui.FlatStylingSupport.UnknownStyleException;
+import com.formdev.flatlaf.util.HiDPIUtils;
 import com.formdev.flatlaf.util.LoggingFacade;
 import com.formdev.flatlaf.util.UIScale;
 
@@ -312,11 +314,11 @@ protected void propertyChange( AbstractButton b, PropertyChangeEvent e ) {
 
  case BUTTON_TYPE:
  b.revalidate();
- b.repaint();
+ HiDPIUtils.repaint( b );
  break;
 
  case OUTLINE:
- b.repaint();
+ HiDPIUtils.repaint( b );
  break;
 
  case STYLE:
@@ -328,7 +330,7 @@ protected void propertyChange( AbstractButton b, PropertyChangeEvent e ) {
  } else
  installStyle( b );
  b.revalidate();
- b.repaint();
+ HiDPIUtils.repaint( b );
  break;
  }
  }
@@ -915,7 +917,7 @@ public void propertyChange( PropertyChangeEvent e ) {
 
  @Override
  public void stateChanged( ChangeEvent e ) {
- super.stateChanged( e );
+ HiDPIUtils.repaint( b );
 
  // if button is in toolbar, repaint button groups
  AbstractButton b = (AbstractButton) e.getSource();
@@ -927,5 +929,17 @@ public void stateChanged( ChangeEvent e ) {
  ((FlatToolBarUI)ui).repaintButtonGroup( b );
  }
  }
+
+ @Override
+ public void focusGained( FocusEvent e ) {
+ super.focusGained( e );
+ HiDPIUtils.repaint( b );
+ }
+
+ @Override
+ public void focusLost( FocusEvent e ) {
+ super.focusLost( e );
+ HiDPIUtils.repaint( b );
+ }
  }
 }

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java

@@ -78,6 +78,7 @@
 import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableField;
 import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableLookupProvider;
 import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI;
+import com.formdev.flatlaf.util.HiDPIUtils;
 import com.formdev.flatlaf.util.LoggingFacade;
 import com.formdev.flatlaf.util.SystemInfo;
 
@@ -220,7 +221,7 @@ public void mouseReleased( MouseEvent e ) {
 
  private void repaintArrowButton() {
  if( arrowButton != null && !comboBox.isEditable() )
- arrowButton.repaint();
+ HiDPIUtils.repaint( arrowButton );
  }
  };
  comboBox.addMouseListener( hoverListener );
@@ -351,15 +352,15 @@ protected FocusListener createFocusListener() {
  @Override
  public void focusGained( FocusEvent e ) {
  super.focusGained( e );
- if( comboBox != null && comboBox.isEditable() )
- comboBox.repaint();
+ if( comboBox != null )
+ HiDPIUtils.repaint( comboBox );
  }
 
  @Override
  public void focusLost( FocusEvent e ) {
  super.focusLost( e );
- if( comboBox != null && comboBox.isEditable() )
- comboBox.repaint();
+ if( comboBox != null )
+ HiDPIUtils.repaint( comboBox );
  }
  };
  }
@@ -386,12 +387,12 @@ protected PropertyChangeListener createPropertyChangeListener() {
  switch( propertyName ) {
  case PLACEHOLDER_TEXT:
  if( editor != null )
- editor.repaint();
+ HiDPIUtils.repaint( editor );
  break;
 
  case COMPONENT_ROUND_RECT:
  case OUTLINE:
- comboBox.repaint();
+ HiDPIUtils.repaint( comboBox );
  break;
 
  case MINIMUM_WIDTH:
@@ -402,7 +403,7 @@ protected PropertyChangeListener createPropertyChangeListener() {
  case STYLE_CLASS:
  installStyle();
  comboBox.revalidate();
- comboBox.repaint();
+ HiDPIUtils.repaint( comboBox );
  break;
  }
  }

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatEditorPaneUI.java

@@ -171,7 +171,7 @@ static void propertyChange( JTextComponent c, PropertyChangeEvent e, Runnable in
  case FlatClientProperties.STYLE_CLASS:
  installStyle.run();
  c.revalidate();
- c.repaint();
+ HiDPIUtils.repaint( c );
  break;
  }
  }

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatLabelUI.java

@@ -124,7 +124,7 @@ public void propertyChange( PropertyChangeEvent e ) {
  } else
  installStyle( label );
  label.revalidate();
- label.repaint();
+ HiDPIUtils.repaint( label );
  }
 
  super.propertyChange( e );

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatListUI.java

@@ -43,6 +43,7 @@
 import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable;
 import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI;
 import com.formdev.flatlaf.util.Graphics2DProxy;
+import com.formdev.flatlaf.util.HiDPIUtils;
 import com.formdev.flatlaf.util.LoggingFacade;
 import com.formdev.flatlaf.util.UIScale;
 
@@ -182,7 +183,7 @@ protected PropertyChangeListener createPropertyChangeListener() {
  case FlatClientProperties.STYLE_CLASS:
  installStyle();
  list.revalidate();
- list.repaint();
+ HiDPIUtils.repaint( list );
  break;
  }
  };
@@ -205,7 +206,7 @@ protected ListSelectionListener createListSelectionListener() {
  Rectangle r = getCellBounds( list, firstIndex, lastIndex );
  if( r != null ) {
  int arc = (int) Math.ceil( UIScale.scale( selectionArc / 2f ) );
- list.repaint( r.x - arc, r.y - arc, r.width + (arc * 2), r.height + (arc * 2) );
+ HiDPIUtils.repaint( list, r.x - arc, r.y - arc, r.width + (arc * 2), r.height + (arc * 2) );
  }
  }
  };

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatMenuUI.java

@@ -47,6 +47,7 @@
 import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableField;
 import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableLookupProvider;
 import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI;
+import com.formdev.flatlaf.util.HiDPIUtils;
 import com.formdev.flatlaf.util.LoggingFacade;
 
 /**
@@ -167,7 +168,7 @@ private void rollover( MouseEvent e, boolean rollover ) {
  JMenu menu = (JMenu) e.getSource();
  if( menu.isTopLevelMenu() && menu.isRolloverEnabled() ) {
  menu.getModel().setRollover( rollover );
- menu.repaint();
+ HiDPIUtils.repaint( menu );
  }
  }
  };

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatPanelUI.java

@@ -31,6 +31,7 @@
 import com.formdev.flatlaf.FlatClientProperties;
 import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable;
 import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI;
+import com.formdev.flatlaf.util.HiDPIUtils;
 import com.formdev.flatlaf.util.LoggingFacade;
 import com.formdev.flatlaf.util.UIScale;
 
@@ -111,7 +112,7 @@ public void propertyChange( PropertyChangeEvent e ) {
  } else
  installStyle( c );
  c.revalidate();
- c.repaint();
+ HiDPIUtils.repaint( c );
  break;
 
  case FlatClientProperties.FULL_WINDOW_CONTENT_BUTTONS_PLACEHOLDER:

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatPasswordFieldUI.java

@@ -43,6 +43,7 @@
 import com.formdev.flatlaf.FlatClientProperties;
 import com.formdev.flatlaf.icons.FlatCapsLockIcon;
 import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable;
+import com.formdev.flatlaf.util.HiDPIUtils;
 import com.formdev.flatlaf.util.UIScale;
 
 /**
@@ -163,7 +164,7 @@ public void keyReleased( KeyEvent e ) {
  }
  private void repaint( KeyEvent e ) {
  if( e.getKeyCode() == KeyEvent.VK_CAPS_LOCK ) {
- e.getComponent().repaint();
+ HiDPIUtils.repaint( e.getComponent() );
  scrollCaretToVisible();
  }
  }
@@ -326,7 +327,7 @@ protected void updateRevealButton() {
  if( visible != revealButton.isVisible() ) {
  revealButton.setVisible( visible );
  c.revalidate();
- c.repaint();
+ HiDPIUtils.repaint( c );
 
  if( !visible ) {
  revealButton.setSelected( false );

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatProgressBarUI.java

@@ -133,14 +133,14 @@ protected void installListeners() {
  case PROGRESS_BAR_LARGE_HEIGHT:
  case PROGRESS_BAR_SQUARE:
  progressBar.revalidate();
- progressBar.repaint();
+ HiDPIUtils.repaint( progressBar );
  break;
 
  case STYLE:
  case STYLE_CLASS:
  installStyle();
  progressBar.revalidate();
- progressBar.repaint();
+ HiDPIUtils.repaint( progressBar );
  break;
  }
  };
@@ -294,6 +294,6 @@ protected void setAnimationIndex( int newValue ) {
  // Only solution is to repaint whole progress bar.
  double systemScaleFactor = UIScale.getSystemScaleFactor( progressBar.getGraphicsConfiguration() );
  if( (int) systemScaleFactor != systemScaleFactor )
- progressBar.repaint();
+ HiDPIUtils.repaint( progressBar );
  }
 }

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatRadioButtonUI.java

@@ -47,6 +47,7 @@
 import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable;
 import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI;
 import com.formdev.flatlaf.ui.FlatStylingSupport.UnknownStyleException;
+import com.formdev.flatlaf.util.HiDPIUtils;
 import com.formdev.flatlaf.util.LoggingFacade;
 import com.formdev.flatlaf.util.UIScale;
 
@@ -173,7 +174,7 @@ protected void propertyChange( AbstractButton b, PropertyChangeEvent e ) {
  } else
  installStyle( b );
  b.revalidate();
- b.repaint();
+ HiDPIUtils.repaint( b );
  break;
  }
  }

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollBarUI.java

@@ -43,6 +43,7 @@
 import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableField;
 import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableLookupProvider;
 import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI;
+import com.formdev.flatlaf.util.HiDPIUtils;
 import com.formdev.flatlaf.util.LoggingFacade;
 import com.formdev.flatlaf.util.SystemInfo;
 import com.formdev.flatlaf.util.UIScale;
@@ -212,14 +213,14 @@ protected PropertyChangeListener createPropertyChangeListener() {
  switch( e.getPropertyName() ) {
  case FlatClientProperties.SCROLL_BAR_SHOW_BUTTONS:
  scrollbar.revalidate();
- scrollbar.repaint();
+ HiDPIUtils.repaint( scrollbar );
  break;
 
  case FlatClientProperties.STYLE:
  case FlatClientProperties.STYLE_CLASS:
  installStyle();
  scrollbar.revalidate();
- scrollbar.repaint();
+ HiDPIUtils.repaint( scrollbar );
  break;
 
  case "componentOrientation":
@@ -492,7 +493,7 @@ private void update( int x, int y ) {
 
  private void repaint() {
  if( scrollbar.isEnabled() )
- scrollbar.repaint();
+ HiDPIUtils.repaint( scrollbar );
  }
  }
 

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollPaneUI.java

@@ -55,6 +55,7 @@
 import com.formdev.flatlaf.FlatClientProperties;
 import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable;
 import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI;
+import com.formdev.flatlaf.util.HiDPIUtils;
 import com.formdev.flatlaf.util.LoggingFacade;
 import com.formdev.flatlaf.util.UIScale;
 
@@ -297,11 +298,11 @@ protected PropertyChangeListener createPropertyChangeListener() {
  JScrollBar hsb = scrollpane.getHorizontalScrollBar();
  if( vsb != null ) {
  vsb.revalidate();
- vsb.repaint();
+ HiDPIUtils.repaint( vsb );
  }
  if( hsb != null ) {
  hsb.revalidate();
- hsb.repaint();
+ HiDPIUtils.repaint( hsb );
  }
  break;
 
@@ -321,14 +322,14 @@ protected PropertyChangeListener createPropertyChangeListener() {
  break;
 
  case FlatClientProperties.OUTLINE:
- scrollpane.repaint();
+ HiDPIUtils.repaint( scrollpane );
  break;
 
  case FlatClientProperties.STYLE:
  case FlatClientProperties.STYLE_CLASS:
  installStyle();
  scrollpane.revalidate();
- scrollpane.repaint();
+ HiDPIUtils.repaint( scrollpane );
  break;
 
  case "border":
@@ -339,7 +340,7 @@ protected PropertyChangeListener createPropertyChangeListener() {
  borderShared = null;
  installStyle();
  scrollpane.revalidate();
- scrollpane.repaint();
+ HiDPIUtils.repaint( scrollpane );
  }
  break;
  }
@@ -538,14 +539,14 @@ public void componentRemoved( ContainerEvent e ) {
  public void focusGained( FocusEvent e ) {
  // necessary to update focus border
  if( scrollpane.getBorder() instanceof FlatBorder )
- scrollpane.repaint();
+ HiDPIUtils.repaint( scrollpane );
  }
 
  @Override
  public void focusLost( FocusEvent e ) {
  // necessary to update focus border
  if( scrollpane.getBorder() instanceof FlatBorder )
- scrollpane.repaint();
+ HiDPIUtils.repaint( scrollpane );
  }
  }
 

flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSeparatorUI.java

@@ -32,6 +32,7 @@
 import com.formdev.flatlaf.FlatClientProperties;
 import com.formdev.flatlaf.ui.FlatStylingSupport.Styleable;
 import com.formdev.flatlaf.ui.FlatStylingSupport.StyleableUI;
+import com.formdev.flatlaf.util.HiDPIUtils;
 import com.formdev.flatlaf.util.LoggingFacade;
 
 /**
@@ -134,7 +135,7 @@ public void propertyChange( PropertyChangeEvent e ) {
  } else
  installStyle( s );
  s.revalidate();
- s.repaint();
+ HiDPIUtils.repaint( s );
  break;
  }
  }