Fix organization- and courselistwindows' visual bugs

Author: Redande

tmc-plugin/src/fi/helsinki/cs/tmc/ui/CourseListWindow.java

@@ -48,7 +48,7 @@ public CourseListWindow(List<Course> courses, PreferencesPanel prefPanel) {
         this.title = new JLabel("Select a course:");
         Font titleFont = this.title.getFont();
         this.title.setFont(new Font(titleFont.getName(), Font.BOLD, 20));
-        this.title.setBorder(new MatteBorder(new Insets(10, 10, 5, 10), new Color(242, 241, 240)));
+        this.title.setBorder(new MatteBorder(new Insets(10, 10, 5, 10), getBackground()));
         Course[] courseArray = courses.toArray(new Course[courses.size()]);
         this.courses = new JList<>(courseArray);
         this.courses.setFixedCellHeight(107);
@@ -100,11 +100,7 @@ public static void display() throws Exception {
         CourseDb.getInstance().setAvailableCourses(courses);
         final CourseListWindow courseListWindow = new CourseListWindow(courses, prefPanel);
         frame.setContentPane(courseListWindow);
-        if (hasCourses(courses, prefPanel)) {
-            frame.pack();
-            frame.setLocationRelativeTo(null);
-            frame.setVisible(true);
-        }
+
         button.setMinimumSize(new Dimension(courseListWindow.getWidth(), button.getHeight()));
         button.setMaximumSize(new Dimension(courseListWindow.getWidth(), button.getHeight()));
         courseListWindow.addComponentListener(new ComponentListener() {
@@ -126,6 +122,12 @@ public void componentShown(ComponentEvent e) {
             public void componentHidden(ComponentEvent e) {
             }
         });
+
+        if (hasCourses(courses, prefPanel)) {
+            frame.pack();
+            frame.setLocationRelativeTo(null);
+            frame.setVisible(true);
+        }
     }
 
     public static boolean isWindowVisible() {

tmc-plugin/src/fi/helsinki/cs/tmc/ui/OrganizationListWindow.java

@@ -49,7 +49,7 @@ public OrganizationListWindow(List<Organization> organizations) {
         this.title = new JLabel("Select an organization:");
         Font titleFont = this.title.getFont();
         this.title.setFont(new Font(titleFont.getName(), Font.BOLD, 20));
-        this.title.setBorder(new MatteBorder(new Insets(10, 10, 5, 10), new Color(242, 241, 240)));
+        this.title.setBorder(new MatteBorder(new Insets(10, 10, 5, 10), getBackground()));
         Collections.sort(organizations, (a, b) -> {
             if (a.isPinned() && b.isPinned()) {
                 return a.getName().compareTo(b.getName());
@@ -107,9 +107,7 @@ public static void display() throws Exception {
         List<Organization> organizations = TmcCore.get().getOrganizations(ProgressObserver.NULL_OBSERVER).call();
         final OrganizationListWindow organizationListWindow = new OrganizationListWindow(organizations);
         frame.setContentPane(organizationListWindow);
-        frame.pack();
-        frame.setLocationRelativeTo(null);
-        frame.setVisible(true);
+
         button.setMinimumSize(new Dimension(organizationListWindow.getWidth(), button.getHeight()));
         button.setMaximumSize(new Dimension(organizationListWindow.getWidth(), button.getHeight()));
         organizationListWindow.addComponentListener(new ComponentListener() {
@@ -131,6 +129,10 @@ public void componentShown(ComponentEvent e) {
             public void componentHidden(ComponentEvent e) {
             }
         });
+
+        frame.pack();
+        frame.setLocationRelativeTo(null);
+        frame.setVisible(true);
     }
 
     public static boolean isWindowVisible() {