Merge lp:~tapaal-contributor/tapaal/ubuntu-dark-theme-improvements-1897539 into lp:tapaal

[Peter Haahr Taankvist]

This improves some dark mode problems, but do not remove them entirely.

[Kenneth Yrke Jørgensen (yrke)]

Please update the comments before the changes, to include a link/bugid to where the issue is described, and make sure we have a good report displaying the issue. This helps us later on to determent if the code is still relevant.

review: Needs Fixing

[lp:~tapaal-contributor/tapaal/ubuntu-dark-theme-improvements-1897539]

1108. By Peter Taankvist <email address hidden> on 2020-10-30

Added a link to the bugreport

1109. By Peter Taankvist <email address hidden> on 2020-10-30

Added a bugreport and a link to the bugreport for the second comment

[Peter Haahr Taankvist (ptaank)]

Tried to add some bugreports and links to these for each comment, as well as more descriptive comments.

review: Needs Resubmitting

[Jiri Srba (srba)]

review: Approve

=== modified file 'src/pipe/gui/GuiFrame.java'
--- src/pipe/gui/GuiFrame.java	2020-09-21 18:24:30 +0000
+++ src/pipe/gui/GuiFrame.java	2020-10-30 12:24:44 +0000
@@ -540,7 +540,6 @@
             Logger.log("Error loading L&F: " + exc);
         }
 
-
         if (Platform.isMac()) {
 
             //Set specific settings
@@ -556,6 +555,11 @@
         }
 
         this.setIconImage(ResourceManager.getIcon("icon.png").getImage());
+        //This makes it look slightly better in ubuntu dark mode
+        //By removing a white bar around the whole drawing surface
+        //https://bugs.launchpad.net/tapaal/+bug/1902226
+        SwingUtilities.updateComponentTreeUI(this);
+        this.pack();
     }
 
 

=== modified file 'src/pipe/gui/graphicElements/Transition.java'
--- src/pipe/gui/graphicElements/Transition.java	2020-08-04 08:19:44 +0000
+++ src/pipe/gui/graphicElements/Transition.java	2020-10-30 12:24:44 +0000
@@ -83,6 +83,12 @@
 		super.paintComponent(g);
 		Graphics2D g2 = (Graphics2D) g;
 
+		//Oct 30 2020: In Ubuntu dark mode the namelabel is hidden for some reason
+        //This line fixes it, though it should not matter
+        //https://bugs.launchpad.net/tapaal/+bug/1897539
+        pnName.setForeground(Pipe.ELEMENT_LINE_COLOUR);
+
+
         g2.setStroke(new BasicStroke(2.0f));
 		g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
 				RenderingHints.VALUE_ANTIALIAS_ON);