fix: UI issues when image in context

carlrobertoh · carlrobertoh · commit 1ec5e3ad58ff · 2025-04-06T17:45:58.000+01:00
diff --git a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ChatToolWindowTabPanel.java b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ChatToolWindowTabPanel.java
@@ -455,10 +455,6 @@ private UserMessagePanel getUserMessagePanel(Message message) {
             .build(),
         userMessagePanel));
     userMessagePanel.addDeleteAction(() -> removeMessage(message.getId(), conversation));
-    var imageFilePath = message.getImageFilePath();
-    if (imageFilePath != null && !imageFilePath.isEmpty()) {
-      userMessagePanel.displayImage(imageFilePath);
-    }
     return userMessagePanel;
   }
 
diff --git a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/ImageAccordion.java b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/ImageAccordion.java
@@ -65,8 +65,9 @@ private JToggleButton createToggleButton(JPanel contentPane) {
     accordionToggle.setSelectedIcon(General.ArrowUp);
     accordionToggle.setBorder(null);
     accordionToggle.setSelected(true);
-    accordionToggle.setHorizontalAlignment(SwingConstants.LEADING);
-    accordionToggle.setHorizontalTextPosition(SwingConstants.LEADING);
+    accordionToggle.setHorizontalAlignment(SwingConstants.LEFT);
+    accordionToggle.setHorizontalTextPosition(SwingConstants.RIGHT);
+    accordionToggle.setIconTextGap(4);
     accordionToggle.addItemListener(e ->
         contentPane.setVisible(e.getStateChange() == ItemEvent.SELECTED));
     return accordionToggle;
diff --git a/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/SelectedFilesAccordion.java b/src/main/java/ee/carlrobert/codegpt/toolwindow/chat/ui/SelectedFilesAccordion.java
@@ -41,11 +41,11 @@ private JPanel createContentPanel(List<ActionLink> links) {
 
   private JToggleButton createToggleButton(JPanel contentPane, int fileCount) {
     var accordionToggle = new JToggleButton(
-        format("Referenced files (+%d)", fileCount), General.ArrowUp);
+        format("Referenced files (+%d)", fileCount), General.ArrowDown);
     accordionToggle.setFocusPainted(false);
     accordionToggle.setContentAreaFilled(false);
     accordionToggle.setBackground(getBackground());
-    accordionToggle.setSelectedIcon(General.ArrowDown);
+    accordionToggle.setSelectedIcon(General.ArrowUp);
     accordionToggle.setBorder(null);
     accordionToggle.setSelected(true);
     accordionToggle.setHorizontalAlignment(SwingConstants.LEFT);
diff --git a/src/main/kotlin/ee/carlrobert/codegpt/toolwindow/ui/UserMessagePanel.kt b/src/main/kotlin/ee/carlrobert/codegpt/toolwindow/ui/UserMessagePanel.kt
@@ -47,7 +47,6 @@ class UserMessagePanel(
         background = ColorUtil.brighter(getBackground(), 2)
 
         setupAdditionalContext()
-        setupImageIfPresent()
         setupResponseBody()
     }
 
@@ -117,36 +116,13 @@ class UserMessagePanel(
         )
     }
 
-    fun displayImage(imageFilePath: String) {
-        try {
-            val path = Paths.get(imageFilePath)
-            body.addToTop(ImageAccordion(path.fileName.toString(), Files.readAllBytes(path)))
-        } catch (e: IOException) {
-            body.addToTop(
-                JBLabel(
-                    "<html><small>Unable to load image $imageFilePath</small></html>",
-                    AllIcons.General.Error,
-                    SwingConstants.LEFT
-                )
-            )
-        }
-    }
-
     private fun setupAdditionalContext() {
         val additionalContextPanel = getAdditionalContextPanel(project, message)
         if (additionalContextPanel != null) {
             body.addToTop(additionalContextPanel)
         }
     }
 
-    private fun setupImageIfPresent() {
-        message.imageFilePath?.let { imageFilePath ->
-            if (imageFilePath.isNotEmpty()) {
-                displayImage(imageFilePath)
-            }
-        }
-    }
-
     private fun setupResponseBody() {
         addContent(
             ChatMessageResponseBody(project, true, false, false, parentDisposable)
@@ -217,6 +193,25 @@ class UserMessagePanel(
                     }
                 }
             }
+
+            message.imageFilePath?.let { imageFilePath ->
+                if (imageFilePath.isNotEmpty()) {
+                    try {
+                        val path = Paths.get(imageFilePath)
+                        additionalContextPanel.add(
+                            ImageAccordion(path.fileName.toString(), Files.readAllBytes(path))
+                        )
+                    } catch (e: IOException) {
+                        additionalContextPanel.add(
+                            JBLabel(
+                                "<html><small>Unable to load image $imageFilePath</small></html>",
+                                AllIcons.General.Error,
+                                SwingConstants.LEFT
+                            )
+                        )
+                    }
+                }
+            }
         }
     }
 
