Mercurial > hg > release > thermostat-0.7
changeset 49:fae2136d8e21
remove vertical scrolling for the tab container in the main window
author | Omair Majid <omajid@redhat.com> |
---|---|
date | Thu, 19 Jan 2012 17:07:52 -0500 |
parents | d1ad84f404e5 |
children | ca0cc60d017a |
files | src/com/redhat/thermostat/client/ui/MainWindow.java src/com/redhat/thermostat/client/ui/VerticalOnlyScrollingPanel.java |
diffstat | 2 files changed, 2 insertions(+), 65 deletions(-) [+] |
line wrap: on
line diff
--- a/src/com/redhat/thermostat/client/ui/MainWindow.java Wed Jan 18 10:16:56 2012 -0500 +++ b/src/com/redhat/thermostat/client/ui/MainWindow.java Thu Jan 19 17:07:52 2012 -0500 @@ -75,8 +75,7 @@ agentVmTree = new AgentVmTree(treeModel); agentVmTree.setCellRenderer(new AgentVmTreeCellRenderer()); ToolTipManager.sharedInstance().registerComponent(agentVmTree); - contentArea = new VerticalOnlyScrollingPanel(); - contentArea.setLayout(new BorderLayout()); + contentArea = new JPanel(new BorderLayout()); setupMenus(); setupPanels(); @@ -198,9 +197,6 @@ VmPanel panel = new VmPanel(facadeFactory.getVmPanel(vmRef)); contentArea.add(panel); } - // Fixes some 'ghosting' caused by the previous components - // to stay painted on the JViewPort - ((JScrollPane) contentArea.getParent().getParent()).repaint(); contentArea.revalidate(); } } @@ -221,14 +217,7 @@ private JPanel createDetailsPanel() { JPanel result = new JPanel(new BorderLayout()); - if (ClientArgs.isDebugLayout()) { - contentArea.setBorder(BorderFactory.createLineBorder(Color.GREEN)); - } - JScrollPane contentScrollPane = new JScrollPane(contentArea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); - result.add(contentScrollPane, BorderLayout.CENTER); - if (ClientArgs.isDebugLayout()) { - result.setBorder(BorderFactory.createLineBorder(Color.PINK)); - } + result.add(contentArea, BorderLayout.CENTER); return result; }
--- a/src/com/redhat/thermostat/client/ui/VerticalOnlyScrollingPanel.java Wed Jan 18 10:16:56 2012 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,52 +0,0 @@ -package com.redhat.thermostat.client.ui; - -import java.awt.Dimension; -import java.awt.Rectangle; - -import javax.swing.JPanel; -import javax.swing.JViewport; -import javax.swing.Scrollable; - -/** - * A JPanel, that when added to a JScrollPane shows allows vertical scrolling. - */ -public class VerticalOnlyScrollingPanel extends JPanel implements Scrollable { - - private static final long serialVersionUID = -1039658895594239585L; - - public VerticalOnlyScrollingPanel() { - super(); - } - - @Override - public Dimension getPreferredScrollableViewportSize() { - return getPreferredSize(); - } - - @Override - public int getScrollableUnitIncrement(Rectangle visibleRect, int orientation, int direction) { - // FIXME - return 5; - } - - @Override - public int getScrollableBlockIncrement(Rectangle visibleRect, int orientation, int direction) { - // FIXME - return 100; - } - - @Override - public boolean getScrollableTracksViewportWidth() { - return true; - } - - @Override - public boolean getScrollableTracksViewportHeight() { - if (getParent() instanceof JViewport) { - JViewport viewport = (JViewport) getParent(); - return getPreferredSize().getHeight() < viewport.getHeight(); - } - return false; - } - -}