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/01/28 09:30:23 UTC
[netbeans] branch master updated: [NETBEANS-3428] Update FlatLaf
from 0.25.1 to 0.26
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 1041c7e [NETBEANS-3428] Update FlatLaf from 0.25.1 to 0.26
new eaf2550 Merge pull request #1894 from DevCharly/flatlaf-0.26
1041c7e is described below
commit 1041c7ed9ddf9fa65fd34ecf7f9052947099c29e
Author: Karl Tauber <ka...@jformdesigner.com>
AuthorDate: Wed Jan 22 17:34:03 2020 +0100
[NETBEANS-3428] Update FlatLaf from 0.25.1 to 0.26
---
platform/libs.flatlaf/external/binaries-list | 2 +-
.../{flatlaf-0.25.1-license.txt => flatlaf-0.26-license.txt} | 4 ++--
platform/libs.flatlaf/nbproject/project.properties | 2 +-
platform/libs.flatlaf/nbproject/project.xml | 4 ++--
.../src/org/netbeans/swing/laf/flatlaf/FlatLaf.properties | 3 ++-
.../src/org/netbeans/swing/laf/flatlaf/FlatLightLaf.properties | 4 ++++
.../src/org/netbeans/modules/quicksearch/QuickSearchComboBar.java | 5 +++++
7 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/platform/libs.flatlaf/external/binaries-list b/platform/libs.flatlaf/external/binaries-list
index c67daf0..8cb59cc 100644
--- a/platform/libs.flatlaf/external/binaries-list
+++ b/platform/libs.flatlaf/external/binaries-list
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-3E05CE2EA9ED771C2912DD0E15B8F965892D0B9B com.formdev:flatlaf:0.25.1
+2EF2AB1FF80098D83488A715AC708D60A2986A9B com.formdev:flatlaf:0.26
diff --git a/platform/libs.flatlaf/external/flatlaf-0.25.1-license.txt b/platform/libs.flatlaf/external/flatlaf-0.26-license.txt
similarity index 99%
rename from platform/libs.flatlaf/external/flatlaf-0.25.1-license.txt
rename to platform/libs.flatlaf/external/flatlaf-0.26-license.txt
index a0d3685..b1b4cd7 100644
--- a/platform/libs.flatlaf/external/flatlaf-0.25.1-license.txt
+++ b/platform/libs.flatlaf/external/flatlaf-0.26-license.txt
@@ -1,7 +1,7 @@
Name: FlatLaf Look and Feel
Description: FlatLaf Look and Feel
-Version: 0.25.1
-Files: flatlaf-0.25.1.jar
+Version: 0.26
+Files: flatlaf-0.26.jar
License: Apache-2.0
Origin: FormDev Software GmbH.
URL: https://www.formdev.com/flatlaf/
diff --git a/platform/libs.flatlaf/nbproject/project.properties b/platform/libs.flatlaf/nbproject/project.properties
index ebb714e..eaf091e 100644
--- a/platform/libs.flatlaf/nbproject/project.properties
+++ b/platform/libs.flatlaf/nbproject/project.properties
@@ -20,4 +20,4 @@ javac.compilerargs=-Xlint:unchecked
javac.source=1.8
nbm.target.cluster=platform
-release.external/flatlaf-0.25.1.jar=modules/ext/flatlaf-0.25.1.jar
+release.external/flatlaf-0.26.jar=modules/ext/flatlaf-0.26.jar
diff --git a/platform/libs.flatlaf/nbproject/project.xml b/platform/libs.flatlaf/nbproject/project.xml
index 4f68d57..ca95549 100644
--- a/platform/libs.flatlaf/nbproject/project.xml
+++ b/platform/libs.flatlaf/nbproject/project.xml
@@ -30,8 +30,8 @@
<package>com.formdev.flatlaf.util</package>
</public-packages>
<class-path-extension>
- <runtime-relative-path>ext/flatlaf-0.25.1.jar</runtime-relative-path>
- <binary-origin>external/flatlaf-0.25.1.jar</binary-origin>
+ <runtime-relative-path>ext/flatlaf-0.26.jar</runtime-relative-path>
+ <binary-origin>external/flatlaf-0.26.jar</binary-origin>
</class-path-extension>
</data>
</configuration>
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 00ab257..2adc6bd 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
@@ -120,7 +120,8 @@ nb.core.ui.balloon.defaultGradientStartColor=$ToolTip.background
nb.core.ui.balloon.defaultGradientFinishColor=$ToolTip.background
# QuickSearch
-nb.quicksearch.border=1,1,1,1,@background
+nb.quicksearch.background=$MenuBar.background
+nb.quicksearch.border=1,1,1,1,$MenuBar.background
# popup switcher
nb.popupswitcher.border=1,1,1,1,$PopupMenu.borderColor
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLightLaf.properties b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLightLaf.properties
index 953ce35..d849886 100644
--- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLightLaf.properties
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLightLaf.properties
@@ -61,3 +61,7 @@ SlidingButton.attentionForeground=$ViewTab.attentionForeground
PropSheet.setBackground=darken(@background,10%)
PropSheet.setForeground=@foreground
+
+
+# QuickSearch
+nb.quicksearch.border=1,1,1,1,@background
diff --git a/platform/spi.quicksearch/src/org/netbeans/modules/quicksearch/QuickSearchComboBar.java b/platform/spi.quicksearch/src/org/netbeans/modules/quicksearch/QuickSearchComboBar.java
index 9721727..d60b99a 100644
--- a/platform/spi.quicksearch/src/org/netbeans/modules/quicksearch/QuickSearchComboBar.java
+++ b/platform/spi.quicksearch/src/org/netbeans/modules/quicksearch/QuickSearchComboBar.java
@@ -19,6 +19,7 @@
package org.netbeans.modules.quicksearch;
+import java.awt.Color;
import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -105,6 +106,10 @@ public class QuickSearchComboBar extends AbstractQuickSearchComboBar {
setLayout(new java.awt.GridBagLayout());
+ Color background = UIManager.getColor("nb.quicksearch.background"); //NOI18N
+ if (background != null) {
+ jPanel1.setBackground(background);
+ }
jPanel1.setBorder(getQuickSearchBorder());
jPanel1.setName("jPanel1"); // NOI18N
jPanel1.setLayout(new java.awt.GridBagLayout());
---------------------------------------------------------------------
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