From 5415c29ee0e3a2aa5ecf93c260e7a48771d0b91e Mon Sep 17 00:00:00 2001 From: bancika Date: Mon, 4 Jan 2021 09:56:09 +0100 Subject: [PATCH] fix for mac toolbar --- .../src/org/diylc/presenter/update.xml | 16 +++++ diylc/diylc-library/lib/diylc-core.jar | Bin 348310 -> 348358 bytes diylc/diylc-swing/build.xml | 2 +- diylc/diylc-swing/lib/diylc-core.jar | Bin 348310 -> 348358 bytes diylc/diylc-swing/library/main.jar | Bin 755719 -> 755719 bytes .../plugins/toolbox/ToolbarScrollPane.java | 59 +++++++++++------- 6 files changed, 52 insertions(+), 25 deletions(-) diff --git a/diylc/diylc-core/src/org/diylc/presenter/update.xml b/diylc/diylc-core/src/org/diylc/presenter/update.xml index dbfd571b..06eede2d 100644 --- a/diylc/diylc-core/src/org/diylc/presenter/update.xml +++ b/diylc/diylc-core/src/org/diylc/presenter/update.xml @@ -3461,5 +3461,21 @@ https://github.com/bancika/diy-layout-creator/releases + + + 4 + 15 + 1 + + 2021-01-04 00:00:00.000 CET + + + + BUG_FIX + macOS: issues with scrollable toolbar that prevent it from starting on mac machines + + + https://github.com/bancika/diy-layout-creator/releases + diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar index 4a1a658eef1f3e9cd1359b42c4e8fc77feaa4059..abb5df616d273e01cbc620e6860b2e7fd82a0f18 100644 GIT binary patch delta 7103 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 delta 7056 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 z - + diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar index 4a1a658eef1f3e9cd1359b42c4e8fc77feaa4059..abb5df616d273e01cbc620e6860b2e7fd82a0f18 100644 GIT binary patch delta 7103 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 delta 7056 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 NT3Jhx_;@KP{68$gzRCaq delta 7799 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 AO8@`> diff --git a/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ToolbarScrollPane.java b/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ToolbarScrollPane.java index cbd9ca1f..8366677f 100644 --- a/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ToolbarScrollPane.java +++ b/diylc/diylc-swing/src/org/diylc/swing/plugins/toolbox/ToolbarScrollPane.java @@ -29,9 +29,13 @@ 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; @@ -43,30 +47,37 @@ public class ToolbarScrollPane extends JPanel { setLayout(new BorderLayout()); setBorder(BorderFactory.createEmptyBorder()); - 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(); - - west = new BasicArrowButton(BasicArrowButton.WEST); - west.setAction(new ActionMapAction("", horizontal, "negativeUnitIncrement", 120)); - west.setBorder(BorderFactory.createLineBorder(UIManager.getColor("Button.shadow"))); - add(west, BorderLayout.WEST); - - east = new BasicArrowButton(BasicArrowButton.EAST); - east.setAction(new ActionMapAction("", horizontal, "positiveUnitIncrement", 120)); - east.setBorder(BorderFactory.createLineBorder(UIManager.getColor("Button.shadow"))); - add(east, BorderLayout.EAST); - - addComponentListener(new ComponentAdapter() { - @Override - public void componentResized(ComponentEvent e) { - refreshScrollButtonVisibility(); - } - }); + try { + JScrollPane scrollPane = new JScrollPane(view); + scrollPane.setBorder(BorderFactory.createEmptyBorder()); + scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + scrollPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_NEVER); + + JScrollBar horizontal = scrollPane.getHorizontalScrollBar(); + + west = new BasicArrowButton(BasicArrowButton.WEST); + west.setAction(new ActionMapAction("", horizontal, "negativeUnitIncrement", 120)); + west.setBorder(BorderFactory.createLineBorder(UIManager.getColor("Button.shadow"))); + add(west, BorderLayout.WEST); + + east = new BasicArrowButton(BasicArrowButton.EAST); + east.setAction(new ActionMapAction("", horizontal, "positiveUnitIncrement", 120)); + east.setBorder(BorderFactory.createLineBorder(UIManager.getColor("Button.shadow"))); + add(east, BorderLayout.EAST); + + addComponentListener(new ComponentAdapter() { + @Override + public void componentResized(ComponentEvent e) { + 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() {