Add Context Menu

sotasan · May 28, 2022 · 8bbbd92 · 8bbbd92
1 parent 4b6fb73
commit 8bbbd92
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "net.pryoscode"
-version = "0.3.6"
+version = "0.3.7"
 
 kotlin {
     jvmToolchain {

diff --git a/src/main/kotlin/net/pryoscode/decompiler/window/container/Code.kt b/src/main/kotlin/net/pryoscode/decompiler/window/container/Code.kt
@@ -70,7 +70,7 @@ class Code(val entry: Entry, private val code: String) : Tab() {
             }
         }
 
-        val menu = ContextMenu()
+        contextMenu = ContextMenu()
         val close = MenuItem("Close")
         val closeOthers = MenuItem("Close Others")
         val closeAll = MenuItem("Close All")
@@ -88,8 +88,7 @@ class Code(val entry: Entry, private val code: String) : Tab() {
             }
         }
         closeAll.setOnAction { Container.tabs.clear() }
-        menu.items.addAll(close, closeOthers, closeAll)
-        contextMenu = menu
+        contextMenu.items.addAll(close, closeOthers, closeAll)
 
         Container.tabs.add(this)
         Container.selectionModel.select(this)

diff --git a/src/main/kotlin/net/pryoscode/decompiler/window/menu/file/File.kt b/src/main/kotlin/net/pryoscode/decompiler/window/menu/file/File.kt
@@ -6,13 +6,15 @@ import net.pryoscode.decompiler.window.menu.file.items.NewWindow
 import net.pryoscode.decompiler.window.menu.file.items.OpenFile
 import java.awt.event.KeyEvent
 import javax.swing.JMenu
+import javax.swing.JSeparator
 
 class File : JMenu("File") {
 
     init {
         mnemonic = KeyEvent.VK_F
         add(OpenFile())
         add(CloseFile())
+        add(JSeparator())
         add(NewWindow())
         add(Exit())
     }

diff --git a/src/main/kotlin/net/pryoscode/decompiler/window/sidebar/Cell.kt b/src/main/kotlin/net/pryoscode/decompiler/window/sidebar/Cell.kt
@@ -1,5 +1,7 @@
 package net.pryoscode.decompiler.window.sidebar
 
+import javafx.scene.control.ContextMenu
+import javafx.scene.control.MenuItem
 import javafx.scene.control.TreeCell
 import javafx.scene.image.ImageView
 import javafx.scene.input.MouseButton
@@ -18,9 +20,16 @@ class Cell : TreeCell<Entry>() {
         if (empty || item == null) {
             text = ""
             graphic = null
+            contextMenu = null
         } else {
             text = item.name
             graphic = ImageView(item.type.icon)
+            if (item.type != Type.ARCHIVE && item.type != Type.PACKAGE && item.type != Type.FILE) {
+                contextMenu = ContextMenu()
+                val open = MenuItem("Open")
+                open.setOnAction { Container.open(item) }
+                contextMenu.items.add(open)
+            }
         }
     }