mirror of
https://github.com/fralx/LimeReport.git
synced 2024-12-25 09:04:39 +03:00
followTo has been fixed
This commit is contained in:
parent
0261a11b30
commit
f927f3a83c
@ -233,7 +233,7 @@ void TextItem::setContent(const QString &value)
|
|||||||
// }
|
// }
|
||||||
|
|
||||||
if (!isLoading()){
|
if (!isLoading()){
|
||||||
if (autoHeight() || autoWidth())
|
if (autoHeight() || autoWidth() || hasFollower())
|
||||||
initTextSizes();
|
initTextSizes();
|
||||||
update(rect());
|
update(rect());
|
||||||
notify("content",oldValue,value);
|
notify("content",oldValue,value);
|
||||||
@ -245,7 +245,7 @@ void TextItem::updateItemSize(DataSourceManager* dataManager, RenderPass pass, i
|
|||||||
{
|
{
|
||||||
if (isNeedExpandContent())
|
if (isNeedExpandContent())
|
||||||
expandContent(dataManager, pass);
|
expandContent(dataManager, pass);
|
||||||
if (!isLoading() && (autoHeight() || autoWidth()) )
|
if (!isLoading() && (autoHeight() || autoWidth() || hasFollower()) )
|
||||||
initTextSizes();
|
initTextSizes();
|
||||||
|
|
||||||
if (m_textSize.width()>width() && ((m_autoWidth==MaxWordLength)||(m_autoWidth==MaxStringLength))){
|
if (m_textSize.width()>width() && ((m_autoWidth==MaxWordLength)||(m_autoWidth==MaxStringLength))){
|
||||||
@ -547,7 +547,7 @@ void TextItem::clearFollower()
|
|||||||
m_follower = 0;
|
m_follower = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool TextItem::hasFollower()
|
bool TextItem::hasFollower() const
|
||||||
{
|
{
|
||||||
return m_follower != 0;
|
return m_follower != 0;
|
||||||
}
|
}
|
||||||
@ -645,7 +645,7 @@ bool TextItem::isNeedUpdateSize(RenderPass pass) const
|
|||||||
{
|
{
|
||||||
Q_UNUSED(pass)
|
Q_UNUSED(pass)
|
||||||
|
|
||||||
if (autoHeight() && autoWidth()){
|
if (autoHeight() && autoWidth() || hasFollower()){
|
||||||
initTextSizes();
|
initTextSizes();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -150,8 +150,8 @@ public:
|
|||||||
void setFollowTo(const QString &followTo);
|
void setFollowTo(const QString &followTo);
|
||||||
void setFollower(TextItem* follower);
|
void setFollower(TextItem* follower);
|
||||||
void clearFollower();
|
void clearFollower();
|
||||||
bool hasFollower();
|
bool hasFollower() const;
|
||||||
TextItem* follower(){ return m_follower;}
|
TextItem* follower() const { return m_follower;}
|
||||||
bool initFollower(QString follower);
|
bool initFollower(QString follower);
|
||||||
|
|
||||||
// IPageInit interface
|
// IPageInit interface
|
||||||
|
Loading…
Reference in New Issue
Block a user