core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/editor/PortalPage.java
changeset 2035 42a3ddebe583
parent 1734 bf670d38123a
child 2062 4d032dc346bf
equal deleted inserted replaced
2034:8ca82bbe1973 2035:42a3ddebe583
   152 		Composite backgroundParent = portalEditor.getBackgroundParent();
   152 		Composite backgroundParent = portalEditor.getBackgroundParent();
   153 		pageComposite = new StackComposite(parent, backgroundParent);
   153 		pageComposite = new StackComposite(parent, backgroundParent);
   154 		for (Layer layer : layers) {
   154 		for (Layer layer : layers) {
   155 			Composite layerComposite = new SharedBackgroundComposite(pageComposite, backgroundParent);
   155 			Composite layerComposite = new SharedBackgroundComposite(pageComposite, backgroundParent);
   156 			GridDataFactory.fillDefaults().grab(true, true).applyTo(layerComposite);
   156 			GridDataFactory.fillDefaults().grab(true, true).applyTo(layerComposite);
   157 			GridLayoutFactory.fillDefaults().numColumns(2).spacing(20, 0).extendedMargins(20, 20, 20, 0).applyTo(layerComposite);
   157 			GridLayoutFactory.fillDefaults().numColumns(2).spacing(10, 0).extendedMargins(0, 0, 10, 0).applyTo(layerComposite);
   158 			createTaskBarControls(portalEditor, layerComposite, layer.getLayer());
   158 			createTaskBarControls(portalEditor, layerComposite, layer.getLayer());
   159 			createMainControl(portalEditor, layerComposite, layer.getLayer());
   159 			createMainControl(portalEditor, layerComposite, layer.getLayer());
   160 			layer.setControl(layerComposite);
   160 			layer.setControl(layerComposite);
   161 		}
   161 		}
   162 	}
   162 	}
   165 		Composite backgroundParent = portalEditor.getBackgroundParent();
   165 		Composite backgroundParent = portalEditor.getBackgroundParent();
   166 		Composite taskComposite = new SharedBackgroundComposite(pageComposite, backgroundParent);
   166 		Composite taskComposite = new SharedBackgroundComposite(pageComposite, backgroundParent);
   167 		GridLayoutFactory.fillDefaults().applyTo(taskComposite);
   167 		GridLayoutFactory.fillDefaults().applyTo(taskComposite);
   168 		GridDataFactory.fillDefaults().grab(false, true).applyTo(taskComposite);
   168 		GridDataFactory.fillDefaults().grab(false, true).applyTo(taskComposite);
   169 		TaskBar taskBar = new TaskBar(taskComposite, backgroundParent, this);
   169 		TaskBar taskBar = new TaskBar(taskComposite, backgroundParent, this);
   170 		GridDataFactory.fillDefaults().minSize(150, SWT.DEFAULT).grab(true, false).indent(0, 0).applyTo(taskBar);
   170 		GridDataFactory.fillDefaults().minSize(120, SWT.DEFAULT).grab(true, false).indent(0, 0).applyTo(taskBar);
   171 		pageTaskBars.add(taskBar);
   171 		pageTaskBars.add(taskBar);
   172 		ActionUIUpdater updater = new ActionUIUpdater();
   172 		ActionUIUpdater updater = new ActionUIUpdater();
   173 		createCommandBars(backgroundParent, taskComposite, updater, 
   173 		createCommandBars(backgroundParent, taskComposite, updater, 
   174 				layerExtension.createCommandBars(portalEditor, updater));
   174 				layerExtension.createCommandBars(portalEditor, updater));
   175 		if (commandBarFactory != null) {
   175 		if (commandBarFactory != null) {