From 54bd9374c9e8d8d83915bebab8e868344b63c40b Mon Sep 17 00:00:00 2001 From: ghidragon <106987263+ghidragon@users.noreply.github.com> Date: Wed, 18 Dec 2024 13:07:09 -0500 Subject: [PATCH] GP-5097 updated flatlaf jar to 3.5.4 --- Ghidra/Framework/Gui/Module.manifest | 2 +- Ghidra/Framework/Gui/build.gradle | 6 +++--- .../main/java/generic/theme/laf/FlatLookAndFeelManager.java | 4 ---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Ghidra/Framework/Gui/Module.manifest b/Ghidra/Framework/Gui/Module.manifest index 126ac4efcd..75a369fcd4 100644 --- a/Ghidra/Framework/Gui/Module.manifest +++ b/Ghidra/Framework/Gui/Module.manifest @@ -1 +1 @@ -MODULE FILE LICENSE: lib/flatlaf-3.2.1.jar Apache License 2.0 +MODULE FILE LICENSE: lib/flatlaf-3.5.4.jar Apache License 2.0 diff --git a/Ghidra/Framework/Gui/build.gradle b/Ghidra/Framework/Gui/build.gradle index dd8607eb2e..4413521031 100644 --- a/Ghidra/Framework/Gui/build.gradle +++ b/Ghidra/Framework/Gui/build.gradle @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -26,7 +26,7 @@ eclipse.project.name = 'Framework Gui' dependencies { api project(':Generic') - api 'com.formdev:flatlaf:3.2.1' + api 'com.formdev:flatlaf:3.5.4' compileOnly "junit:junit:4.12" diff --git a/Ghidra/Framework/Gui/src/main/java/generic/theme/laf/FlatLookAndFeelManager.java b/Ghidra/Framework/Gui/src/main/java/generic/theme/laf/FlatLookAndFeelManager.java index b16b74aadf..2b729287c8 100644 --- a/Ghidra/Framework/Gui/src/main/java/generic/theme/laf/FlatLookAndFeelManager.java +++ b/Ghidra/Framework/Gui/src/main/java/generic/theme/laf/FlatLookAndFeelManager.java @@ -43,9 +43,5 @@ public class FlatLookAndFeelManager extends LookAndFeelManager { // if "Tree.showDefaultIcons" is false. We want the tree to display folder icons. // UIManager.put("Tree.showDefaultIcons", Boolean.TRUE); - - // This fixes a bug in FlatScrollPaneUI at line 189 (version 3.2.1). This can be removed - // in a future update if that code is fixed. - UIManager.put("ScrollPane.smoothScrolling", Boolean.FALSE); } }