Changeset 5286 in josm for trunk/src/org/openstreetmap

Timestamp:

2012-06-19T23:49:52+02:00 (12 years ago)

Author:

bastiK

Message:

fixed: "View > Fullscreen mode" causes 2 toggles in a row, resulting in a short flicker, but otherwise no effect

File:

• trunk/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java (modified) (10 diffs)

trunk/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java

@@ -27 +27 @@
 public class FullscreenToggleAction extends JosmAction {
     private final List<ButtonModel> buttonModels = new ArrayList<ButtonModel>();
+    private boolean selected;
     private GraphicsDevice gd;
     private Rectangle prevBounds;
@@ -42 +43 @@
         Main.toolbar.register(this);
         gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
-        putValue(SELECTED_KEY, Main.pref.getBoolean("draw.fullscreen", false));
+        selected = Main.pref.getBoolean("draw.fullscreen", false);
         notifySelectedState();
     }
@@ -60 +61 @@
     protected void notifySelectedState() {
         for (ButtonModel model: buttonModels) {
-            if (model.isSelected() != isSelected()) {
-                model.setSelected(isSelected());
+            if (model.isSelected() != selected) {
+                model.setSelected(selected);
             }
         }
@@ -67 +68 @@
 
     protected void toggleSelectedState() {
-        putValue(SELECTED_KEY, !isSelected());
-        Main.pref.put("draw.fullscreen", isSelected());
+        selected = !selected;
+        Main.pref.put("draw.fullscreen", selected);
         notifySelectedState();
         setMode();
@@ -74 +75 @@
 
     public void initial() {
-        if (isSelected()) {
+        if(selected)
             setMode();
-        }
     }
 
@@ -91 +91 @@
 
         frame.dispose();
-        frame.setUndecorated(isSelected());
+        frame.setUndecorated(selected);
 
-        if (isSelected()) {
+        if (selected) {
             prevBounds = frame.getBounds();
             frame.setBounds(new Rectangle(Toolkit.getDefaultToolkit().getScreenSize()));
@@ -99 +99 @@
 
         // we cannot use hw-exclusive fullscreen mode in MS-Win, as long
-        // as josm throws out modal dialogs, see here:
-        // http://forums.sun.com/thread.jspa?threadID=5351882 FIXME this url does not work anymore
+        // as josm throws out modal dialogs.
         //
         // the good thing is: fullscreen works without exclusive mode,
@@ -107 +106 @@
         String exclusive = Main.pref.get("draw.fullscreen.exclusive-mode", "auto");
         if ("true".equals(exclusive) || ("auto".equals(exclusive) && !(Main.platform instanceof PlatformHookWindows))) {
-            gd.setFullScreenWindow(isSelected() ? frame : null);
+            gd.setFullScreenWindow(selected ? frame : null);
         }
 
-        if (!isSelected() && prevBounds != null) {
+        if (!selected && prevBounds != null) {
             frame.setBounds(prevBounds);
         }
@@ -117 +116 @@
             wind.setVisible(true);
         }
-        
+
         // Free F10 key to allow it to be used by plugins, even after full screen (see #7502)
-        frame.getJMenuBar().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_F10, 0), "none"); 
+        frame.getJMenuBar().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_F10, 0), "none");
     }
 
@@ -125 +124 @@
         toggleSelectedState();
     }
-    
-    public final boolean isSelected() {
-        return (Boolean)getValue(SELECTED_KEY);
-    }
 }