Cynosphere/bcv-vf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #416 from weisJ/darklaf-3.0.0

Browse source 
Update darklaf to version 3.0.0
This commit is contained in:
Konloch 2022-04-20 13:02:16 -07:00 • committed by GitHub
commit c9f8771636
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pom.xml
View file

@ -28,7 +28,7 @@
<commons-io.version>2.11.0</commons-io.version> <commons-io.version>2.11.0</commons-io.version>
<commons-lang3.version>3.12.0</commons-lang3.version> <commons-lang3.version>3.12.0</commons-lang3.version>
<commons-text.version>1.9</commons-text.version> <commons-text.version>1.9</commons-text.version>
<darklaf.version>2.7.3</darklaf.version> <darklaf.version>3.0.0</darklaf.version>
<darklaf-extensions-rsta.version>0.3.4</darklaf-extensions-rsta.version> <darklaf-extensions-rsta.version>0.3.4</darklaf-extensions-rsta.version>
<decompiler-fernflower.version>5.2.1.Final</decompiler-fernflower.version> <decompiler-fernflower.version>5.2.1.Final</decompiler-fernflower.version>
<dex2jar.version>v49</dex2jar.version> <dex2jar.version>v49</dex2jar.version>

3
src/main/java/the/bytecode/club/bytecodeviewer/BytecodeViewer.java
View file

@ -93,9 +93,6 @@ import static the.bytecode.club.bytecodeviewer.Constants.tempDirectory;
* + Anything using blindlySearchForClassNode() should instead search through the resource container search function * + Anything using blindlySearchForClassNode() should instead search through the resource container search function
* + BCV's classLoader should be destroyed each time a resource is added or removed * + BCV's classLoader should be destroyed each time a resource is added or removed
* *
* TODO DarkLAF Specific Bugs:
* + JMenuBar can only be displayed on a JFrame, a work around is needed for this (Partially solved)
*
* TODO IN-PROGRESS: * TODO IN-PROGRESS:
* + Resource Exporter/Save/Decompile As Zip needs to be rewritten * + Resource Exporter/Save/Decompile As Zip needs to be rewritten
* + Finish dragging code * + Finish dragging code

5
src/main/java/the/bytecode/club/bytecodeviewer/gui/components/VisibleComponent.java
View file

@ -1,10 +1,9 @@
package the.bytecode.club.bytecodeviewer.gui.components; package the.bytecode.club.bytecodeviewer.gui.components;
import com.github.weisj.darklaf.icons.ThemedSVGIcon; import com.github.weisj.darklaf.iconset.AllIcons;
import javax.swing.BorderFactory; import javax.swing.BorderFactory;
import javax.swing.JInternalFrame; import javax.swing.JInternalFrame;
import the.bytecode.club.bytecodeviewer.Configuration; import the.bytecode.club.bytecodeviewer.Configuration;
import the.bytecode.club.bytecodeviewer.gui.resourceviewer.Workspace;
import the.bytecode.club.bytecodeviewer.gui.theme.LAFTheme; import the.bytecode.club.bytecodeviewer.gui.theme.LAFTheme;
import the.bytecode.club.bytecodeviewer.resources.IconResources; import the.bytecode.club.bytecodeviewer.resources.IconResources;
@ -55,7 +54,7 @@ public abstract class VisibleComponent extends JInternalFrame
{ {
try { try {
if(Configuration.showDarkLAFComponentIcons) if(Configuration.showDarkLAFComponentIcons)
setFrameIcon(new ThemedSVGIcon(Workspace.class.getResource("/com/github/weisj/darklaf/icons/frame/frame.svg").toURI(), 16, 16)); setFrameIcon(AllIcons.Window.Frame.get(16, 16));
else else
setFrameIcon(IconResources.jarIcon); setFrameIcon(IconResources.jarIcon);
} catch (Exception e) { } catch (Exception e) {

9
src/main/java/the/bytecode/club/bytecodeviewer/plugin/PluginWriter.java
View file

@ -133,14 +133,7 @@ public class PluginWriter extends JFrame
p.add(p2, BorderLayout.NORTH); p.add(p2, BorderLayout.NORTH);
p.add(component, BorderLayout.CENTER); p.add(component, BorderLayout.CENTER);
JMenuBar menuBar = getJMenuBar(); p2.add(getJMenuBar(), BorderLayout.CENTER);
// As the Darklaf windows decorations steal the menu bar from the frame
// it sets the preferred size to (0,0). Because we want to steal the menu bar ourselves.
// we have to revert this change.
// Remove when https://github.com/weisJ/darklaf/issues/258 is fixed and available in a
// release.
menuBar.setPreferredSize(null);
p2.add(menuBar, BorderLayout.CENTER);
ComponentViewer.addComponentAsTab(pluginName, p); ComponentViewer.addComponentAsTab(pluginName, p);
} }