Author: ktlili
Date: Tue Jan 15 17:29:43 2008
New Revision: 19520
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19520&repname=
=3Djahia
Log:
- fix box header size bug (layout manager)
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/layo=
utManager/client/JahiaLayoutManager.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/layo=
utManager/client/component/dragdrop/DraggableWidget.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/layo=
utManager/client/widgets/FullScreenPanel.java
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gw=
t/layoutManager/client/JahiaLayoutManager.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/layoutManager/client/JahiaLay=
outManager.java&rev=3D19520&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/layo=
utManager/client/JahiaLayoutManager.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/layo=
utManager/client/JahiaLayoutManager.java Tue Jan 15 17:29:43 2008
@@ -1,10 +1,9 @@
package org.jahia.ajax.gwt.layoutManager.client;
=
-import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.google.gwt.user.client.ui.HTML;
+import com.google.gwt.user.client.DOM;
+import com.google.gwt.user.client.Element;
import com.google.gwt.user.client.ui.RootPanel;
import org.jahia.ajax.gwt.base.client.JahiaPageEntryPoint;
-import org.jahia.ajax.gwt.base.client.JahiaService;
import org.jahia.ajax.gwt.base.client.beans.JahiaGWTPage;
import org.jahia.ajax.gwt.layoutManager.client.component.JahiaDndArea;
=
@@ -18,15 +17,23 @@
*/
public class JahiaLayoutManager extends JahiaPageEntryPoint {
public static final String LAYOUT_MANAGER_ID =3D "layoutManager";
+ public static final String LAYOUT_MANAGER_WIDTH =3D "lm-with";
=
public void onModuleLoad() {
final RootPanel rootPanel =3D getRootPanel();
-
- // init panel
- final JahiaGWTPage page =3D getJahiaGWTPage();
- JahiaDndArea jahiaDndManager =3D new JahiaDndArea(this);
- jahiaDndManager.init(page);
- rootPanel.add(jahiaDndManager);
+ if (rootPanel !=3D null) {
+ // get Root element attributes
+ Element rootEle =3D rootPanel.getElement();
+
+ // get Width
+ DOM.getElementAttribute(rootEle, LAYOUT_MANAGER_WIDTH);
+
+ // init panel
+ final JahiaGWTPage page =3D getJahiaGWTPage();
+ JahiaDndArea jahiaDndManager =3D new JahiaDndArea(this);
+ jahiaDndManager.init(page);
+ rootPanel.add(jahiaDndManager);
+ }
=
=
}
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gw=
t/layoutManager/client/component/dragdrop/DraggableWidget.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/layoutManager/client/componen=
t/dragdrop/DraggableWidget.java&rev=3D19520&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/layo=
utManager/client/component/dragdrop/DraggableWidget.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/layo=
utManager/client/component/dragdrop/DraggableWidget.java Tue Jan 15 17:29:4=
3 2008
@@ -143,7 +143,7 @@
westPanel.add(minimizeWidget);
headerPanel.add(westPanel, DockPanel.WEST);
headerPanel.setCellHorizontalAlignment(westPanel, DockPanel.ALIGN_=
LEFT);
- headerPanel.setCellWidth(westPanel, "1px");
+ headerPanel.setCellWidth(westPanel, "17px");
// east panel
HorizontalPanel eastPanel =3D new HorizontalPanel();
eastPanel.setSpacing(2);
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gw=
t/layoutManager/client/widgets/FullScreenPanel.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/layoutManager/client/widgets/=
FullScreenPanel.java&rev=3D19520&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/layo=
utManager/client/widgets/FullScreenPanel.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/ajax/gwt/layo=
utManager/client/widgets/FullScreenPanel.java Tue Jan 15 17:29:43 2008
@@ -1,5 +1,7 @@
package org.jahia.ajax.gwt.layoutManager.client.widgets;
=
+import com.google.gwt.user.client.DOM;
+import com.google.gwt.user.client.Element;
import com.google.gwt.user.client.ui.*;
import org.jahia.ajax.gwt.layoutManager.client.component.dragdrop.Draggabl=
eWidget;
import org.jahia.ajax.gwt.layoutManager.client.component.dragdrop.SetNorma=
lStateDraggableWidgetClickListener;
@@ -23,6 +25,8 @@
setHeight("100%");
setWidth("100%");
panel.setSize("100%", "100%");
+
+ // add header panel
HorizontalPanel headerPanel =3D new HorizontalPanel();
headerPanel.addStyleName("layout-manager-box-header");
headerPanel.setWidth("100%");
@@ -41,8 +45,13 @@
panel.setCellHeight(headerPanel, "10px");
panel.setCellVerticalAlignment(headerPanel, VerticalPanel.ALIGN_TO=
P);
panel.setHorizontalAlignment(HorizontalPanel.ALIGN_RIGHT);
+
+ =
+ // add current wiget
panel.add(currentDraggableWidget);
panel.setCellVerticalAlignment(currentDraggableWidget, VerticalPan=
el.ALIGN_TOP);
+
+ // set wiget of the current dialog box
setWidget(panel);
}
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list