Merge pull request #597 from devoxx/issue-589

Issue 589

Author: stephanj

src/main/java/com/devoxx/genie/ui/component/StyleSheetsFactory.java

@@ -5,6 +5,7 @@
 import com.intellij.util.ui.JBUI;
 import com.intellij.util.ui.StyleSheetUtil;
 import com.intellij.util.ui.UIUtil;
+import com.intellij.openapi.editor.colors.EditorColorsManager;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 
@@ -17,10 +18,14 @@ public class StyleSheetsFactory {
 
     @Contract(" -> new")
     public static @NotNull StyleSheet createCodeStyleSheet() {
+        // Use editor font size instead of hardcoded value and account for IDE scale factor
+        int editorFontSize = EditorColorsManager.getInstance().getGlobalScheme().getEditorFontSize();
+        // Use JBUI.scale to account for IDE zoom/scaling settings
+        int scaledFontSize = com.intellij.util.ui.JBUI.scale(editorFontSize);
         return StyleSheetUtil.loadStyleSheet(
             "code, pre, .pre { " +
                 "   font-family: '" + SOURCE_CODE_PRO_FONT + "'; " +
-                "   font-size: 14pt;" +
+                "   font-size: " + scaledFontSize + "px;" +
                 "}"
         );
     }
@@ -41,7 +46,7 @@ public class StyleSheetsFactory {
                 "li { padding: " + JBUIScale.scale(1) + "px 0 " + JBUIScale.scale(2) + "px 0; }" +
                 "code, pre, .pre { " +
                 "   font-family: '" + SOURCE_CODE_PRO_FONT + "'; " +
-                "   font-size: 14pt;" +
+                "   font-size: " + com.intellij.util.ui.JBUI.scale(EditorColorsManager.getInstance().getGlobalScheme().getEditorFontSize()) + "px;" +
                 "   color: orange" +
                 "}" +
                 "hr {" +

src/main/java/com/devoxx/genie/ui/component/button/ButtonFactory.java

@@ -54,8 +54,10 @@ public class ButtonFactory {
         button.setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
 
         if (label == null || label.isEmpty()) {
-            int fontSize = (int) JBUIScale.scale(14f) + 6;
-            button.setPreferredSize(new Dimension(fontSize, 30));
+            // For icon-only buttons, ensure they have enough space at all zoom levels
+            int buttonSize = (int) JBUIScale.scale(28);
+            button.setPreferredSize(new Dimension(buttonSize, buttonSize));
+            button.setMinimumSize(new Dimension(buttonSize, buttonSize));
         }
 
         return button;

src/main/java/com/devoxx/genie/ui/panel/ConversationPanel.java

@@ -18,6 +18,7 @@
 import com.intellij.ui.JBColor;
 import com.intellij.ui.awt.RelativePoint;
 import com.intellij.ui.scale.JBUIScale;
+import com.intellij.util.ui.JBUI;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 
@@ -75,12 +76,16 @@ public ConversationPanel(@NotNull DevoxxGenieToolWindowContent toolWindowContent
 
     public void updateFontSize() {
         int fontSize = (int) JBUIScale.scale(14f) + 6;
-
-        setMaximumSize(new Dimension(fontSize * 3, 30));
-
-        conversationButtonPanel.setPreferredSize(new Dimension(fontSize * 3, 30));
-        conversationButtonPanel.setMinimumSize(new Dimension(fontSize * 3, 30));
-
+        
+        // Calculate sufficient width for the buttons based on zoom level
+        // Use a multiplier that ensures enough space even at high zoom levels
+        int buttonPanelWidth = (int) JBUIScale.scale(120); // Absolute width based on scale
+        
+        setMaximumSize(new Dimension(buttonPanelWidth, 30));
+        
+        conversationButtonPanel.setPreferredSize(new Dimension(buttonPanelWidth, 30));
+        conversationButtonPanel.setMinimumSize(new Dimension(buttonPanelWidth, 30));
+        
         revalidate();
         repaint();
     }
@@ -102,6 +107,10 @@ public void loadConversationHistory() {
      * @return the button panel
      */
     private @NotNull JPanel createButtonPanel() {
+        // Add spacing between buttons to avoid overlapping
+        FlowLayout layout = (FlowLayout) conversationButtonPanel.getLayout();
+        layout.setHgap(JBUI.scale(10)); // Add horizontal gap between buttons
+        
         conversationButtonPanel.add(createActionButton(PlusIcon, e -> startNewConversation()));
         conversationButtonPanel.add(createActionButton(ClockIcon, e -> showConversationHistory()));
 

src/main/java/com/devoxx/genie/ui/panel/LlmProviderPanel.java

@@ -8,7 +8,9 @@
 import com.devoxx.genie.service.LLMProviderService;
 import com.devoxx.genie.ui.listener.LLMSettingsChangeListener;
 import com.devoxx.genie.ui.renderer.ModelInfoRenderer;
+import com.devoxx.genie.ui.renderer.ModelProviderRenderer;
 import com.devoxx.genie.ui.settings.DevoxxGenieStateService;
+import com.devoxx.genie.ui.util.DevoxxGenieFontsUtil;
 import com.devoxx.genie.ui.util.NotificationUtil;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.project.Project;
@@ -59,7 +61,13 @@ public LlmProviderPanel(@NotNull Project project) {
         super(new BorderLayout());
         this.project = project;
 
+        // Set consistent renderers and fonts for both combo boxes
+        modelProviderComboBox.setRenderer(new ModelProviderRenderer());
         modelNameComboBox.setRenderer(new ModelInfoRenderer());
+        
+        // Set the font for the combo boxes themselves
+        modelProviderComboBox.setFont(DevoxxGenieFontsUtil.getDropdownFont());
+        modelNameComboBox.setFont(DevoxxGenieFontsUtil.getDropdownFont());
 
         addModelProvidersToComboBox();
 
@@ -157,6 +165,7 @@ private void refreshModels() {
 
                 updateModelNamesComboBox(selectedProvider.getName());
                 modelNameComboBox.setRenderer(new ModelInfoRenderer());
+                modelNameComboBox.setFont(DevoxxGenieFontsUtil.getDropdownFont());
                 modelNameComboBox.revalidate();
                 modelNameComboBox.repaint();
                 refreshButton.setEnabled(true);
@@ -176,6 +185,8 @@ public void updateModelNamesComboBox(String modelProvider) {
             try {
                 modelNameComboBox.removeAllItems();
                 modelNameComboBox.setVisible(true);
+                // Ensure font consistency is maintained when updating
+                modelNameComboBox.setFont(DevoxxGenieFontsUtil.getDropdownFont());
 
                 ChatModelFactoryProvider
                         .getFactoryByProvider(provider)
@@ -293,6 +304,7 @@ private void handleModelProviderSelectionChange(@NotNull ActionEvent e) {
                 updateModelNamesComboBox(modelProvider.getName());
 
                 modelNameComboBox.setRenderer(new ModelInfoRenderer());
+                modelNameComboBox.setFont(DevoxxGenieFontsUtil.getDropdownFont());
                 modelNameComboBox.revalidate();
                 modelNameComboBox.repaint();
             }

src/main/java/com/devoxx/genie/ui/renderer/CodeBlockNodeRenderer.java

@@ -17,6 +17,7 @@
 import org.commonmark.renderer.html.HtmlNodeRendererContext;
 import org.commonmark.renderer.html.HtmlWriter;
 import org.jetbrains.annotations.NotNull;
+import com.intellij.openapi.editor.colors.EditorColorsManager;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -70,7 +71,11 @@ private void renderNode(String codeSnippet, String info, boolean block) {
 
         // Critical: we need to handle newlines properly in the code tag
         Map<String, String> codeStyle = new HashMap<>();
-        codeStyle.put("style", "font-size:14pt; white-space: pre !important; -webkit-user-select: text; user-select: text;");
+        // Use editor font size instead of hardcoded value and account for IDE scale factor
+        int editorFontSize = EditorColorsManager.getInstance().getGlobalScheme().getEditorFontSize();
+        // Use JBUI.scale to account for IDE zoom/scaling settings
+        int scaledFontSize = com.intellij.util.ui.JBUI.scale(editorFontSize);
+        codeStyle.put("style", "font-size:" + scaledFontSize + "px; white-space: pre !important; -webkit-user-select: text; user-select: text;");
         htmlOutputWriter.tag("code", codeStyle);
 
         HighlightingMode highlightingMode = determineHighlightingMode(block);

src/main/java/com/devoxx/genie/ui/renderer/ModelInfoRenderer.java

@@ -5,6 +5,7 @@
 import com.intellij.ui.JBColor;
 import com.intellij.ui.components.JBLabel;
 import com.intellij.util.ui.JBUI;
+import com.devoxx.genie.ui.util.DevoxxGenieFontsUtil;
 
 import javax.swing.*;
 import java.awt.*;
@@ -20,8 +21,10 @@ public ModelInfoRenderer() {
         add(nameLabel, BorderLayout.WEST);
         add(infoLabel, BorderLayout.EAST);
         setBorder(JBUI.Borders.empty(2));
-
-        infoLabel.setFont(JBUI.Fonts.smallFont());
+        
+        // Use the centralized fonts for consistent styling
+        nameLabel.setFont(DevoxxGenieFontsUtil.getDropdownFont());
+        infoLabel.setFont(DevoxxGenieFontsUtil.getDropdownInfoFont());
         infoLabel.setForeground(JBColor.GRAY);
     }
 
@@ -53,7 +56,10 @@ public Component getListCellRendererComponent(JList<? extends LanguageModel> lis
         setBackground(isSelected ? list.getSelectionBackground() : list.getBackground());
         setForeground(isSelected ? list.getSelectionForeground() : list.getForeground());
         setEnabled(list.isEnabled());
-        setFont(list.getFont());
+        
+        // Always ensure the fonts are set correctly (protection against JList overriding them)
+        nameLabel.setFont(DevoxxGenieFontsUtil.getDropdownFont());
+        infoLabel.setFont(DevoxxGenieFontsUtil.getDropdownInfoFont());
 
         return this;
     }

src/main/java/com/devoxx/genie/ui/renderer/ModelProviderRenderer.java

@@ -0,0 +1,48 @@
+package com.devoxx.genie.ui.renderer;
+
+import com.devoxx.genie.model.enumarations.ModelProvider;
+import com.intellij.ui.JBColor;
+import com.intellij.ui.components.JBLabel;
+import com.intellij.util.ui.JBUI;
+import com.devoxx.genie.ui.util.DevoxxGenieFontsUtil;
+
+import javax.swing.*;
+import java.awt.*;
+
+/**
+ * Custom renderer for the Model Provider dropdown to ensure consistent font scaling with ModelInfoRenderer
+ */
+public class ModelProviderRenderer extends JPanel implements ListCellRenderer<ModelProvider> {
+    private final JLabel nameLabel = new JBLabel();
+
+    public ModelProviderRenderer() {
+        setLayout(new BorderLayout());
+        add(nameLabel, BorderLayout.CENTER);
+        setBorder(JBUI.Borders.empty(2));
+        
+        // Use the centralized dropdown font
+        nameLabel.setFont(DevoxxGenieFontsUtil.getDropdownFont());
+    }
+
+    @Override
+    public Component getListCellRendererComponent(JList<? extends ModelProvider> list,
+                                                  ModelProvider provider,
+                                                  int index,
+                                                  boolean isSelected,
+                                                  boolean cellHasFocus) {
+        if (provider == null) {
+            nameLabel.setText("");
+        } else {
+            nameLabel.setText(provider.getName());
+        }
+
+        setBackground(isSelected ? list.getSelectionBackground() : list.getBackground());
+        setForeground(isSelected ? list.getSelectionForeground() : list.getForeground());
+        setEnabled(list.isEnabled());
+        
+        // Always ensure the font is set correctly (protection against JList overriding it)
+        nameLabel.setFont(DevoxxGenieFontsUtil.getDropdownFont());
+
+        return this;
+    }
+}

src/main/java/com/devoxx/genie/ui/util/DevoxxGenieFontsUtil.java

@@ -1,12 +1,42 @@
 package com.devoxx.genie.ui.util;
 
+import com.intellij.util.ui.JBUI;
+
 import java.awt.*;
 
+/**
+ * Utility class for standardized font handling across the application
+ */
 public class DevoxxGenieFontsUtil {
     private DevoxxGenieFontsUtil() {
     }
 
     public static final String SOURCE_CODE_PRO_FONT = "Source Code Pro";
-
+    public static final String DROPDOWN_FONT_FAMILY = Font.DIALOG;
+    public static final int DROPDOWN_FONT_SIZE = 14; // Increased base size for better readability
+    
+    /**
+     * Get a standardized font for code blocks
+     */
     public static final Font SourceCodeProFontPlan14 = new Font(SOURCE_CODE_PRO_FONT, Font.PLAIN, 14);
+    
+    /**
+     * Get a standardized scaled font for dropdown menus that respects IDE scaling
+     * @return The font to use for dropdown menus
+     */
+    public static Font getDropdownFont() {
+        // We want to ensure the same size is used across all UI components
+        int scaledSize = JBUI.scale(DROPDOWN_FONT_SIZE);
+        return new Font(DROPDOWN_FONT_FAMILY, Font.PLAIN, scaledSize);
+    }
+    
+    /**
+     * Get a standardized scaled font for secondary dropdown text (like token counts)
+     * @return The font to use for secondary information in dropdowns
+     */
+    public static Font getDropdownInfoFont() {
+        // Slightly smaller than the main dropdown font
+        int scaledSize = JBUI.scale(DROPDOWN_FONT_SIZE - 1);
+        return new Font(DROPDOWN_FONT_FAMILY, Font.PLAIN, scaledSize);
+    }
 }

src/main/resources/META-INF/plugin.xml

@@ -40,7 +40,8 @@
             <Li>Feat #586 : Added Gemini 2.5 Pro model by @stephanj</LI>
             <LI>Fix #588 : [Regression] Fix streaming responses by @stephanj</LI>
             <LI>Feat #590 : User can now configure which keys to use for newline by @stephanj</LI>
-            <LI>Fix #595 : At least one message is required by @stephanj</LI>
+            <LI>Fix #595 : At least one message is required (increased default chat memory to 50) by @stephanj</LI>
+            <LI>Fix #589 : Font size for code snippets by @stephanj</LI>
         </UL>
         <h2>v0.5.2</h2>
         <UL>