Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-12 23:23:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-4973_ryanmkurtz_default-themes'

Browse Source
This commit is contained in:
Ryan Kurtz 2024-10-07 06:30:36 -04:00
commit b8369d242a
2 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Ghidra/Framework/Gui/src/main/java/generic/theme/LafType.java
View File

@ -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.
@ -153,16 +153,11 @@ public enum LafType {
*/
public static LafType getDefaultLookAndFeel() {
OperatingSystem OS = Platform.CURRENT_PLATFORM.getOperatingSystem();
switch (OS) {
case MAC_OS_X:
return MAC;
case WINDOWS:
return WINDOWS;
case LINUX:
case UNSUPPORTED:
default:
return NIMBUS;
}
return switch (OS) {
case MAC_OS_X -> MAC;
case WINDOWS -> WINDOWS;
default -> FLAT_LIGHT;
};
}
@Override

15
Ghidra/Framework/Gui/src/main/java/generic/theme/ThemeManager.java
View File

@ -616,16 +616,11 @@ public abstract class ThemeManager {
*/
public static GTheme getDefaultTheme() {
OperatingSystem OS = Platform.CURRENT_PLATFORM.getOperatingSystem();
switch (OS) {
case MAC_OS_X:
return new MacTheme();
case WINDOWS:
return new WindowsTheme();
case LINUX:
case UNSUPPORTED:
default:
return new NimbusTheme();
}
return switch (OS) {
case MAC_OS_X -> new MacTheme();
case WINDOWS -> new WindowsTheme();
default -> new FlatLightTheme();
};
}
/**