Refix last commit
This commit is contained in:
parent
3c3ba9ef4c
commit
4f3be92208
|
@ -59,8 +59,6 @@ public:
|
|||
virtual bool isAnimatedText() { return false; }
|
||||
virtual bool isStaticText() { return false; }
|
||||
|
||||
virtual bool isValid() { return rawGetThingType() != nullptr; }
|
||||
|
||||
// type shortcuts
|
||||
virtual const ThingTypePtr& getThingType();
|
||||
virtual ThingType *rawGetThingType();
|
||||
|
|
|
@ -336,6 +336,9 @@ uint ThingType::getTextureIndex(int l, int x, int y, int z) {
|
|||
|
||||
int ThingType::getExactSize(int layer, int xPattern, int yPattern, int zPattern, int animationPhase)
|
||||
{
|
||||
if(m_null)
|
||||
return 0;
|
||||
|
||||
getTexture(animationPhase); // we must calculate it anyway.
|
||||
int frameIndex = getTextureIndex(layer, xPattern, yPattern, zPattern);
|
||||
Size size = m_texturesFramesOriginRects[animationPhase][frameIndex].size() - m_texturesFramesOffsets[animationPhase][frameIndex].toSize();
|
||||
|
|
|
@ -44,7 +44,7 @@ void UIItem::drawSelf(Fw::DrawPane drawPane)
|
|||
|
||||
drawImage(m_rect);
|
||||
|
||||
if(m_itemVisible && m_item && m_item->isValid()) {
|
||||
if(m_itemVisible && m_item) {
|
||||
Rect drawRect = getPaddingRect();
|
||||
Point dest = drawRect.bottomRight() + Point(1,1);
|
||||
|
||||
|
|
Loading…
Reference in New Issue