This is an automated email from the ASF dual-hosted git repository.

neilcsmith 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 2b4ce37f3e Update FlatLaf from 2.1 to 2.3
     new 7a31517d05 Merge pull request #4298 from DevCharly/flatlaf-2.3
2b4ce37f3e is described below

commit 2b4ce37f3eec16f9ba0c2648aa409c640ed842b2
Author: Karl Tauber <[email protected]>
AuthorDate: Wed Jun 29 17:34:36 2022 +0200

    Update FlatLaf from 2.1 to 2.3
---
 platform/libs.flatlaf/external/binaries-list                          | 2 +-
 .../external/{flatlaf-2.1-license.txt => flatlaf-2.3-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             | 2 ++
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/platform/libs.flatlaf/external/binaries-list 
b/platform/libs.flatlaf/external/binaries-list
index 1d1ddb4d72..a8f9a4bfbc 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.
 
-D425A89164BB82E1967F84B6FD3EFF5FF9F60ECD com.formdev:flatlaf:2.1
+D7A77B74A49FC9705199426FFA73BD67ACF06306 com.formdev:flatlaf:2.3
diff --git a/platform/libs.flatlaf/external/flatlaf-2.1-license.txt 
b/platform/libs.flatlaf/external/flatlaf-2.3-license.txt
similarity index 99%
rename from platform/libs.flatlaf/external/flatlaf-2.1-license.txt
rename to platform/libs.flatlaf/external/flatlaf-2.3-license.txt
index 7ed2c0a2b7..1735104d6c 100644
--- a/platform/libs.flatlaf/external/flatlaf-2.1-license.txt
+++ b/platform/libs.flatlaf/external/flatlaf-2.3-license.txt
@@ -1,7 +1,7 @@
 Name: FlatLaf Look and Feel
 Description: FlatLaf Look and Feel
-Version: 2.1
-Files: flatlaf-2.1.jar
+Version: 2.3
+Files: flatlaf-2.3.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 27df04db96..0ab3579b94 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-2.1.jar=modules/ext/flatlaf-2.1.jar
+release.external/flatlaf-2.3.jar=modules/ext/flatlaf-2.3.jar
diff --git a/platform/libs.flatlaf/nbproject/project.xml 
b/platform/libs.flatlaf/nbproject/project.xml
index 5dbda89e20..09ad168e1e 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-2.1.jar</runtime-relative-path>
-                <binary-origin>external/flatlaf-2.1.jar</binary-origin>
+                
<runtime-relative-path>ext/flatlaf-2.3.jar</runtime-relative-path>
+                <binary-origin>external/flatlaf-2.3.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 4d1dbb762b..f199cc3751 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
@@ -28,6 +28,8 @@ controlShadow=$Component.borderColor
 # hide grip in divider
 SplitPaneDivider.style = plain
 
+TabbedPane.inactiveUnderlineColor = $EditorTab.inactiveUnderlineColor
+
 
 #---- TabbedContainer ----
 


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists

Reply via email to