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

Timestamp:

2017-05-13T01:35:21+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #14784 - Main toolbar/side toolbar keep reappearing after using Tab

File:

• trunk/src/org/openstreetmap/josm/actions/DialogsToggleAction.java (modified) (2 diffs)

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

@@ -18 +18 @@
 */
 public class DialogsToggleAction extends ToggleAction {
+
+    private boolean toolbarPreviouslyVisible;
+    private boolean sideToolbarPreviouslyVisible;
 
     /**
@@ -46 +49 @@
         if (Main.isDisplayingMapView()) {
             boolean selected = isSelected();
+            if (!selected) {
+                toolbarPreviouslyVisible = Main.pref.getBoolean("toolbar.visible", true);
+                sideToolbarPreviouslyVisible = Main.pref.getBoolean("sidetoolbar.visible", true);
+            }
             Main.map.setDialogsPanelVisible(selected);
             Main.map.statusLine.setVisible(selected || Main.pref.getBoolean("statusbar.always-visible", true));
             Main.main.menu.setVisible(selected || Main.pref.getBoolean("menu.always-visible", true));
             // Toolbars listen to preference changes, use it here
-            if (!Main.pref.getBoolean("toolbar.always-visible", true)) {
+            if (!Main.pref.getBoolean("toolbar.always-visible", true) && (!selected || toolbarPreviouslyVisible)) {
                 Main.pref.put("toolbar.visible", selected);
             }
-            if (!Main.pref.getBoolean("sidetoolbar.always-visible", true)) {
+            if (!Main.pref.getBoolean("sidetoolbar.always-visible", true) && (!selected || sideToolbarPreviouslyVisible)) {
                 Main.pref.put("sidetoolbar.visible", selected);
             }