Fixes JTabbedPane.SCROLL_TAB_LAYOUT side effect on history

Trevor3000 · May 22, 2015 · 617ba9b · 617ba9b
1 parent 64da4a2
commit 617ba9b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/app/src/main/groovy/jd/gui/view/component/panel/TabbedPanel.groovy b/app/src/main/groovy/jd/gui/view/component/panel/TabbedPanel.groovy
@@ -13,6 +13,7 @@ import javax.swing.JComponent
 import javax.swing.JMenuItem
 import javax.swing.JPopupMenu
 import javax.swing.ToolTipManager
+import javax.swing.event.ChangeEvent
 import java.awt.BorderLayout
 import java.awt.CardLayout
 import java.awt.Color
@@ -52,7 +53,7 @@ class TabbedPanel extends JPanel implements PreferencesChangeListener {
 	JPanel createPanel(Color background) {
 		return new JPanel()
 	}
-	
+
 	JTabbedPane createTabPanel() {
         JTabbedPane tabPanel = new JTabbedPane() {
             String getToolTipText(MouseEvent e) {
@@ -78,7 +79,7 @@ class TabbedPanel extends JPanel implements PreferencesChangeListener {
         })
         return tabPanel
 	}
-	
+
 	static Color darker(Color c) {
 		return new Color(
 			Math.max((int)(c.red  *0.85), 0),
@@ -119,13 +120,26 @@ class TabbedPanel extends JPanel implements PreferencesChangeListener {
 		int index = tabbedPane.getTabCount()
 		tabbedPane.addTab(title, page)
         tabbedPane.setTabComponentAt(index, tab)
-        // Ensure new page is visible (bug with SCROLL_TAB_LAYOUT)
-        tabbedPane.selectedIndex = 0
-        tabbedPane.selectedIndex = index
+        setSelectedIndex(index)
 
 		getLayout().show(this, 'tabs')
 	}
 
+    void setSelectedIndex(int index) {
+        if (index != -1) {
+            if (tabbedPane.tabLayoutPolicy == JTabbedPane.SCROLL_TAB_LAYOUT) {
+                // Ensure that the new page is visible (bug with SCROLL_TAB_LAYOUT)
+                def event = new ChangeEvent(tabbedPane)
+                for (def listener : tabbedPane.getChangeListeners()) {
+                    if (listener.class.package.name.startsWith('javax.'))
+                        listener.stateChanged(event)
+                }
+            }
+
+            tabbedPane.selectedIndex = index
+        }
+    }
+
     Object showPage(URI uri) {
         def u1 = uri.toString()
         int i = tabbedPane.getTabCount()
@@ -202,11 +216,6 @@ class TabbedPanel extends JPanel implements PreferencesChangeListener {
         } else {
             tabbedPane.tabLayoutPolicy = JTabbedPane.WRAP_TAB_LAYOUT
         }
-        // Ensure selected sub-page is visible (bug with SCROLL_TAB_LAYOUT)
-        int index = tabbedPane.selectedIndex
-        if (index != -1) {
-            tabbedPane.selectedIndex = 0
-            tabbedPane.selectedIndex = index
-        }
+        setSelectedIndex(tabbedPane.selectedIndex)
     }
 }
diff --git a/app/src/main/groovy/jd/gui/view/component/panel/TreeTabbedPanel.groovy b/app/src/main/groovy/jd/gui/view/component/panel/TreeTabbedPanel.groovy
@@ -137,7 +137,6 @@ class TreeTabbedPanel extends JPanel implements UriGettable, UriOpenable, PageCh
         }
 
         if (openUriEnabled && page instanceof UriOpenable) {
-            api.addURI(uri)
             page.openUri(uri)
         }
-Original file line number
+Diff line change
@@ Expand Up @@
             }
             if (openUriEnabled && page instanceof UriOpenable) {
-                api.addURI(uri)
                 page.openUri(uri)
             }
@@ Expand Down @@