[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/work/khtml-svg/svg (silent)
From: Nikolas Zimmermann <wildfox () kde ! org>
Date: 2006-03-30 22:09:06
Message-ID: 1143756546.779418.6775.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 524677 by wildfox:
SVN_SILENT: detabify
M +77 -77 SVGSVGElementImpl.cpp
--- branches/work/khtml-svg/svg/SVGSVGElementImpl.cpp #524676:524677
@@ -54,7 +54,7 @@
DOM::NodeImpl::Id SVGSVGElementImpl::id() const
{
- return SVGID_SVG;
+ return SVGID_SVG;
}
SVGAnimatedLengthImpl *SVGSVGElementImpl::x() const
@@ -184,38 +184,38 @@
float SVGSVGElementImpl::currentScale() const
{
- /* FIXME
+ /* FIXME
if(!canvasView())
return 1.;
return canvasView()->zoom();
- */
+ */
- return 1.0;
+ return 1.0;
}
void SVGSVGElementImpl::setCurrentScale(float scale, int &)
{
- /* FIXME
+ /* FIXME
if(canvasView())
{
float oldzoom = canvasView()->zoom();
canvasView()->setZoom(scale);
getDocument()->dispatchZoomEvent(oldzoom, scale);
}
- */
+ */
}
SVGPointImpl *SVGSVGElementImpl::currentTranslate() const
{
- /* FIXME
+ /* FIXME
if(!canvas())
return 0;
return createSVGPoint(canvasView()->pan());
- */
+ */
- return 0;
+ return 0;
}
/* FIXME
@@ -234,56 +234,56 @@
void SVGSVGElementImpl::parseAttribute(DOM::AttributeImpl *attr)
{
- int ignoreException;
+ int ignoreException;
- DOM::DOMString value = attr->value();
- switch(attr->id())
- {
- case SVGATTR_X:
- {
- x()->baseVal()->setValueAsString(value, ignoreException);
- break;
- }
- case SVGATTR_Y:
- {
- y()->baseVal()->setValueAsString(value, ignoreException);
- break;
- }
+ DOM::DOMString value = attr->value();
+ switch(attr->id())
+ {
+ case SVGATTR_X:
+ {
+ x()->baseVal()->setValueAsString(value, ignoreException);
+ break;
+ }
+ case SVGATTR_Y:
+ {
+ y()->baseVal()->setValueAsString(value, ignoreException);
+ break;
+ }
- case ATTR_WIDTH:
- {
- width()->baseVal()->setValueAsString(value, ignoreException);
- addCSSProperty(CSS_PROP_WIDTH, value);
- break;
- }
-
- case ATTR_HEIGHT:
- {
- height()->baseVal()->setValueAsString(value, ignoreException);
- addCSSProperty(CSS_PROP_HEIGHT, value);
- break;
- }
- default:
- {
- if(SVGTestsImpl::parseAttribute(attr)) return;
- if(SVGLangSpaceImpl::parseAttribute(attr)) return;
- if(SVGExternalResourcesRequiredImpl::parseAttribute(attr)) return;
- if(SVGFitToViewBoxImpl::parseAttribute(attr))
- {
- if(renderer())
- {
- static_cast<KCanvasContainer *>(renderer())->setViewBox(
- QRectF(viewBox()->baseVal()->x(), viewBox()->baseVal()->y(),
- viewBox()->baseVal()->width(), viewBox()->baseVal()->height()));
- }
+ case ATTR_WIDTH:
+ {
+ width()->baseVal()->setValueAsString(value, ignoreException);
+ addCSSProperty(CSS_PROP_WIDTH, value);
+ break;
+ }
+
+ case ATTR_HEIGHT:
+ {
+ height()->baseVal()->setValueAsString(value, ignoreException);
+ addCSSProperty(CSS_PROP_HEIGHT, value);
+ break;
+ }
+ default:
+ {
+ if(SVGTestsImpl::parseAttribute(attr)) return;
+ if(SVGLangSpaceImpl::parseAttribute(attr)) return;
+ if(SVGExternalResourcesRequiredImpl::parseAttribute(attr)) return;
+ if(SVGFitToViewBoxImpl::parseAttribute(attr))
+ {
+ if(renderer())
+ {
+ static_cast<KCanvasContainer *>(renderer())->setViewBox(
+ QRectF(viewBox()->baseVal()->x(), viewBox()->baseVal()->y(),
+ viewBox()->baseVal()->width(), \
viewBox()->baseVal()->height())); + }
- return;
- }
+ return;
+ }
- if(SVGZoomAndPanImpl::parseAttribute(attr)) return;
- SVGStyledElementImpl::parseAttribute(attr);
- }
- }
+ if(SVGZoomAndPanImpl::parseAttribute(attr)) return;
+ SVGStyledElementImpl::parseAttribute(attr);
+ }
+ }
}
unsigned long SVGSVGElementImpl::suspendRedraw(unsigned long /* \
max_wait_milliseconds */) @@ -309,35 +309,35 @@
void SVGSVGElementImpl::pauseAnimations()
{
- /* FIXME
+ /* FIXME
if(!getDocument()->timeScheduler()->animationsPaused())
getDocument()->timeScheduler()->toggleAnimations();
- */
+ */
}
void SVGSVGElementImpl::unpauseAnimations()
{
- /* FIXME
+ /* FIXME
if(getDocument()->timeScheduler()->animationsPaused())
getDocument()->timeScheduler()->toggleAnimations();
- */
+ */
}
bool SVGSVGElementImpl::animationsPaused()
{
- /* FIXME
+ /* FIXME
return getDocument()->timeScheduler()->animationsPaused();
- */
+ */
}
float SVGSVGElementImpl::getCurrentTime()
{
- /* FIXME
+ /* FIXME
SVGDocumentImpl *document = static_cast<SVGDocumentImpl *>(ownerDocument());
return document->timeScheduler()->elapsed();
- */
+ */
- return 0.0;
+ return 0.0;
}
void SVGSVGElementImpl::setCurrentTime(float /* seconds */)
@@ -482,28 +482,28 @@
khtml::RenderObject *SVGSVGElementImpl::createRenderer(khtml::RenderArena *arena, \
khtml::RenderStyle *style) {
- KCanvasContainer *rootContainer = KRenderingDevice::self()->createContainer(arena, \
style, this); + KCanvasContainer *rootContainer = \
KRenderingDevice::self()->createContainer(arena, style, this);
- // FIXME: all this setup should be done after attributesChanged, not here.
- float _x = x()->baseVal()->value();
- float _y = y()->baseVal()->value();
- float _width = width()->baseVal()->value();
- float _height = height()->baseVal()->value();
+ // FIXME: all this setup should be done after attributesChanged, not here.
+ float _x = x()->baseVal()->value();
+ float _y = y()->baseVal()->value();
+ float _width = width()->baseVal()->value();
+ float _height = height()->baseVal()->value();
- rootContainer->setViewport(QRectF(_x, _y, _width, _height));
- rootContainer->setViewBox(QRectF(viewBox()->baseVal()->x(), \
viewBox()->baseVal()->y(), viewBox()->baseVal()->width(), \
viewBox()->baseVal()->height()));
- rootContainer->setAlign(KCAlign(preserveAspectRatio()->baseVal()->align() - 1));
- rootContainer->setSlice(preserveAspectRatio()->baseVal()->meetOrSlice() == \
SVG_MEETORSLICE_SLICE); + rootContainer->setViewport(QRectF(_x, _y, _width, \
_height)); + rootContainer->setViewBox(QRectF(viewBox()->baseVal()->x(), \
viewBox()->baseVal()->y(), viewBox()->baseVal()->width(), \
viewBox()->baseVal()->height())); + \
rootContainer->setAlign(KCAlign(preserveAspectRatio()->baseVal()->align() - 1)); + \
rootContainer->setSlice(preserveAspectRatio()->baseVal()->meetOrSlice() == \
SVG_MEETORSLICE_SLICE);
- return rootContainer;
+ return rootContainer;
}
void SVGSVGElementImpl::setZoomAndPan(unsigned short zoomAndPan, int &exceptioncode)
{
SVGZoomAndPanImpl::setZoomAndPan(zoomAndPan, exceptioncode);
- /* FIXME
+ /* FIXME
canvasView()->enableZoomAndPan(zoomAndPan == SVG_ZOOMANDPAN_MAGNIFY);
- */
+ */
}
// vim:ts=4:noet
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic