Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 19462
Collapse All | Expand All

(-)src/org/eclipse/jface/wizard/WizardDialog.java (-20 lines)
Lines 529-536 Link Here
529
        pmlayout.numColumns = 1;
529
        pmlayout.numColumns = 1;
530
        progressMonitorPart = createProgressMonitorPart(composite, pmlayout);
530
        progressMonitorPart = createProgressMonitorPart(composite, pmlayout);
531
        GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
531
        GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
532
        gridData.widthHint = 0;
533
        gridData.heightHint = 0;
534
        progressMonitorPart
532
        progressMonitorPart
535
                .setLayoutData(gridData);
533
                .setLayoutData(gridData);
536
        progressMonitorPart.setVisible(false);
534
        progressMonitorPart.setVisible(false);
Lines 1160-1183 Link Here
1160
        // Update the buttons
1158
        // Update the buttons
1161
        updateButtons();
1159
        updateButtons();
1162
        
1160
        
1163
        // progress monitor required for this wizard - resize dialog 
1164
        if (wizard.needsProgressMonitor()){
1165
        	GridData data = (GridData)progressMonitorPart.getLayoutData();
1166
        	data.widthHint = SWT.DEFAULT;
1167
        	data.heightHint = SWT.DEFAULT;
1168
	    	Shell shell = getShell();
1169
	    	if (shell != null){
1170
	    		// ensure the wizard does not shrink upon resize
1171
	    		Point currentSize = shell.getSize();
1172
	    		Point newSize = shell.computeSize(SWT.DEFAULT, SWT.DEFAULT);
1173
	    		// only adjust height for progress bar, adjusting the width will resize 
1174
	    		// the wizard too wide when there is a long wizard description.
1175
	    		int height = Math.max(currentSize.y, newSize.y);
1176
	    		setShellSize(currentSize.x, height);
1177
	    		progressMonitorPart.getParent().layout(true);
1178
	    	}
1179
        }
1180
        
1181
		// Fires the page change event
1161
		// Fires the page change event
1182
		firePageChanged(new PageChangedEvent(this, getCurrentPage()));
1162
		firePageChanged(new PageChangedEvent(this, getCurrentPage()));
1183
    }
1163
    }

Return to bug 19462