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: correct popup position #243

Merged
merged 1 commit into from
Jan 3, 2025
+10 −4
Merged

fix: correct popup position #243

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
14 changes: 10 additions & 4 deletions src/main/kotlin/com/vaadin/plugin/ui/VaadinStatusBarWidget.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package com.vaadin.plugin.ui
import com.intellij.openapi.project.DumbService
import com.intellij.openapi.project.Project
import com.intellij.openapi.ui.popup.JBPopupFactory
import com.intellij.openapi.util.Disposer
import com.intellij.openapi.wm.StatusBarWidget
import com.intellij.openapi.wm.WindowManager
import com.intellij.ui.IconManager
Expand All @@ -13,6 +14,7 @@ import com.intellij.util.ui.UIUtil
import com.vaadin.plugin.copilot.CopilotPluginUtil
import com.vaadin.plugin.utils.VaadinIcons
import com.vaadin.plugin.utils.hasEndpoints
import java.awt.Point
import java.awt.event.MouseEvent
import javax.swing.Icon

Expand Down Expand Up @@ -55,19 +57,23 @@ class VaadinStatusBarWidget(private val project: Project) : StatusBarWidget, Sta
override fun getClickConsumer(): Consumer<MouseEvent> {
return Consumer {
clicked = true
showPopup(RelativePoint.fromScreen(it.locationOnScreen))
showPopup(it)
update(project)
}
}

private fun showPopup(relativePoint: RelativePoint) {
private fun showPopup(e: MouseEvent) {
val panel = VaadinStatusBarInfoPopupPanel(project)
val popup = JBPopupFactory.getInstance().createComponentPopupBuilder(panel, null).createPopup()
panel.afterRestart = {
popup.cancel()
showPopup(relativePoint)
showPopup(e)
}
popup.show(relativePoint)
val dimension = popup.content.preferredSize
val at = Point(0, -dimension.height)
popup.show(RelativePoint(e.component, at))
// destroy popup on unexpected project close
Disposer.register(this, popup)
}

override fun getTooltipText(): String {
Expand Down
Loading