From cb269451fd26e502fd888419cc0c95cce0c8f5b7 Mon Sep 17 00:00:00 2001 From: "honfika@gmail.com" Date: Thu, 23 Apr 2015 19:01:34 +0200 Subject: [PATCH 1/4] Issue #865, #613: ribbon prefered width fix --- src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java b/src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java index f97ca9d53..ae601f3ce 100644 --- a/src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java +++ b/src/com/jpexs/decompiler/flash/gui/MainFrameRibbonMenu.java @@ -388,17 +388,19 @@ public class MainFrameRibbonMenu extends MainFrameMenu implements ActionListener private List getIconBandResizePolicies(JRibbonBand ribbonBand) { List resizePolicies = new ArrayList<>(); + IconRibbonBandResizePolicy iconBandResizePolicy = new IconRibbonBandResizePolicy(ribbonBand.getControlPanel()); + final int width = Math.max(105, iconBandResizePolicy.getPreferredWidth(0, 0)); resizePolicies.add(new BaseRibbonBandResizePolicy(ribbonBand.getControlPanel()) { @Override public int getPreferredWidth(int i, int i1) { - return 105; + return width; } @Override public void install(int i, int i1) { } }); - resizePolicies.add(new IconRibbonBandResizePolicy(ribbonBand.getControlPanel())); + resizePolicies.add(iconBandResizePolicy); return resizePolicies; } From 649d8376e35f84c74d80c07ead0776c7e97f52e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Thu, 23 Apr 2015 22:11:59 +0200 Subject: [PATCH 2/4] Build newversion only when tests are okay --- build_common.xml | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/build_common.xml b/build_common.xml index a6a2c4590..ad8ee3ee5 100644 --- a/build_common.xml +++ b/build_common.xml @@ -108,7 +108,14 @@ - + + + + + + + + @@ -120,7 +127,7 @@ + haltOnFailure="${TESTHALTFAILURE}" verbose="2" workingDir="${basedir}"> @@ -708,20 +715,24 @@ - + + + + + - + - + - + From 5c0d704a2ccb8def37602d6bfda8a567e65a0294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Thu, 23 Apr 2015 22:27:49 +0200 Subject: [PATCH 3/4] Build newversion only when tests are okay --- libsrc/ffdec_lib/build_common.xml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/libsrc/ffdec_lib/build_common.xml b/libsrc/ffdec_lib/build_common.xml index df3267b05..53019764c 100644 --- a/libsrc/ffdec_lib/build_common.xml +++ b/libsrc/ffdec_lib/build_common.xml @@ -71,7 +71,16 @@ - + + + + + + + + + + @@ -83,7 +92,7 @@ + haltOnFailure="${TESTHALT}" verbose="2" workingDir="${basedir}" > From a6419a2b75210b7c76d1a5a4ac62667c41409060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Thu, 23 Apr 2015 22:32:35 +0200 Subject: [PATCH 4/4] Build newversion only when tests are okay --- build_common.xml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/build_common.xml b/build_common.xml index ad8ee3ee5..c0a6d175b 100644 --- a/build_common.xml +++ b/build_common.xml @@ -525,8 +525,16 @@ - - + + + + + + + + + +