Changeset 12132 in josm for trunk/src/org/openstreetmap/josm/actions
- Timestamp:
- 2017-05-13T01:35:21+02:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/DialogsToggleAction.java
r11770 r12132 18 18 */ 19 19 public class DialogsToggleAction extends ToggleAction { 20 21 private boolean toolbarPreviouslyVisible; 22 private boolean sideToolbarPreviouslyVisible; 20 23 21 24 /** … … 46 49 if (Main.isDisplayingMapView()) { 47 50 boolean selected = isSelected(); 51 if (!selected) { 52 toolbarPreviouslyVisible = Main.pref.getBoolean("toolbar.visible", true); 53 sideToolbarPreviouslyVisible = Main.pref.getBoolean("sidetoolbar.visible", true); 54 } 48 55 Main.map.setDialogsPanelVisible(selected); 49 56 Main.map.statusLine.setVisible(selected || Main.pref.getBoolean("statusbar.always-visible", true)); 50 57 Main.main.menu.setVisible(selected || Main.pref.getBoolean("menu.always-visible", true)); 51 58 // Toolbars listen to preference changes, use it here 52 if (!Main.pref.getBoolean("toolbar.always-visible", true) ) {59 if (!Main.pref.getBoolean("toolbar.always-visible", true) && (!selected || toolbarPreviouslyVisible)) { 53 60 Main.pref.put("toolbar.visible", selected); 54 61 } 55 if (!Main.pref.getBoolean("sidetoolbar.always-visible", true) ) {62 if (!Main.pref.getBoolean("sidetoolbar.always-visible", true) && (!selected || sideToolbarPreviouslyVisible)) { 56 63 Main.pref.put("sidetoolbar.visible", selected); 57 64 }
Note:
See TracChangeset
for help on using the changeset viewer.