qooxdoo-commit

[Sebastian W. <wp...@us...>]

Update of /cvsroot/qooxdoo/qooxdoo/source/script/appearance
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18721/source/script/appearance

Modified Files:
      Tag: renderer
	QxAppearanceTheme-Default.js 
Log Message:
Enhanced text and html objects

Index: QxAppearanceTheme-Default.js
===================================================================
RCS file: /cvsroot/qooxdoo/qooxdoo/source/script/appearance/Attic/QxAppearanceTheme-Default.js,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -d -r1.1.2.12 -r1.1.2.13
--- QxAppearanceTheme-Default.js	25 Jan 2006 09:19:16 -0000	1.1.2.12
+++ QxAppearanceTheme-Default.js	25 Jan 2006 11:22:08 -0000	1.1.2.13
@@ -125,6 +125,17 @@
   }
 });
 
+theme.registerAppearance("htmlcontainer",
+{
+  initial : function(vWidget, vTheme) {
+    return vTheme.initialFrom(vWidget, "label");
+  },
+  
+  state : function(vWidget, vTheme, vStates) {
+    return vTheme.stateFrom(vWidget, "label");  
+  }
+});
+
 theme.registerAppearance("popup",
 {
   initial : function(vWidget, vTheme)
@@ -1258,7 +1269,7 @@
     
   initial : function(vWidget, vTheme)
   {
-    return {
+    return QxUtil.mergeObjectWith(vTheme.initialFrom(vWidget, "label"), {
       cursor : QxConst.CORE_DEFAULT,
       marginLeft : 3,
       height : 15,
@@ -1267,15 +1278,15 @@
       paddingBottom : 2,
       paddingLeft : 2,
       allowStretchY : false
-    };
+    });
   },
   
   state : function(vWidget, vTheme, vStates)
   {
-    return {
+    return QxUtil.mergeObjectWith(vTheme.stateFrom(vWidget, "label"), {
       backgroundColor : vStates.selected ? this.bgcolor_selected : null,
       color : vStates.selected ? this.color_selected : null
-    };    
+    });    
   }
 });
 
@@ -1533,15 +1544,15 @@
     vWidget.setStyleProperty(QxConst.PROPERTY_WHITESPACE, "nowrap");  
     vWidget.setStyleProperty(QxConst.PROPERTY_OVERFLOW_TEXT, QxConst.OVERFLOW_VALUE_ELLIPSIS);   
 
-    return {
+    return QxUtil.mergeObjectWith(vTheme.initialFrom(vWidget, "htmlcontainer"), {
       overflow: QxConst.OVERFLOW_VALUE_HIDDEN,
       paddingLeft : 6,
       paddingRight : 6    
-    }; 
+    }); 
   },
   
   state : function(vWidget, vTheme, vStates) {
-    return vTheme.stateFrom(vWidget, "list-view-content-cell");   
+    return QxUtil.mergeObjectWith(vTheme.stateFrom(vWidget, "htmlcontainer"), vTheme.stateFrom(vWidget, "list-view-content-cell"));   
   }
 });