From 2b90085581cae2d4dd16f46a7cf1c8183864a209 Mon Sep 17 00:00:00 2001 From: Laurent Clouet Date: Sun, 17 Jun 2018 12:23:47 +0200 Subject: [PATCH] Revert "make the GUI scrollable when needed" This reverts commit 9148359510e1de88e99bdf7e1f0d6bdd250222a3. Revert commit since it also scroll horizontaly --- src/com/sheepit/client/standalone/GuiSwing.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/com/sheepit/client/standalone/GuiSwing.java b/src/com/sheepit/client/standalone/GuiSwing.java index 6e71a806..6fdaaaf8 100644 --- a/src/com/sheepit/client/standalone/GuiSwing.java +++ b/src/com/sheepit/client/standalone/GuiSwing.java @@ -20,7 +20,6 @@ package com.sheepit.client.standalone; import java.awt.AWTException; -import java.awt.Container; import java.awt.GridBagLayout; import java.awt.Image; import java.awt.MenuItem; @@ -39,7 +38,6 @@ import javax.swing.ImageIcon; import javax.swing.JFrame; import javax.swing.JPanel; -import javax.swing.JScrollPane; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; @@ -60,7 +58,6 @@ public enum ActivityType { private SystemTray sysTray; private JPanel panel; - private JScrollPane scrollPane; private Working activityWorking; private Settings activitySettings; private TrayIcon trayIcon; @@ -130,8 +127,7 @@ public void windowStateChanged(WindowEvent e) { panel = new JPanel(); panel.setLayout(new GridBagLayout()); - scrollPane = new JScrollPane(panel); - setContentPane(this.scrollPane); + setContentPane(this.panel); panel.setBorder(new EmptyBorder(20, 20, 20, 20)); activityWorking = new Working(this); @@ -338,11 +334,6 @@ public void actionPerformed(ActionEvent e) { } - @Override - public Container getContentPane() { - return panel; - } - public class ThreadClient extends Thread { @Override public void run() {