angel/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-02-10 22:17:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

SwingX: fixed missing highlighting of "today" in JXMonthView and JXDatePicker

Browse Source
This commit is contained in:
Karl Tauber
2022-09-12 13:29:53 +02:00
parent 9041a16b22
commit 0e523f1193
7 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
flatlaf-swingx/src/main/java/com/formdev/flatlaf/swingx/ui/FlatMonthViewUI.java
View File

@@ -16,9 +16,11 @@
package com.formdev.flatlaf.swingx.ui;
import java.awt.Color;
import java.awt.Insets;
import java.util.Calendar;
import javax.swing.JComponent;
import javax.swing.UIManager;
import javax.swing.border.Border;
import javax.swing.border.CompoundBorder;
import javax.swing.border.EmptyBorder;
@@ -52,6 +54,8 @@ public class FlatMonthViewUI
private static class FlatRenderingHandler
extends RenderingHandler
{
private final Color todayColor = UIManager.getColor( "JXMonthView.todayColor" );
@Override
public JComponent prepareRenderingComponent( JXMonthView monthView, Calendar calendar,
CalendarState dayState )
@@ -67,8 +71,12 @@ public class FlatMonthViewUI
Border b = c.getBorder();
if( b instanceof CompoundBorder && ((CompoundBorder)b).getInsideBorder() instanceof EmptyBorder )
border = new CompoundBorder( ((CompoundBorder)b).getOutsideBorder(), new FlatEmptyBorder( py * 2, 0, py * 2, 0 ) );
} else if( dayState == CalendarState.TODAY )
border = new FlatLineBorder( new Insets( py, px, py, px ), monthView.getTodayBackground() );
} else if( dayState == CalendarState.TODAY ) {
Color lineColor = monthView.getTodayBackground();
if( lineColor == null )
lineColor = todayColor;
border = new FlatLineBorder( new Insets( py, px, py, px ), lineColor );
}
if( border == null )
border = new FlatEmptyBorder( py, px, py, px );

1
flatlaf-swingx/src/main/resources/com/formdev/flatlaf/swingx/FlatLaf.properties
View File

@@ -39,6 +39,7 @@ JXDatePicker.border = com.formdev.flatlaf.swingx.ui.FlatDatePickerBorder
JXMonthView.monthDownFileName = {icon}com.formdev.flatlaf.swingx.ui.FlatMonthDownIcon
JXMonthView.monthUpFileName = {icon}com.formdev.flatlaf.swingx.ui.FlatMonthUpIcon
JXMonthView.todayColor = @foreground
#---- TitledPanel ----