fix for mac toolbar

diylc/diylc-core/src/org/diylc/presenter/update.xml

@@ -3461,5 +3461,21 @@
 			</changes>
 			<url>https://github.com/bancika/diy-layout-creator/releases</url>
 		</org.diylc.appframework.update.Version>
+		<org.diylc.appframework.update.Version>
+			<versionNumber>
+				<major>4</major>
+				<minor>15</minor>
+				<build>1</build>
+			</versionNumber>
+			<releaseDate>2021-01-04 00:00:00.000 CET</releaseDate>
+			<name></name>
+			<changes>				
+				<org.diylc.appframework.update.Change>
+					<changeType>BUG_FIX</changeType>
+					<description>macOS: issues with scrollable toolbar that prevent it from starting on mac machines</description>
+				</org.diylc.appframework.update.Change>			
+			</changes>
+			<url>https://github.com/bancika/diy-layout-creator/releases</url>
+		</org.diylc.appframework.update.Version>
 	</a>
 </java.util.Arrays_-ArrayList>

diylc/diylc-swing/build.xml

@@ -10,7 +10,7 @@
 	<property name="jar.dir" value="${build.dir}/jar" />
 	<property name="report.dir" value="${build.dir}/junitreport" />
 	<property name="main.class" value="org.diylc.DIYLCStarter" />
-	<property name="diylc.version" value="4.15.0" />
+	<property name="diylc.version" value="4.15.1" />
 	
 	<property name="osx.jre8.path" value="jre\osx\jdk8u275-b01-jre\Contents\Home\" />
 

diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ToolbarScrollPane.java

@@ -29,10 +29,14 @@ import javax.swing.JScrollPane;
 import javax.swing.UIManager;
 import javax.swing.plaf.basic.BasicArrowButton;
 
+import org.apache.log4j.Logger;
+
 public class ToolbarScrollPane extends JPanel {
 
   private static final long serialVersionUID = 1L;
   
+  private static final Logger LOG = Logger.getLogger(ToolbarScrollPane.class);
+
   private Component view;
   private BasicArrowButton west;
   private BasicArrowButton east;
@@ -43,11 +47,11 @@ public class ToolbarScrollPane extends JPanel {
     setLayout(new BorderLayout());
     setBorder(BorderFactory.createEmptyBorder());
 
+    try {
       JScrollPane scrollPane = new JScrollPane(view);
       scrollPane.setBorder(BorderFactory.createEmptyBorder());
       scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
       scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_NEVER);    
-    add(scrollPane);
   
       JScrollBar horizontal = scrollPane.getHorizontalScrollBar();
   
@@ -67,6 +71,13 @@ public class ToolbarScrollPane extends JPanel {
           refreshScrollButtonVisibility();
         }
       });
+      
+      LOG.info("Creating scrollable toolbar");
+      add(scrollPane);
+    } catch (Exception e) {
+      LOG.info("Creating non-scrollable toolbar, since scroll bar initialization failed");
+      add(view);
+    }
   }
 
   private void refreshScrollButtonVisibility() {