diff --git a/build_common.xml b/build_common.xml index a6a2c4590..c0a6d175b 100644 --- a/build_common.xml +++ b/build_common.xml @@ -108,7 +108,14 @@ - + + + + + + + + @@ -120,7 +127,7 @@ + haltOnFailure="${TESTHALTFAILURE}" verbose="2" workingDir="${basedir}"> @@ -518,8 +525,16 @@ - - + + + + + + + + + + @@ -708,20 +723,24 @@ - + + + + + - + - + - + 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}" > 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; }