Fix: progress icon spin in combo box

fioan89 · fioan89 · commit 71ed51b651e4 · 2022-06-23T00:11:25.000+03:00
- the progress icon in the IDE selection combo box was not spinning while IDEs were loading. - there were two reasons: 1. the combobox did not enable animated icons in the renderer 2. the cell renderer implementation did not repaint the icon - resolves #4
diff --git a/src/main/kotlin/com/coder/gateway/views/steps/CoderLocateRemoteProjectStepView.kt b/src/main/kotlin/com/coder/gateway/views/steps/CoderLocateRemoteProjectStepView.kt
@@ -14,14 +14,14 @@ import com.intellij.openapi.wm.impl.welcomeScreen.WelcomeScreenUIManager
 import com.intellij.remote.AuthType
 import com.intellij.remote.RemoteCredentialsHolder
 import com.intellij.ui.AnimatedIcon
+import com.intellij.ui.ColoredListCellRenderer
 import com.intellij.ui.components.JBTextField
 import com.intellij.ui.dsl.builder.BottomGap
 import com.intellij.ui.dsl.builder.RowLayout
 import com.intellij.ui.dsl.builder.TopGap
 import com.intellij.ui.dsl.builder.panel
 import com.intellij.ui.dsl.gridLayout.HorizontalAlign
 import com.intellij.util.ui.JBFont
-import com.intellij.util.ui.JBUI
 import com.intellij.util.ui.UIUtil
 import com.jetbrains.gateway.api.GatewayUI
 import com.jetbrains.gateway.ssh.CachingProductsJsonWrapper
@@ -47,7 +47,6 @@ class CoderLocateRemoteProjectStepView : CoderWorkspacesWizardStep, Disposable {
     private val cs = CoroutineScope(Dispatchers.Main)
     private val coderClient: CoderRestClientService = ApplicationManager.getApplication().getService(CoderRestClientService::class.java)
 
-    private val spinner = JLabel("", AnimatedIcon.Default(), SwingConstants.LEFT)
     private var ideComboBoxModel = DefaultComboBoxModel<IdeWithStatus>()
 
     private lateinit var titleLabel: JLabel
@@ -127,7 +126,6 @@ class CoderLocateRemoteProjectStepView : CoderWorkspacesWizardStep, Disposable {
             if (idesWithStatus.isEmpty()) {
                 logger.warn("Could not resolve any IDE for workspace ${selectedWorkspace.name}, probably $workspaceOS is not supported by Gateway")
             } else {
-                cbIDE.remove(spinner)
                 ideComboBoxModel.addAll(idesWithStatus)
                 cbIDE.selectedIndex = 0
             }
@@ -162,29 +160,39 @@ class CoderLocateRemoteProjectStepView : CoderWorkspacesWizardStep, Disposable {
     }
 
     private class IDEComboBox(model: ComboBoxModel<IdeWithStatus>) : ComboBox<IdeWithStatus>(model) {
+
+        init {
+            putClientProperty(AnimatedIcon.ANIMATION_IN_RENDERER_ALLOWED, true)
+        }
+
         override fun getSelectedItem(): IdeWithStatus? {
             return super.getSelectedItem() as IdeWithStatus?
         }
     }
 
     private class IDECellRenderer : ListCellRenderer<IdeWithStatus> {
+        private val loadingComponentRenderer: ListCellRenderer<IdeWithStatus> = object : ColoredListCellRenderer<IdeWithStatus>() {
+            override fun customizeCellRenderer(list: JList<out IdeWithStatus>, value: IdeWithStatus?, index: Int, isSelected: Boolean, cellHasFocus: Boolean) {
+                background = UIUtil.getListBackground(isSelected, cellHasFocus)
+                icon = AnimatedIcon.Default.INSTANCE
+                append(CoderGatewayBundle.message("gateway.connector.view.coder.remoteproject.loading.text"))
+            }
+        }
+
         override fun getListCellRendererComponent(list: JList<out IdeWithStatus>?, ideWithStatus: IdeWithStatus?, index: Int, isSelected: Boolean, cellHasFocus: Boolean): Component {
             return if (ideWithStatus == null && index == -1) {
-                JPanel().apply {
-                    layout = FlowLayout(FlowLayout.LEFT)
-                    add(JLabel("Retrieving products...", AnimatedIcon.Default(), SwingConstants.LEFT))
-                }
+                loadingComponentRenderer.getListCellRendererComponent(list, null, -1, isSelected, cellHasFocus)
             } else if (ideWithStatus != null) {
                 JPanel().apply {
                     layout = FlowLayout(FlowLayout.LEFT)
                     add(JLabel(ideWithStatus.product.ideName, ideWithStatus.product.icon, SwingConstants.LEFT))
                     add(JLabel("${ideWithStatus.product.productCode} ${ideWithStatus.presentableVersion} ${ideWithStatus.buildNumber} | ${ideWithStatus.status.name.toLowerCase()}").apply {
                         foreground = UIUtil.getLabelDisabledForeground()
                     })
-                    background = JBUI.CurrentTheme.List.background(isSelected, cellHasFocus)
+                    background = UIUtil.getListBackground(isSelected, cellHasFocus)
                 }
             } else {
-                JPanel()
+                panel {  }
             }
         }
     }
diff --git a/src/main/resources/messages/CoderGatewayBundle.properties b/src/main/resources/messages/CoderGatewayBundle.properties
@@ -10,8 +10,9 @@ gateway.connector.view.login.token.label=Session Token:
 gateway.connector.view.coder.auth.next.text=Connect
 gateway.connector.view.login.cli.downloader.dialog.title=Authenticate and setup coder
 gateway.connector.view.coder.workspaces.next.text=Select IDE and Project
-gateway.connector.view.coder.remoteproject.next.text=Download and Start IDE
 gateway.connector.view.coder.workspaces.choose.text=Choose a workspace
+gateway.connector.view.coder.remoteproject.loading.text=Retrieving products...
+gateway.connector.view.coder.remoteproject.next.text=Download and Start IDE
 gateway.connector.view.coder.remoteproject.choose.text=Choose IDE and project for workspace {0}
 gateway.connector.recentconnections.title=Recent Coder Workspaces
 gateway.connector.recentconnections.remove.button.tooltip=Remove from Recent Connections
