Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix suggestions popup positioning and tag panel styling #934

Merged
merged 1 commit into from
Mar 24, 2025
Merged

Fix suggestions popup positioning and tag panel styling #934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions src/main/kotlin/ee/carlrobert/codegpt/ui/textarea/header/tag/TagPanel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@ import com.intellij.util.IconUtil
import com.intellij.util.ui.JBUI
import ee.carlrobert.codegpt.ui.textarea.PromptTextField
import ee.carlrobert.codegpt.ui.textarea.header.PaintUtil
import java.awt.*
import java.awt.Cursor
import java.awt.Dimension
import java.awt.Graphics
import java.awt.GridBagConstraints
import java.awt.GridBagLayout
import javax.swing.BorderFactory
import javax.swing.Icon
import javax.swing.JButton
import javax.swing.JToggleButton
Expand Down Expand Up @@ -46,7 +51,7 @@ abstract class TagPanel(
val closeButtonWidth = if (closeButton.isVisible) closeButton.preferredSize.width else 0
return Dimension(
label.preferredSize.width + closeButtonWidth + insets.left + insets.right,
20
JBUI.scale(20)
)
}

Expand Down Expand Up @@ -134,8 +139,13 @@ abstract class TagPanel(
onClose()
}

preferredSize = Dimension(Close.iconWidth, Close.iconHeight)
border = JBUI.Borders.emptyLeft(4)
val iconSize = Dimension(Close.iconWidth, Close.iconHeight)
preferredSize = iconSize
minimumSize = iconSize
maximumSize = iconSize

border = BorderFactory.createEmptyBorder(0, 4, 0, 4)

isContentAreaFilled = false
toolTipText = "Remove"
rolloverIcon = AllIcons.Actions.CloseHovered
Expand Down
39 changes: 30 additions & 9 deletions src/main/kotlin/ee/carlrobert/codegpt/ui/textarea/suggestion/SuggestionsPopupManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,20 @@ import com.intellij.openapi.project.Project
import com.intellij.openapi.ui.popup.JBPopup
import com.intellij.vcsUtil.showAbove
import ee.carlrobert.codegpt.ui.textarea.UserInputPanel
import ee.carlrobert.codegpt.ui.textarea.suggestion.item.*
import kotlinx.coroutines.*
import ee.carlrobert.codegpt.ui.textarea.suggestion.item.DocumentationSuggestionGroupItem
import ee.carlrobert.codegpt.ui.textarea.suggestion.item.FileSuggestionGroupItem
import ee.carlrobert.codegpt.ui.textarea.suggestion.item.FolderSuggestionGroupItem
import ee.carlrobert.codegpt.ui.textarea.suggestion.item.GitSuggestionGroupItem
import ee.carlrobert.codegpt.ui.textarea.suggestion.item.PersonaSuggestionGroupItem
import ee.carlrobert.codegpt.ui.textarea.suggestion.item.SuggestionActionItem
import ee.carlrobert.codegpt.ui.textarea.suggestion.item.SuggestionGroupItem
import ee.carlrobert.codegpt.ui.textarea.suggestion.item.SuggestionItem
import ee.carlrobert.codegpt.ui.textarea.suggestion.item.WebSearchActionItem
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import java.awt.Dimension
import java.awt.Point
import javax.swing.DefaultListModel
Expand All @@ -20,7 +32,7 @@ class SuggestionsPopupManager(
private val scope = CoroutineScope(Dispatchers.Default + SupervisorJob())
private var selectedActionGroup: SuggestionGroupItem? = null
private var popup: JBPopup? = null
private var originalLocation: Point? = null

private val listModel = DefaultListModel<SuggestionItem>().apply {
addListDataListener(object : ListDataListener {
override fun intervalAdded(e: ListDataEvent) = adjustPopupSize()
Expand All @@ -44,12 +56,12 @@ class SuggestionsPopupManager(
popup = SuggestionsPopupBuilder()
.setPreferableFocusComponent(component)
.setOnCancel {
originalLocation = null
true
}
.build(list)

popup?.showAbove(userInputPanel)
originalLocation = userInputPanel.locationOnScreen

reset(true)
selectNext()
}
Expand Down Expand Up @@ -117,9 +129,18 @@ class SuggestionsPopupManager(
list.repaint()

popup?.size = Dimension(list.preferredSize.width, list.preferredSize.height + 32)
originalLocation?.let { original ->
val newY = original.y - list.preferredSize.height - 32
popup?.setLocation(Point(original.x, maxOf(newY, 0)))
}

val bounds = userInputPanel.bounds
val locationOnScreen = userInputPanel.locationOnScreen

val deviceConfiguration = userInputPanel.graphicsConfiguration
val screenBounds = deviceConfiguration.bounds

val popupSize = popup?.size ?: Dimension(0, 0)
val newY = locationOnScreen.y - popupSize.height

val adjustedY = if (newY < screenBounds.y) locationOnScreen.y + bounds.height else newY

popup?.setLocation(Point(locationOnScreen.x, adjustedY))
}
}
Loading