From 86d21a130864b2f624978d15843fc8a5f740185b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Thu, 8 May 2025 19:47:46 +0200 Subject: [PATCH] CheckboxMenuItems instead Checkboxes in Snap options button. Moved Snap options button. --- .../flash/gui/player/PlayerControls.java | 3 --- .../{abc => player}/SnapOptionsButton.java | 27 +++++++++---------- .../flash/gui/player/ZoomPanel.java | 2 -- 3 files changed, 13 insertions(+), 19 deletions(-) rename src/com/jpexs/decompiler/flash/gui/{abc => player}/SnapOptionsButton.java (77%) diff --git a/src/com/jpexs/decompiler/flash/gui/player/PlayerControls.java b/src/com/jpexs/decompiler/flash/gui/player/PlayerControls.java index 543dabbf7..2f6286f2e 100644 --- a/src/com/jpexs/decompiler/flash/gui/player/PlayerControls.java +++ b/src/com/jpexs/decompiler/flash/gui/player/PlayerControls.java @@ -44,11 +44,8 @@ import java.awt.image.BufferedImage; import java.io.IOException; import java.io.OutputStream; import java.io.PrintStream; -import java.math.BigDecimal; -import java.math.RoundingMode; import java.util.HashMap; import java.util.Map; -import java.util.Objects; import javax.swing.BoxLayout; import javax.swing.Icon; import javax.swing.JButton; diff --git a/src/com/jpexs/decompiler/flash/gui/abc/SnapOptionsButton.java b/src/com/jpexs/decompiler/flash/gui/player/SnapOptionsButton.java similarity index 77% rename from src/com/jpexs/decompiler/flash/gui/abc/SnapOptionsButton.java rename to src/com/jpexs/decompiler/flash/gui/player/SnapOptionsButton.java index ed7a1459a..f990c9e36 100644 --- a/src/com/jpexs/decompiler/flash/gui/abc/SnapOptionsButton.java +++ b/src/com/jpexs/decompiler/flash/gui/player/SnapOptionsButton.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.jpexs.decompiler.flash.gui.abc; +package com.jpexs.decompiler.flash.gui.player; import com.jpexs.decompiler.flash.configuration.Configuration; import com.jpexs.decompiler.flash.gui.AppStrings; @@ -24,7 +24,7 @@ import com.jpexs.decompiler.flash.gui.SnappingDialog; import com.jpexs.decompiler.flash.gui.View; import java.awt.Insets; import java.awt.event.ActionEvent; -import javax.swing.JCheckBox; +import javax.swing.JCheckBoxMenuItem; import javax.swing.JMenuItem; import javax.swing.JPopupMenu; @@ -37,35 +37,34 @@ public class SnapOptionsButton extends PopupButton { public SnapOptionsButton() { super(View.getIcon("snap16")); - setToolTipText(AppStrings.translate("button.snap_options")); - setMargin(new Insets(0, 0, 0, 0)); + setToolTipText(AppStrings.translate("button.snap_options")); } @Override protected JPopupMenu getPopupMenu() { JPopupMenu popupMenu = new JPopupMenu(); - JCheckBox snapAlignMenuItem = new JCheckBox(AppStrings.translate("snap_options.snap_align")); + JCheckBoxMenuItem snapAlignMenuItem = new JCheckBoxMenuItem(AppStrings.translate("snap_options.snap_align")); snapAlignMenuItem.setSelected(Configuration.snapAlign.get()); snapAlignMenuItem.addActionListener(this::snapAlignMenuItemActionPerformed); popupMenu.add(snapAlignMenuItem); - JCheckBox snapToGridMenuItem = new JCheckBox(AppStrings.translate("snap_options.snap_to_grid")); + JCheckBoxMenuItem snapToGridMenuItem = new JCheckBoxMenuItem(AppStrings.translate("snap_options.snap_to_grid")); snapToGridMenuItem.setSelected(Configuration.snapToGrid.get()); snapToGridMenuItem.addActionListener(this::snapToGridMenuItemActionPerformed); popupMenu.add(snapToGridMenuItem); - JCheckBox snapToGuidesMenuItem = new JCheckBox(AppStrings.translate("snap_options.snap_to_guides")); + JCheckBoxMenuItem snapToGuidesMenuItem = new JCheckBoxMenuItem(AppStrings.translate("snap_options.snap_to_guides")); snapToGuidesMenuItem.setSelected(Configuration.snapToGuides.get()); snapToGuidesMenuItem.addActionListener(this::snapToGuidesMenuItemActionPerformed); popupMenu.add(snapToGuidesMenuItem); - JCheckBox snapToPixelsMenuItem = new JCheckBox(AppStrings.translate("snap_options.snap_to_pixels")); + JCheckBoxMenuItem snapToPixelsMenuItem = new JCheckBoxMenuItem(AppStrings.translate("snap_options.snap_to_pixels")); snapToPixelsMenuItem.setSelected(Configuration.snapToPixels.get()); snapToPixelsMenuItem.addActionListener(this::snapToPixelsMenuItemActionPerformed); popupMenu.add(snapToPixelsMenuItem); - JCheckBox snapToObjectsMenuItem = new JCheckBox(AppStrings.translate("snap_options.snap_to_objects")); + JCheckBoxMenuItem snapToObjectsMenuItem = new JCheckBoxMenuItem(AppStrings.translate("snap_options.snap_to_objects")); snapToObjectsMenuItem.setSelected(Configuration.snapToObjects.get()); snapToObjectsMenuItem.addActionListener(this::snapToObjectsMenuItemActionPerformed); popupMenu.add(snapToObjectsMenuItem); @@ -82,27 +81,27 @@ public class SnapOptionsButton extends PopupButton { } private void snapAlignMenuItemActionPerformed(ActionEvent evt) { - JCheckBox menuItem = (JCheckBox) evt.getSource(); + JCheckBoxMenuItem menuItem = (JCheckBoxMenuItem) evt.getSource(); Configuration.snapAlign.set(menuItem.isSelected()); } private void snapToGridMenuItemActionPerformed(ActionEvent evt) { - JCheckBox menuItem = (JCheckBox) evt.getSource(); + JCheckBoxMenuItem menuItem = (JCheckBoxMenuItem) evt.getSource(); Configuration.snapToGrid.set(menuItem.isSelected()); } private void snapToGuidesMenuItemActionPerformed(ActionEvent evt) { - JCheckBox menuItem = (JCheckBox) evt.getSource(); + JCheckBoxMenuItem menuItem = (JCheckBoxMenuItem) evt.getSource(); Configuration.snapToGuides.set(menuItem.isSelected()); } private void snapToPixelsMenuItemActionPerformed(ActionEvent evt) { - JCheckBox menuItem = (JCheckBox) evt.getSource(); + JCheckBoxMenuItem menuItem = (JCheckBoxMenuItem) evt.getSource(); Configuration.snapToPixels.set(menuItem.isSelected()); } private void snapToObjectsMenuItemActionPerformed(ActionEvent evt) { - JCheckBox menuItem = (JCheckBox) evt.getSource(); + JCheckBoxMenuItem menuItem = (JCheckBoxMenuItem) evt.getSource(); Configuration.snapToObjects.set(menuItem.isSelected()); } diff --git a/src/com/jpexs/decompiler/flash/gui/player/ZoomPanel.java b/src/com/jpexs/decompiler/flash/gui/player/ZoomPanel.java index 45fd317f8..7a5f890db 100644 --- a/src/com/jpexs/decompiler/flash/gui/player/ZoomPanel.java +++ b/src/com/jpexs/decompiler/flash/gui/player/ZoomPanel.java @@ -24,7 +24,6 @@ import com.jpexs.decompiler.flash.gui.GuidesDialog; import com.jpexs.decompiler.flash.gui.Main; import com.jpexs.decompiler.flash.gui.PopupButton; import com.jpexs.decompiler.flash.gui.View; -import com.jpexs.decompiler.flash.gui.abc.SnapOptionsButton; import java.awt.FlowLayout; import java.awt.event.ActionEvent; import java.math.BigDecimal; @@ -33,7 +32,6 @@ import java.util.Objects; import javax.swing.JButton; import javax.swing.JCheckBoxMenuItem; import javax.swing.JLabel; -import javax.swing.JMenu; import javax.swing.JMenuItem; import javax.swing.JPanel; import javax.swing.JPopupMenu;