feat: Removed border for Add Context button and center layout in ActionBar (#1613)

Author: ethanyhou

com.microsoft.copilot.eclipse.ui/src/com/microsoft/copilot/eclipse/ui/chat/ActionBar.java

@@ -178,6 +178,7 @@ public ActionBar(Composite parent, int style, ChatServiceManager chatServiceMana
     rowLayout.marginLeft = 0;
     rowLayout.marginTop = 0;
     rowLayout.marginBottom = 10;
+    rowLayout.center = true;
     this.cmpFileRef = new Composite(actionBar, SWT.NONE);
     this.cmpFileRef.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
     this.cmpFileRef.setLayout(rowLayout);

com.microsoft.copilot.eclipse.ui/src/com/microsoft/copilot/eclipse/ui/chat/AddContextButton.java

@@ -15,15 +15,12 @@
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jface.window.Window;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PlatformUI;
 
@@ -37,71 +34,43 @@
  * A widget that displays a button to attach context.
  */
 public class AddContextButton extends Composite {
-  private Label lblAttachIcon;
-  private Label lblButtonText;
+  private Button btnAttachIcon;
 
   /**
    * Creates a new AddContextButton.
    */
   public AddContextButton(Composite parent) {
-    super(parent, SWT.BORDER);
-    GridLayout layout = new GridLayout(2, false);
-    layout.marginWidth = 4;
-    layout.marginHeight = 2;
+    super(parent, SWT.NONE);
+    GridLayout layout = new GridLayout(1, false);
+    layout.marginWidth = 0;
+    layout.marginHeight = 0;
     setLayout(layout);
 
-    lblAttachIcon = new Label(this, SWT.NONE);
-    lblAttachIcon.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, false, false));
+    btnAttachIcon = UiUtils.createIconButton(this, SWT.PUSH | SWT.FLAT);
     Image attachImage = UiUtils.buildImageFromPngPath("/icons/chat/attach_context.png");
-    lblAttachIcon.setImage(attachImage);
-    lblAttachIcon.addDisposeListener(e -> {
-      if (attachImage != null && !attachImage.isDisposed()) {
-        attachImage.dispose();
-      }
-    });
-
-    lblButtonText = new Label(this, SWT.NONE);
-    lblButtonText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true));
-    lblButtonText.setText("Add Context...");
-
-    // Register for chat font updates via centralized service
-    var chatServiceManager = CopilotUi.getPlugin().getChatServiceManager();
-    if (chatServiceManager != null) {
-      chatServiceManager.getChatFontService().registerControl(lblButtonText);
-    }
-
-    MouseAdapter clickListener = new MouseAdapter() {
+    btnAttachIcon.setImage(attachImage);
+    String attachTooltip = Messages.chat_addContext_tooltip;
+    btnAttachIcon.setToolTipText(attachTooltip);
+    AccessibilityUtils.addAccessibilityNameForUiComponent(btnAttachIcon, attachTooltip);
+    btnAttachIcon.addSelectionListener(new SelectionAdapter() {
       @Override
-      public void mouseDown(MouseEvent e) {
+      public void widgetSelected(SelectionEvent e) {
         openFilePickerAndAddFiles();
       }
-    };
-    // Add mouse listener to 'this' so that clicking margin spaces will also trigger the action
-    this.addMouseListener(clickListener);
-    lblAttachIcon.addMouseListener(clickListener);
-    lblButtonText.addMouseListener(clickListener);
-    this.setCursor(getDisplay().getSystemCursor(SWT.CURSOR_HAND));
-
-    // Add keyboard support for Enter activation
-    this.addKeyListener(new KeyAdapter() {
-      @Override
-      public void keyPressed(KeyEvent e) {
-        if (e.keyCode == SWT.CR || e.keyCode == SWT.KEYPAD_CR) {
-          openFilePickerAndAddFiles();
-        }
+    });
+    btnAttachIcon.addDisposeListener(e -> {
+      if (attachImage != null && !attachImage.isDisposed()) {
+        attachImage.dispose();
       }
     });
-
-    AccessibilityUtils.addFocusBorderToComposite(this);
   }
 
   /**
    * Opens the file picker dialog and adds the selected files to the referenced files.
    */
   private void openFilePickerAndAddFiles() {
     List<IResource> files = selectFiles();
-    ReferencedFileService fileService =
-        CopilotUi.getPlugin().getChatServiceManager().getReferencedFileService();
+    ReferencedFileService fileService = CopilotUi.getPlugin().getChatServiceManager().getReferencedFileService();
     fileService.addReferencedFiles(files);
   }
 

com.microsoft.copilot.eclipse.ui/src/com/microsoft/copilot/eclipse/ui/i18n/Messages.java

@@ -120,6 +120,7 @@ public final class Messages extends NLS {
   public static String chat_noAuthView_checkSubButton;
   public static String chat_noAuthView_checkSubButton_Tooltip;
   public static String chat_noAuthView_checkSubLink;
+  public static String chat_addContext_tooltip;
   public static String chat_filePicker_title;
   public static String chat_filePicker_message;
   public static String chat_noQuotaView_fallbackModel;

com.microsoft.copilot.eclipse.ui/src/com/microsoft/copilot/eclipse/ui/i18n/messages.properties

@@ -136,6 +136,7 @@ chat_historyView_editIcon_tooltip=Edit conversation title
 chat_historyView_deleteIcon_tooltip=Delete conversation
 model_billing_multiplier_suffix=x
 model_billing_multiplier_variable=Variable
+chat_addContext_tooltip=Add Context...
 chat_filePicker_title=Search attachments
 chat_filePicker_message=Choose files from the list, or search for files:
 chat_currentReferencedFile_description=Current file