large bookmark

mpschr · mpschr · commit 87beac6e3b67 · 2016-02-08T09:20:42.000+01:00
diff --git a/org.gitools.ui.app/src/main/java/org/gitools/ui/app/actions/BookmarksDropdown.form b/org.gitools.ui.app/src/main/java/org/gitools/ui/app/actions/BookmarksDropdown.form
@@ -11,7 +11,7 @@
     </properties>
     <border type="none"/>
     <children>
-      <component id="8fe54" class="javax.swing.JComboBox" binding="bookmarkComboBox">
+      <component id="8fe54" class="org.gitools.ui.app.actions.BookmarksDropdown$WideComboBox" binding="bookmarkComboBox">
         <constraints>
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
           <forms top="0" left="5" bottom="0" right="5"/>
diff --git a/org.gitools.ui.app/src/main/java/org/gitools/ui/app/actions/BookmarksDropdown.java b/org.gitools.ui.app/src/main/java/org/gitools/ui/app/actions/BookmarksDropdown.java
@@ -44,13 +44,14 @@
 import java.awt.event.MouseEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+import java.util.Vector;
 
 
 //FIXME: always two listeners.
 
 public class BookmarksDropdown extends HeatmapAction implements IPanelAction, PropertyChangeListener {
 
-    private JComboBox<Bookmark> bookmarkComboBox;
+    private WideComboBox<Bookmark> bookmarkComboBox;
     private JPanel bookmarksSelectPanel;
     private Bookmarks bookmarks;
     private static Bookmark NO_OPTION = new Bookmark();
@@ -234,5 +235,40 @@ public void mousePressed(MouseEvent e) {
         }
     }
 
+    public static class WideComboBox<E> extends JComboBox<E> {
+
+        public WideComboBox() {
+        }
+
+        public WideComboBox(final E items[]) {
+            super(items);
+        }
+
+        public WideComboBox(Vector items) {
+            super(items);
+        }
+
+        public WideComboBox(ComboBoxModel aModel) {
+            super(aModel);
+        }
+
+        private boolean layingOut = false;
+
+        public void doLayout() {
+            try {
+                layingOut = true;
+                super.doLayout();
+            } finally {
+                layingOut = false;
+            }
+        }
+
+        public Dimension getSize() {
+            Dimension dim = super.getSize();
+            if (!layingOut)
+                dim.width = Math.max(dim.width, getPreferredSize().width);
+            return dim;
+        }
+    }
 }
 
