* fixed build for PathContainer.cpp (stupid last minute change...)
* fixed crashing bug in Shape, it doesn't "own" the Style... * fixed problem in Shape in for non Icon-O-Matic build, fNeedsUpdate still needs to be maintained. Having a read-only version has definitely improved efficiency! The icon import time must have dropped 50%. The overall penalty for reading vector icons in Tracker seems to be 1.5 to 2 ms now, including parsing and rendering at 32x32. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18398 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -24,9 +24,9 @@ PathContainerListener::~PathContainerListener() {}
|
|||||||
// constructor
|
// constructor
|
||||||
PathContainer::PathContainer(bool ownsPaths)
|
PathContainer::PathContainer(bool ownsPaths)
|
||||||
: fPaths(16),
|
: fPaths(16),
|
||||||
fOwnsPaths(ownsPaths),
|
fOwnsPaths(ownsPaths)
|
||||||
#ifdef ICON_O_MATIC
|
#ifdef ICON_O_MATIC
|
||||||
fListeners(2)
|
, fListeners(2)
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -416,8 +416,6 @@ Shape::SetStyle(::Style* style)
|
|||||||
fStyle->Release();
|
fStyle->Release();
|
||||||
}
|
}
|
||||||
::Style* oldStyle = fStyle;
|
::Style* oldStyle = fStyle;
|
||||||
#else
|
|
||||||
delete fStyle;
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
fStyle = style;
|
fStyle = style;
|
||||||
@@ -505,6 +503,8 @@ Shape::AddTransformer(Transformer* transformer, int32 index)
|
|||||||
transformer->AddObserver(this);
|
transformer->AddObserver(this);
|
||||||
|
|
||||||
_NotifyTransformerAdded(transformer, index);
|
_NotifyTransformerAdded(transformer, index);
|
||||||
|
#else
|
||||||
|
fNeedsUpdate = true;
|
||||||
#endif
|
#endif
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -518,6 +518,8 @@ Shape::RemoveTransformer(Transformer* transformer)
|
|||||||
transformer->RemoveObserver(this);
|
transformer->RemoveObserver(this);
|
||||||
|
|
||||||
_NotifyTransformerRemoved(transformer);
|
_NotifyTransformerRemoved(transformer);
|
||||||
|
#else
|
||||||
|
fNeedsUpdate = true;
|
||||||
#endif
|
#endif
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user