[isidorus-cvs] r659 - in branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets: base text

[lgiessmann at common-lisp.net]

Author: lgiessmann
Date: Fri Jul 22 02:30:54 2011
New Revision: 659

Log:
gdl-frontend: Widgets: fixed a bug when applying the css property "vertical-align"

Modified:
   branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java
   branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java
   branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTextObject.java

Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java
==============================================================================
--- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java	Fri Jul 22 02:15:04 2011	(r658)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/base/GdlVisibleObject.java	Fri Jul 22 02:30:54 2011	(r659)
@@ -1170,7 +1170,6 @@
 	// sets the vertical-align style property of this element and all it's sub-elements by using the GWT DOM class
 	public void setVerticalAlign(Widget widget, VerticalAlign value, String styleClass) throws InvalidGdlSchemaException, ExecutionException {
 		if(value != null){
-			this.setCssProperty(widget, styleClass, "verticalAlign", value.getCssName());
 			this.setCssProperty(styleClass, "verticalAlign", value.getCssName());
 		}
 	}

Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java
==============================================================================
--- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java	Fri Jul 22 02:15:04 2011	(r658)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlText.java	Fri Jul 22 02:30:54 2011	(r659)
@@ -48,12 +48,6 @@
 		super(tmRepresentative);
 		// TODO: create a text element for each TM-elem
 		this.createNewTextArea().setText("Text"); // TODO: remove only for debugging
-		//NumUnitValue val = this.getPaddingBottom(null); // TODO: remove
-		//String str = "null";
-		//if(val != null) str = val.getCssValue();
-		//if(val != null) DOM.setStyleAttribute(this.subElements.get(0).getElement(), "paddingBottom", str);
-		//DOM.setStyleAttribute(this.subElements.get(0).getElement(), "paddingBottom", "20px");
-		//Window.alert(">> " + str);
 	}
 	
 	
@@ -649,10 +643,6 @@
 		ResizeValue resize = this.getResize();
 		
 		// GdlVisibleObject
-		this.setContentOrientation(source, this.getContentOrientation());
-		
-		this.setVerticalAlign(source, this.getVerticalAlign(null), null);
-
 		this.setMargin(source, this.getMargin(null), null);
 		this.setMarginTop(source, this.getMarginTop(null), null);
 		this.setMarginRight(source, this.getMarginRight(null), null);

Modified: branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTextObject.java
==============================================================================
--- branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTextObject.java	Fri Jul 22 02:15:04 2011	(r658)
+++ branches/gdl-frontend/src/anaToMia/GDL_Widgets/src/us/isidor/gdl/anaToMia/Widgets/text/GdlTextObject.java	Fri Jul 22 02:30:54 2011	(r659)
@@ -1,6 +1,7 @@
 package us.isidor.gdl.anaToMia.Widgets.text;
 
 import com.google.gwt.dom.client.Style.FontStyle;
+import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.ui.Widget;
 import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Occurrence;
 import us.isidor.gdl.anaToMia.TopicMaps.TopicMapsModel.Topic;
@@ -28,6 +29,7 @@
 	public GdlTextObject(Topic tmRepresentative) throws InvalidGdlSchemaException, ExecutionException{
 		super(tmRepresentative);
 		super.setGdlStyle();
+		DOM.setStyleAttribute(this.mainPanel.getElement(), "float", "left"); // TODO: remove
 	}