Changeset 2525 in josm
- Timestamp:
- 2009-11-28T07:38:50+01:00 (15 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/dialogs
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java
r2475 r2525 67 67 dlg.showDialog(); 68 68 if (dlg.isDialogInCollapsedView()) { 69 dlg.isCollapsed = false; // pretend to be in Default view, this will be set back by collapse() 69 70 dlg.collapse(); 70 71 } -
trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
r2512 r2525 66 66 * currently minimized or not. 67 67 */ 68 privateboolean isCollapsed;68 boolean isCollapsed; 69 69 70 70 /** the preferred height if the toggle dialog is expanded */ … … 119 119 isDocked = Main.pref.getBoolean(preferencePrefix+".docked", true); 120 120 isCollapsed = Main.pref.getBoolean(preferencePrefix+".minimized", false); 121 //System.err.println(name+": showing="+isShowing+" docked="+isDocked+" collapsed="+isCollapsed); 121 122 } 122 123 … … 142 143 } else { 143 144 showDialog(); 144 expand(); 145 dialogsPanel.reconstruct(Action.INVISIBLE_TO_DEFAULT, ToggleDialog.this); 145 if (isDocked && isCollapsed) { 146 expand(); 147 } 148 if (isDocked) { 149 dialogsPanel.reconstruct(Action.INVISIBLE_TO_DEFAULT, ToggleDialog.this); 150 } 146 151 } 147 152 } … … 206 211 */ 207 212 public void collapse() { 208 if (isShowing && isDocked && !isCollapsed) {213 // if (isShowing && isDocked && !isCollapsed) { 209 214 setContentVisible(false); 210 215 setIsCollapsed(true); … … 214 219 lblMinimized.setIcon(ImageProvider.get("misc", "minimized")); 215 220 hideNotify(); 216 } 221 // } 222 // else throw ... 217 223 } 218 224 … … 221 227 */ 222 228 protected void expand() { 223 if (isShowing && isDocked && isCollapsed) {229 // if (isShowing && isDocked && isCollapsed) { 224 230 setContentVisible(true); 225 231 setIsCollapsed(false); … … 228 234 lblMinimized.setIcon(ImageProvider.get("misc", "normal")); 229 235 showNotify(); 230 } 236 // } 237 // else throw ... 231 238 } 232 239 … … 318 325 @Override 319 326 public void mouseClicked(MouseEvent e) { 320 // 327 // toggleExpandedState(); 321 328 if (isCollapsed) { 322 329 expand();
Note:
See TracChangeset
for help on using the changeset viewer.