Search position configuration (#101)

* Add options for search field location

* Remove unnecessary private sets

* Remove unnecessary private

* Use common GridConstraint

* Clean up FuzzyFinderComponent

* Reset window location and split position when changing the search position

* Fix incorrect setter and tests

* Fix dimension key shadow bug

* Disable reset window button when pressed

* Move popup settings to the correct spot

* Use a single component for dimensions

* Add tests that check for window reset functionality

* Make settings cleaner

* Update email

* Fix default alignment

Author: MituuZ

build.gradle.kts

@@ -10,7 +10,7 @@ plugins {
 }
 
 // Use same version and group for the jar and the plugin
-val currentVersion = "1.4.2"
+val currentVersion = "1.5.0"
 val myGroup = "com.mituuz"
 version = currentVersion
 group = myGroup
@@ -80,8 +80,16 @@ intellijPlatform {
 
     changeNotes = """
     <h2>Version $currentVersion</h2>
-    - Make highlighting speed faster when highlighting sequential matches<br>
-    - Init JMH benchmarking to be used in the future<br>
+    <ul>
+      <li>Allow configuring the default finder popup size</li>
+      <li>Fix a bug where the correct dimension key wasn't used</li>
+      <li>Enable changing the search field location on the popup
+        <ul>
+          <li>Top, bottom, left and right</li>
+        </ul>
+      </li>
+      <li>Improve mover popup's default size</li>
+    </ul>    
     """.trimIndent()
 
     ideaVersion {

changelog.md

@@ -1,4 +1,11 @@
 # Changelog
+## Version 1.5.0
+- Allow configuring the default finder popup size
+- Fix a bug where the correct dimension key wasn't used
+- Enable changing the search field location on the popup
+  - Top, bottom, left and right
+- Improve mover popup's default size
+
 ## Version 1.4.2
 - Make highlighting speed faster when highlighting sequential matches
 - Init JMH benchmarking to be used in the future

readme.md

@@ -64,10 +64,11 @@ map <Leader>mf <action>(com.mituuz.fuzzier.FuzzyMover)
 The plugin can be installed from the [JetBrains Marketplace](https://plugins.jetbrains.com/plugin/23451-fuzzier)
 
 ## Contact
-I can be reached from <mituuuuz@hotmail.com>
+I can be reached at <mitja@mituuz.com>.
 
 ## Contributing
 I have a tendency to make some larger refactors from time to time, 
 so I would appreciate it if you would open an issue before starting to work on a feature or a bug fix.
 
-I'll help as I can and can give guidance on how to implement the feature or fix the bug, but cannot guarantee that I will accept the PR.
+I'll help as I can and can give guidance on how to implement the feature or fix the bug, 
+but cannot guarantee that I will accept the PR.

src/main/kotlin/com/mituuz/fuzzier/Fuzzier.kt

@@ -89,8 +89,8 @@ open class Fuzzier : FuzzyAction() {
         }
     }
 
-    override fun createPopup(): JBPopup {
-        val popup = getInitialPopup()
+    override fun createPopup(screenDimensionKey: String): JBPopup {
+        val popup = getInitialPopup(screenDimensionKey)
 
         popup.addListener(object : JBPopupListener {
             override fun onClosed(event: LightweightWindowEvent) {

src/main/kotlin/com/mituuz/fuzzier/FuzzyAction.kt

@@ -82,16 +82,16 @@ abstract class FuzzyAction : AnAction() {
 
     abstract fun runAction(project: Project, actionEvent: AnActionEvent)
 
-    abstract fun createPopup(): JBPopup
+    abstract fun createPopup(screenDimensionKey: String): JBPopup
 
-    fun getInitialPopup(): JBPopup {
+    fun getInitialPopup(screenDimensionKey: String): JBPopup {
         return JBPopupFactory
             .getInstance()
             .createComponentPopupBuilder(component, component.searchField)
             .setFocusable(true)
             .setRequestFocus(true)
             .setResizable(true)
-            .setDimensionServiceKey(null, dimensionKey, true)
+            .setDimensionServiceKey(null, screenDimensionKey, true)
             .setTitle(popupTitle)
             .setMovable(true)
             .setShowBorder(true)
@@ -102,18 +102,16 @@ abstract class FuzzyAction : AnAction() {
         val mainWindow = WindowManager.getInstance().getIdeFrame(project)?.component
         mainWindow?.let {
             val screenBounds = it.graphicsConfiguration.bounds
-            val dimensionKey = createDimensionKey(dimensionKey, screenBounds)
-            popup = createPopup()
+            val screenDimensionKey = createDimensionKey(dimensionKey, screenBounds)
 
             if (globalState.resetWindow) {
-                DimensionService.getInstance().setSize(dimensionKey, null, null)
-                DimensionService.getInstance().setLocation(dimensionKey, null, null)
+                DimensionService.getInstance().setSize(screenDimensionKey, component.preferredSize, null)
+                DimensionService.getInstance().setLocation(screenDimensionKey, null, null)
                 globalState.resetWindow = false
             }
 
-            val centerX = screenBounds.x + screenBounds.width / 2
-            val centerY = screenBounds.y + screenBounds.height / 2
-            popup.showInScreenCoordinates(it, Point(centerX, centerY))
+            popup = createPopup(screenDimensionKey)
+            popup.showInCenterOf(it)
         }
     }
 

src/main/kotlin/com/mituuz/fuzzier/FuzzyMover.kt

@@ -77,8 +77,8 @@ class FuzzyMover : FuzzyAction() {
         }
     }
 
-    override fun createPopup(): JBPopup {
-        val popup = getInitialPopup()
+    override fun createPopup(screenDimensionKey: String): JBPopup {
+        val popup = getInitialPopup(screenDimensionKey)
 
         popup.addListener(object : JBPopupListener {
             override fun onClosed(event: LightweightWindowEvent) {

src/main/kotlin/com/mituuz/fuzzier/components/FuzzierGlobalSettingsComponent.kt

@@ -1,3 +1,26 @@
+/*
+MIT License
+
+Copyright (c) 2024 Mitja Leino
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
 package com.mituuz.fuzzier.components
 
 import com.intellij.openapi.components.service
@@ -9,7 +32,10 @@ import com.intellij.util.ui.FormBuilder
 import com.mituuz.fuzzier.entities.FuzzyContainer.FilenameType
 import com.mituuz.fuzzier.settings.FuzzierGlobalSettingsService
 import com.mituuz.fuzzier.settings.FuzzierGlobalSettingsService.RecentFilesMode
+import com.mituuz.fuzzier.settings.FuzzierGlobalSettingsService.SearchPosition
 import java.awt.Component
+import javax.swing.Box
+import javax.swing.BoxLayout
 import javax.swing.DefaultListCellRenderer
 import javax.swing.JButton
 import javax.swing.JLabel
@@ -37,6 +63,10 @@ class FuzzierGlobalSettingsComponent {
         """.trimIndent(),
         false)
 
+
+    /////////////////////////////////////////////////////////////////
+    // Popup styling and configuration
+    /////////////////////////////////////////////////////////////////
     val filenameTypeSelector = SettingsComponent(ComboBox<FilenameType>(), "Filename type",
         """
             Controls how the filename is shown on the file search and selector popups.<br><br>
@@ -73,6 +103,28 @@ class FuzzierGlobalSettingsComponent {
         """.trimIndent(),
         false)
 
+    val dimensionComponent = JPanel().apply {
+        layout = BoxLayout(this, BoxLayout.X_AXIS)
+        add(JBLabel("Width: "))
+        add(JBIntSpinner(700, 100, 4000))
+        add(Box.createHorizontalStrut(10))
+        add(JBLabel("Height: "))
+        add(JBIntSpinner(400, 100, 4000))
+    }
+    val defaultDimension = SettingsComponent(dimensionComponent, "Default dimensions",
+        """
+            Default dimensions for the finder popup. Affects reset window behaviour.<br><br>
+            Min: 100, Max: 4000
+        """.trimIndent(),
+        false)
+
+    val searchPosition = SettingsComponent(ComboBox<SearchPosition>(), "Search bar location",
+        """
+            Controls where the search bar is located on the popup.
+        """.trimIndent(),
+        false)
+
+
     val fileListLimit = SettingsComponent(JBIntSpinner(50, 1, 5000), "File list limit",
         """
             Controls how many files are shown and listed on the popup.
@@ -159,23 +211,25 @@ class FuzzierGlobalSettingsComponent {
     init {
         setupComponents()
         jPanel = FormBuilder.createFormBuilder()
-            .addComponent(JBLabel("<html><strong>General settings</strong></html>"))
+            .addComponent(JBLabel("<html><h2>General settings</h2></html>"))
             .addComponent(newTabSelect)
             .addComponent(recentFileModeSelector)
             .addComponent(prioritizeShortDirs)
             .addComponent(debounceTimerValue)
             .addComponent(fileListLimit)
 
             .addSeparator()
-            .addComponent(JBLabel("<html><strong>Popup styling</strong></html>"))
+            .addComponent(JBLabel("<html><h2>Popup styling</h2></html>"))
             .addComponent(filenameTypeSelector)
             .addComponent(highlightFilename)
-            .addComponent(fileListFontSize)
+            .addComponent(searchPosition)
+            .addComponent(defaultDimension)
             .addComponent(previewFontSize)
+            .addComponent(fileListFontSize)
             .addComponent(fileListSpacing)
 
             .addSeparator()
-            .addComponent(JBLabel("<html><strong>Match settings</strong></html>"))
+            .addComponent(JBLabel("<html><h2>Match settings</h2></html>"))
             .addComponent(tolerance)
             .addComponent(multiMatchActive)
             .addComponent(matchWeightSingleChar)
@@ -184,11 +238,13 @@ class FuzzierGlobalSettingsComponent {
             .addComponent(matchWeightFilename)
 
             .addSeparator()
+            .addComponent(JBLabel("<html><h2>Test bench</h2></html>"))
             .addComponent(startTestBench)
             .addComponent(testBench)
             .addComponentFillVertically(JPanel(), 0)
 
             .addSeparator()
+            .addComponent(JBLabel("<html><h2>Reset window</h2></html>"))
             .addComponent(resetWindowDimension)
             .panel
     }
@@ -200,6 +256,8 @@ class FuzzierGlobalSettingsComponent {
         }
         resetWindowDimension.addActionListener {
             service<FuzzierGlobalSettingsService>().state.resetWindow = true
+            // Disable the button to indicate that the press was registered
+            resetWindowDimension.isEnabled = false
         }
 
         recentFileModeSelector.getRecentFilesTypeComboBox().renderer = object : DefaultListCellRenderer() {
@@ -217,6 +275,24 @@ class FuzzierGlobalSettingsComponent {
             recentFileModeSelector.getRecentFilesTypeComboBox().addItem(recentFilesMode)
         }
 
+        searchPosition.getSearchPositionComboBox().renderer = object : DefaultListCellRenderer() {
+            override fun getListCellRendererComponent(
+                list: JList<*>?,
+                value: Any?,
+                index: Int,
+                isSelected: Boolean,
+                cellHasFocus: Boolean
+            ): Component? {
+                val renderer = super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus) as JLabel
+                val position = value as SearchPosition
+                renderer.text = position.text
+                return renderer
+            }
+        }
+        for (sp in SearchPosition.entries) {
+            searchPosition.getSearchPositionComboBox().addItem(sp)
+        }
+
         filenameTypeSelector.getFilenameTypeComboBox().renderer = object : DefaultListCellRenderer() {
             override fun getListCellRendererComponent(
                 list: JList<*>?,