|
@@ -22,10 +22,10 @@ ToolTip::ToolTip( Bildschirm *zScreen )
|
|
alpha( 0 ),
|
|
alpha( 0 ),
|
|
sichtbar( 0 ),
|
|
sichtbar( 0 ),
|
|
zeichnen( 0 ),
|
|
zeichnen( 0 ),
|
|
- bildschirm( zScreen )
|
|
|
|
|
|
+ bildschirm( zScreen )
|
|
{
|
|
{
|
|
members = new RCArray< Zeichnung >();
|
|
members = new RCArray< Zeichnung >();
|
|
- bildschirm->addToolTip( ( ToolTip* )this->getThis() );
|
|
|
|
|
|
+ bildschirm->addToolTip( (ToolTip*)this->getThis() );
|
|
}
|
|
}
|
|
|
|
|
|
// Destruktor
|
|
// Destruktor
|
|
@@ -74,11 +74,11 @@ bool ToolTip::tick( double tickVal )
|
|
{
|
|
{
|
|
for( auto z = members->getIterator(); z; z++ )
|
|
for( auto z = members->getIterator(); z; z++ )
|
|
{
|
|
{
|
|
- size.x = max( size.x, z->getX() + z->getBreite() );
|
|
|
|
- size.y = max( size.y, z->getY() + z->getHeight() );
|
|
|
|
|
|
+ size.x = max( size.x, z->getX() + z->getBreite() + 2 * getRahmenBreite() );
|
|
|
|
+ size.y = max( size.y, z->getY() + z->getHeight() + 2 * getRahmenBreite() );
|
|
}
|
|
}
|
|
this->tval += tickVal * animationSpeed;
|
|
this->tval += tickVal * animationSpeed;
|
|
- int val = ( int )this->tval;
|
|
|
|
|
|
+ int val = (int)this->tval;
|
|
if( val < 1 )
|
|
if( val < 1 )
|
|
{
|
|
{
|
|
bool ret = rend;
|
|
bool ret = rend;
|
|
@@ -104,7 +104,7 @@ bool ToolTip::tick( double tickVal )
|
|
sichtbar = 1;
|
|
sichtbar = 1;
|
|
wartenCount = 0;
|
|
wartenCount = 0;
|
|
alpha = 0xFF;
|
|
alpha = 0xFF;
|
|
- ZeichnungHintergrund::setSize( 0, 0 );
|
|
|
|
|
|
+ ZeichnungHintergrund::setSize( 0, 0 );
|
|
}
|
|
}
|
|
}
|
|
}
|
|
else
|
|
else
|