Revert "make the GUI scrollable when needed"
This reverts commit 9148359510e1de88e99bdf7e1f0d6bdd250222a3. Revert commit since it also scroll horizontaly
This commit is contained in:
@@ -20,7 +20,6 @@
|
|||||||
package com.sheepit.client.standalone;
|
package com.sheepit.client.standalone;
|
||||||
|
|
||||||
import java.awt.AWTException;
|
import java.awt.AWTException;
|
||||||
import java.awt.Container;
|
|
||||||
import java.awt.GridBagLayout;
|
import java.awt.GridBagLayout;
|
||||||
import java.awt.Image;
|
import java.awt.Image;
|
||||||
import java.awt.MenuItem;
|
import java.awt.MenuItem;
|
||||||
@@ -39,7 +38,6 @@ import java.util.TimerTask;
|
|||||||
import javax.swing.ImageIcon;
|
import javax.swing.ImageIcon;
|
||||||
import javax.swing.JFrame;
|
import javax.swing.JFrame;
|
||||||
import javax.swing.JPanel;
|
import javax.swing.JPanel;
|
||||||
import javax.swing.JScrollPane;
|
|
||||||
import javax.swing.UIManager;
|
import javax.swing.UIManager;
|
||||||
import javax.swing.UnsupportedLookAndFeelException;
|
import javax.swing.UnsupportedLookAndFeelException;
|
||||||
import javax.swing.border.EmptyBorder;
|
import javax.swing.border.EmptyBorder;
|
||||||
@@ -60,7 +58,6 @@ public class GuiSwing extends JFrame implements Gui {
|
|||||||
|
|
||||||
private SystemTray sysTray;
|
private SystemTray sysTray;
|
||||||
private JPanel panel;
|
private JPanel panel;
|
||||||
private JScrollPane scrollPane;
|
|
||||||
private Working activityWorking;
|
private Working activityWorking;
|
||||||
private Settings activitySettings;
|
private Settings activitySettings;
|
||||||
private TrayIcon trayIcon;
|
private TrayIcon trayIcon;
|
||||||
@@ -130,8 +127,7 @@ public class GuiSwing extends JFrame implements Gui {
|
|||||||
|
|
||||||
panel = new JPanel();
|
panel = new JPanel();
|
||||||
panel.setLayout(new GridBagLayout());
|
panel.setLayout(new GridBagLayout());
|
||||||
scrollPane = new JScrollPane(panel);
|
setContentPane(this.panel);
|
||||||
setContentPane(this.scrollPane);
|
|
||||||
panel.setBorder(new EmptyBorder(20, 20, 20, 20));
|
panel.setBorder(new EmptyBorder(20, 20, 20, 20));
|
||||||
|
|
||||||
activityWorking = new Working(this);
|
activityWorking = new Working(this);
|
||||||
@@ -338,11 +334,6 @@ public class GuiSwing extends JFrame implements Gui {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public Container getContentPane() {
|
|
||||||
return panel;
|
|
||||||
}
|
|
||||||
|
|
||||||
public class ThreadClient extends Thread {
|
public class ThreadClient extends Thread {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
|
|||||||
Reference in New Issue
Block a user