You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by sk...@apache.org on 2020/02/06 23:16:32 UTC
[netbeans] branch master updated: [NETBEANS-3428] FlatLaf: fix
foreground color (was black;
now white) of editor tabs in FlatLaf Dark, if option "same background color
for files from the same project" (Options > Appearance > Document Tabs) is
enabled
This is an automated email from the ASF dual-hosted git repository.
skygo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 0bc55f0 [NETBEANS-3428] FlatLaf: fix foreground color (was black; now white) of editor tabs in FlatLaf Dark, if option "same background color for files from the same project" (Options > Appearance > Document Tabs) is enabled
new 7a525ec Merge pull request #1930 from DevCharly/flatlaf-dark-tab-project-foreground
0bc55f0 is described below
commit 0bc55f022d874164f309cc68b20bee52268a6db5
Author: Karl Tauber <ka...@jformdesigner.com>
AuthorDate: Thu Feb 6 23:14:49 2020 +0100
[NETBEANS-3428] FlatLaf: fix foreground color (was black; now white) of editor tabs in FlatLaf Dark, if option "same background color for files from the same project" (Options > Appearance > Document Tabs) is enabled
also scale "underline" hight of selected editor tab (in multi-tabs) in Java 8 on HiDPI screens
---
.../netbeans/core/multitabs/impl/ProjectColorTabDecorator.java | 8 +++++++-
.../src/org/netbeans/swing/laf/flatlaf/FlatDarkLaf.properties | 1 +
.../src/org/netbeans/swing/laf/flatlaf/FlatLaf.properties | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/platform/core.multitabs/src/org/netbeans/core/multitabs/impl/ProjectColorTabDecorator.java b/platform/core.multitabs/src/org/netbeans/core/multitabs/impl/ProjectColorTabDecorator.java
index 2f5fe4b..28e8a04 100644
--- a/platform/core.multitabs/src/org/netbeans/core/multitabs/impl/ProjectColorTabDecorator.java
+++ b/platform/core.multitabs/src/org/netbeans/core/multitabs/impl/ProjectColorTabDecorator.java
@@ -52,6 +52,7 @@ public class ProjectColorTabDecorator extends TabDecorator {
private static final Map<Object, Color> project2color = new WeakHashMap<Object, Color>(10);
private static final Map<TabData, Color> tab2color = new WeakHashMap<TabData, Color>(10);
private static final List<Color> backGroundColors;
+ private static Color foregroundColor;
private final static ChangeListener projectsListener = new ChangeListener() {
@Override
@@ -84,6 +85,11 @@ public class ProjectColorTabDecorator extends TabDecorator {
backGroundColors.add( new Color( 238, 209, 255 ) );
}
+ foregroundColor = UIManager.getColor("nb.multitabs.project.foreground");
+ if (foregroundColor == null) {
+ foregroundColor = Color.BLACK;
+ }
+
ProjectSupport projects = ProjectSupport.getDefault();
if( projects.isEnabled() && Settings.getDefault().isSameProjectSameColor() ) {
projects.addChangeListener(projectsListener);
@@ -136,7 +142,7 @@ public class ProjectColorTabDecorator extends TabDecorator {
public Color getForeground( TabData tab, boolean selected ) {
if( selected || !Settings.getDefault().isSameProjectSameColor() )
return null;
- return null == getBackground( tab, selected ) ? null : Color.black;
+ return null == getBackground( tab, selected ) ? null : foregroundColor;
}
@Override
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatDarkLaf.properties b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatDarkLaf.properties
index a634a21..4a5b2cf 100644
--- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatDarkLaf.properties
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatDarkLaf.properties
@@ -74,6 +74,7 @@ nb.multitabs.project.6.background=rgb(135, 105, 89)
nb.multitabs.project.7.background=rgb(108, 135, 96)
nb.multitabs.project.8.background=rgb(107, 135, 38)
nb.multitabs.project.9.background=rgb(118, 89, 135)
+nb.multitabs.project.foreground=#f0f0f0
#---- PropSheet ----
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLaf.properties b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLaf.properties
index 2adc6bd..b00caa5 100644
--- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLaf.properties
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLaf.properties
@@ -53,7 +53,7 @@ ViewTab.showTabSeparators=true
#---- Multi-tabs ----
nb.multitabs.tabInsets=5,2,7,2
-nb.multitabs.underlineHeight=3
+nb.multitabs.underlineHeight={scaledInteger}3
nb.multitabs.showVerticalLines=true
nb.multitabs.showHorizontalLines=false
nb.multitabs.gridColor=$Component.borderColor
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists