Add option for switching between Popup and Dialog view (#27)

Author: srwi

src/main/kotlin/com/github/srwi/pixellens/actions/ViewAsImageAction.kt

@@ -1,7 +1,7 @@
 package com.github.srwi.pixellens.actions
 
 import com.github.srwi.pixellens.UserSettings
-import com.github.srwi.pixellens.dialogs.ImageViewer
+import com.github.srwi.pixellens.dialogs.ImageViewerFactory
 import com.github.srwi.pixellens.imageProviders.ImageProviderFactory
 import com.intellij.notification.Notification
 import com.intellij.notification.NotificationType
@@ -33,7 +33,7 @@ class ViewAsImageAction : AnAction() {
                     batch.data.grayscaleColormap = UserSettings.applyColormapEnabled
 
                     SwingUtilities.invokeLater {
-                        ImageViewer(project, batch).show()
+                        ImageViewerFactory.show(project, batch)
                     }
                 } catch (e: InterruptedException) {
                     // Operation cancelled by user

src/main/kotlin/com/github/srwi/pixellens/dialogs/ImageViewer.kt

@@ -10,8 +10,6 @@ import com.intellij.openapi.actionSystem.ActionToolbar
 import com.intellij.openapi.actionSystem.DataProvider
 import com.intellij.openapi.actionSystem.impl.ActionButton
 import com.intellij.openapi.editor.colors.EditorColorsManager
-import com.intellij.openapi.project.Project
-import com.intellij.openapi.ui.DialogWrapper
 import com.intellij.ui.GotItTooltip
 import com.intellij.ui.JBColor
 import com.intellij.ui.PopupHandler
@@ -35,11 +33,10 @@ import java.awt.Point
 import java.awt.event.*
 import java.awt.image.BufferedImage
 import javax.swing.*
-import javax.swing.border.Border
 import kotlin.coroutines.cancellation.CancellationException
 import kotlin.math.max
 
-class ImageViewer(project: Project, val batch: Batch) : DialogWrapper(project), ImageComponentDecorator, DataProvider, Disposable {
+open class ImageViewer(val batch: Batch) : ImageComponentDecorator, DataProvider, Disposable {
 
     var normalizeEnabled: Boolean = batch.data.normalized
         set(value) {
@@ -114,9 +111,6 @@ class ImageViewer(project: Project, val batch: Batch) : DialogWrapper(project),
     private lateinit var sidebarToolbar: ActionToolbar
 
     init {
-        title = batch.expression
-        isModal = false
-
         val editorOptions = OptionsManager.getInstance().options.editorOptions
         val chessboardOptions = editorOptions.transparencyChessboardOptions
         val gridOptions = editorOptions.gridOptions
@@ -129,8 +123,6 @@ class ImageViewer(project: Project, val batch: Batch) : DialogWrapper(project),
         imageComponent.gridLineColor = gridOptions.lineColor
         imageComponent.isBorderVisible = false
 
-        init()
-
         updateImage()
     }
 
@@ -198,30 +190,34 @@ class ImageViewer(project: Project, val batch: Batch) : DialogWrapper(project),
         }
     }
 
-    override fun createCenterPanel(): JComponent {
-        val contentPanel = JPanel(BorderLayout()).apply {
+    fun createContentPanel(): JComponent {
+        return JPanel().apply {
+            layout = BorderLayout()
+            add(createNorthPanel(), BorderLayout.NORTH)
+            add(createCenterPanel(), BorderLayout.CENTER)
+            add(createSouthPanel(), BorderLayout.SOUTH)
+        }
+    }
+
+    private fun createCenterPanel(): JComponent {
+        return JPanel(BorderLayout()).apply {
             border = BorderFactory.createEmptyBorder()
             add(createImagePanel(), BorderLayout.CENTER)
             add(createRightPanel(), BorderLayout.EAST)
             minimumSize = Dimension(0, 400)
         }
-        return contentPanel
-    }
-
-    override fun createContentPaneBorder(): Border {
-        return JBUI.Borders.empty()
     }
 
-    override fun createNorthPanel(): JComponent {
+    private fun createNorthPanel(): JComponent {
         val actionManager = ActionManager.getInstance()
 
         val actionGroup = actionManager.getAction("MainToolbarActionGroup") as ActionGroup
         mainToolbar = actionManager.createActionToolbar("MainToolbar", actionGroup, true)
-        mainToolbar.apply { setReservePlaceAutoPopupIcon(false) }
+        mainToolbar.apply { isReservePlaceAutoPopupIcon = false }
 
         val sidebarToggleGroup = actionManager.getAction("SidebarToolbarActionGroup") as ActionGroup
         sidebarToolbar = actionManager.createActionToolbar("SidebarToolbar", sidebarToggleGroup, true)
-        sidebarToolbar.apply { setReservePlaceAutoPopupIcon(false) }
+        sidebarToolbar.apply { isReservePlaceAutoPopupIcon = false }
 
         val twoSideComponent = TwoSideComponent(mainToolbar.component, sidebarToolbar.component)
 
@@ -232,7 +228,7 @@ class ImageViewer(project: Project, val batch: Batch) : DialogWrapper(project),
         }
     }
 
-    override fun createSouthPanel(): JComponent {
+    private fun createSouthPanel(): JComponent {
         val shapeLabel = JLabel(batch.shape.joinToString("x")).apply {
             border = JBUI.Borders.empty(5)
         }
@@ -432,15 +428,12 @@ class ImageViewer(project: Project, val batch: Batch) : DialogWrapper(project),
         return internalZoomModel
     }
 
-    override fun getDimensionServiceKey() = "com.github.srwi.pixellens.dialogs.ImageViewer"
-
     override fun dispose() {
         updateJob?.cancel()
         imageComponent.removeMouseMotionListener(mouseMotionAdapter)
         imageComponent.removeMouseListener(mouseExitAdapter)
         imageComponent.removeMouseListener(editorActionPopupAdapter)
         scrollPane.removeMouseWheelListener(editorMouseWheelAdapter)
         scrollPane.removeComponentListener(editorResizeAdapter)
-        super.dispose()
     }
 }

src/main/kotlin/com/github/srwi/pixellens/dialogs/ImageViewerDialog.kt

@@ -0,0 +1,51 @@
+package com.github.srwi.pixellens.dialogs
+
+import com.github.srwi.pixellens.data.Batch
+import com.intellij.openapi.actionSystem.DataProvider
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.ui.DialogWrapper
+import com.intellij.util.ui.JBUI
+import org.intellij.images.ui.ImageComponentDecorator
+import javax.swing.JComponent
+import javax.swing.border.Border
+
+class ImageViewerDialog(project: Project, batch: Batch) : DialogWrapper(project), DataProvider {
+    val imageViewer = ImageViewer(batch)
+
+    init {
+        title = batch.expression
+        isModal = false
+
+        init()
+    }
+
+    override fun createCenterPanel(): JComponent {
+        return imageViewer.createContentPanel()
+    }
+
+    override fun createNorthPanel(): JComponent? {
+        return null
+    }
+
+    override fun createSouthPanel(): JComponent? {
+        return null
+    }
+
+    override fun createContentPaneBorder(): Border {
+        return JBUI.Borders.empty()
+    }
+
+    override fun getDimensionServiceKey() = "com.github.srwi.pixellens.dialogs.ImageViewerDialog"
+
+    override fun getData(dataId: String): Any? {
+        if (ImageComponentDecorator.DATA_KEY.`is`(dataId)) {
+            return imageViewer
+        }
+        return null
+    }
+
+    override fun dispose() {
+        imageViewer.dispose()
+        super.dispose()
+    }
+}

src/main/kotlin/com/github/srwi/pixellens/dialogs/ImageViewerFactory.kt

@@ -0,0 +1,20 @@
+package com.github.srwi.pixellens.dialogs
+
+import com.github.srwi.pixellens.data.Batch
+import com.github.srwi.pixellens.settings.PixelLensSettingsState
+import com.intellij.openapi.project.Project
+
+enum class ViewerType {
+    Dialog,
+    Popup
+}
+
+object ImageViewerFactory {
+    fun show(project: Project, batch: Batch) {
+        return if (PixelLensSettingsState.instance.usePopupWindow) {
+            ImageViewerPopup(project, batch).show()
+        } else {
+            ImageViewerDialog(project, batch).show()
+        }
+    }
+}

src/main/kotlin/com/github/srwi/pixellens/dialogs/ImageViewerPopup.kt

@@ -0,0 +1,48 @@
+package com.github.srwi.pixellens.dialogs
+
+import com.github.srwi.pixellens.data.Batch
+import com.intellij.openapi.Disposable
+import com.intellij.openapi.actionSystem.DataProvider
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.ui.popup.JBPopup
+import com.intellij.openapi.ui.popup.JBPopupFactory
+import org.intellij.images.ui.ImageComponentDecorator
+
+class ImageViewerPopup(val project: Project, batch: Batch) : DataProvider, Disposable {
+    val imageViewer = ImageViewer(batch)
+    private val popup: JBPopup
+
+    init {
+        val contentPanel = imageViewer.createContentPanel()
+        popup = JBPopupFactory.getInstance()
+            .createComponentPopupBuilder(contentPanel, null)
+            .setTitle(batch.expression)
+            .setResizable(true)
+            .setMovable(true)
+            .setProject(project)
+            .setDimensionServiceKey(project, "com.github.srwi.pixellens.dialogs.ImageViewerPopup", true)
+            .setCancelOnClickOutside(true)
+            .setCancelOnWindowDeactivation(true)
+            .setFocusable(true)
+            .setRequestFocus(true)
+            .createPopup()
+        popup.setMinimumSize(contentPanel.minimumSize)
+        popup.setDataProvider(this)
+    }
+
+    fun show() {
+        popup.showInFocusCenter()
+    }
+
+    override fun getData(dataId: String): Any? {
+        if (ImageComponentDecorator.DATA_KEY.`is`(dataId)) {
+            return imageViewer
+        }
+        return null
+    }
+
+    override fun dispose() {
+        imageViewer.dispose()
+        popup.dispose()
+    }
+}

src/main/kotlin/com/github/srwi/pixellens/settings/PixelLensSettingsConfigurable.kt

@@ -1,6 +1,8 @@
 package com.github.srwi.pixellens.settings
 
+import com.github.srwi.pixellens.dialogs.ViewerType
 import com.intellij.openapi.options.Configurable
+import com.intellij.openapi.ui.ComboBox
 import com.intellij.ui.TitledSeparator
 import com.intellij.util.ui.FormBuilder
 import javax.swing.JCheckBox
@@ -9,11 +11,14 @@ import javax.swing.JPanel
 
 class PixelLensSettingsConfigurable : Configurable {
     private var evaluateCheckBox: JCheckBox? = null
+    private var viewerTypeComboBox: ComboBox<ViewerType>? = null
 
     override fun createComponent(): JComponent? {
         evaluateCheckBox = JCheckBox("Always use evaluate transmission (slower)")
+        viewerTypeComboBox = ComboBox(ViewerType.entries.toTypedArray())
 
         return FormBuilder.createFormBuilder()
+            .addLabeledComponent("Viewer type:", viewerTypeComboBox!!)
             .addComponent(TitledSeparator("Advanced"))
             .setFormLeftIndent(20)
             .addComponent(evaluateCheckBox!!, 1)
@@ -23,17 +28,20 @@ class PixelLensSettingsConfigurable : Configurable {
 
     override fun isModified(): Boolean {
         val settings = PixelLensSettingsState.instance
-        return settings.alwaysUseEvaluateTransmission != evaluateCheckBox!!.isSelected
+        return settings.alwaysUseEvaluateTransmission != evaluateCheckBox!!.isSelected ||
+                settings.usePopupWindow != (viewerTypeComboBox!!.selectedItem == ViewerType.Popup)
     }
 
     override fun apply() {
         val settings = PixelLensSettingsState.instance
         settings.alwaysUseEvaluateTransmission = evaluateCheckBox!!.isSelected
+        settings.usePopupWindow = (viewerTypeComboBox!!.selectedItem == ViewerType.Popup)
     }
 
     override fun reset() {
         val settings = PixelLensSettingsState.instance
         evaluateCheckBox!!.isSelected = settings.alwaysUseEvaluateTransmission
+        viewerTypeComboBox!!.selectedItem = if (settings.usePopupWindow) ViewerType.Popup else ViewerType.Dialog
     }
 
     override fun getDisplayName(): String {

src/main/kotlin/com/github/srwi/pixellens/settings/PixelLensSettingsState.kt

@@ -8,13 +8,15 @@ import com.intellij.openapi.components.Storage
 @State(name = "PixelLensSettings", storages = [Storage("PixelLensSettings.xml")])
 class PixelLensSettingsState : PersistentStateComponent<PixelLensSettingsState> {
     var alwaysUseEvaluateTransmission: Boolean = false
+    var usePopupWindow: Boolean = false
 
     override fun getState(): PixelLensSettingsState {
         return this
     }
 
     override fun loadState(state: PixelLensSettingsState) {
         this.alwaysUseEvaluateTransmission = state.alwaysUseEvaluateTransmission
+        this.usePopupWindow = state.usePopupWindow
     }
 
     companion object {