Author: rmottola
Date: Tue Nov 4 16:16:52 2014
New Revision: 38159
URL: http://svn.gna.org/viewcvs/gnustep?rev=38159&view=rev
Log:
Descend returns negative values, fix accordingly.
Modified:
libs/simplewebkit/trunk/ChangeLog
libs/simplewebkit/trunk/Sources/DOMCSS.m
libs/simplewebkit/trunk/Sources/WebHTMLDocumentView.m
Modified: libs/simplewebkit/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/libs/simplewebkit/trunk/ChangeLog?rev=38159&r1=38158&r2=38159&view=diff
==============================================================================
--- libs/simplewebkit/trunk/ChangeLog (original)
+++ libs/simplewebkit/trunk/ChangeLog Tue Nov 4 16:16:52 2014
@@ -1,3 +1,9 @@
+2014-11-04 Riccardo Mottola <[email protected]>
+
+ * Sources/DOMCSS.m
+ * Sources/WebHTMLDocumentView.m
+ Descend returns negative values, fix accordingly.
+
2013-10-25..28 Nikolaus Schaller <[email protected]>
* fixed issues with CSS inherit and initial
Modified: libs/simplewebkit/trunk/Sources/DOMCSS.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/simplewebkit/trunk/Sources/DOMCSS.m?rev=38159&r1=38158&r2=38159&view=diff
==============================================================================
--- libs/simplewebkit/trunk/Sources/DOMCSS.m (original)
+++ libs/simplewebkit/trunk/Sources/DOMCSS.m Tue Nov 4 16:16:52 2014
@@ -2189,7 +2189,7 @@
{ // convert to given unitType
switch(primitiveType) {
case DOM_CSS_PERCENTAGE: return 0.01*[value floatValue]*base;
- case DOM_CSS_EMS: return font?[value floatValue]*([font
ascender]+[font descender]):0.0;
+ case DOM_CSS_EMS: return font?[value floatValue]*([font
ascender]-[font descender]):0.0;
case DOM_CSS_EXS: return font?[value floatValue]*[font
xHeight]:0.0;
}
return [self getFloatValue:unitType]; // absolute
Modified: libs/simplewebkit/trunk/Sources/WebHTMLDocumentView.m
URL:
http://svn.gna.org/viewcvs/gnustep/libs/simplewebkit/trunk/Sources/WebHTMLDocumentView.m?rev=38159&r1=38158&r2=38159&view=diff
==============================================================================
--- libs/simplewebkit/trunk/Sources/WebHTMLDocumentView.m (original)
+++ libs/simplewebkit/trunk/Sources/WebHTMLDocumentView.m Tue Nov 4
16:16:52 2014
@@ -1691,8 +1691,8 @@
{
// handle @"normal"
// check for simple numerical value -> factor
instead of 100%
- float s=[(DOMCSSPrimitiveValue *) val
getFloatValue:DOM_CSS_PT relativeTo100Percent:[p lineSpacing]+[f ascender]+[f
descender] andFont:[attributes objectForKey:NSFontAttributeName]];
- s-=[f ascender]+[f descender]; // paragraph
style does not define a line-height but a spacing
+ float s=[(DOMCSSPrimitiveValue *) val
getFloatValue:DOM_CSS_PT relativeTo100Percent:[p lineSpacing]+[f ascender]-[f
descender] andFont:[attributes objectForKey:NSFontAttributeName]];
+ s-=[f ascender]-[f descender]; // paragraph
style does not define a line-height but a spacing
if(s < 0.0) s=0.0;
[p setLineSpacing:s];
}
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
