lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-25 16:06:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve handling of multiline richresourcetext documents

Browse Source
This commit is contained in:
baldurk
2020-12-15 22:52:38 +00:00
parent ed813e25bb
commit d727feb806
3 changed files with 44 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/QRDUtils.cpp
+38 -3
View File
@@ -196,6 +196,7 @@ struct RichResourceText
// the ideal width for the document
int idealWidth = 0;
int numLines = 1;
// cache the context once we've obtained it.
ICaptureContext *ctxptr = NULL;
@@ -231,6 +232,8 @@ struct RichResourceText
text.clear();
numLines = 1;
for(const QVariant &v : fragments)
{
if(v.userType() == qMetaTypeId<ResourceId>())
@@ -248,11 +251,23 @@ struct RichResourceText
}
else
{
html += lit("<td valign=\"middle\">%1</td>").arg(v.toString().toHtmlEscaped());
QString htmlfrag = v.toString().toHtmlEscaped();
int newlines = htmlfrag.count(QLatin1Char('\n'));
htmlfrag.replace(lit(" "), lit("&nbsp;"));
htmlfrag.replace(lit("\n"), lit("</td></tr></table><table><tr><td valign=\"middle\">"));
html += lit("<td valign=\"middle\">%1</td>").arg(htmlfrag);
text += v.toString();
// this only generates one block
numLines += newlines;
// this generates one block at least
fragmentIndexFromBlockIndex.push_back(i);
for(int l = 0; l < newlines; l++)
{
fragmentIndexFromBlockIndex.push_back(i);
fragmentIndexFromBlockIndex.push_back(i);
}
}
i++;
@@ -693,6 +708,24 @@ int RichResourceTextWidthHint(const QWidget *owner, const QFont &font, const QVa
return linkedText->idealWidth;
}
int RichResourceTextHeightHint(const QWidget *owner, const QFont &font, const QVariant &var)
{
QFontMetrics metrics(font);
if(var.userType() == qMetaTypeId<RichResourceTextPtr>())
{
RichResourceTextPtr linkedText = var.value<RichResourceTextPtr>();
static const int margin = RichResourceTextMargin;
linkedText->cacheDocument(owner);
return linkedText->numLines * (metrics.lineSpacing() + margin * 2);
}
return metrics.height();
}
bool RichResourceTextMouseEvent(const QWidget *owner, const QVariant &var, QRect rect,
const QFont &font, QMouseEvent *event)
{
@@ -935,7 +968,9 @@ QSize RichTextViewDelegate::sizeHint(const QStyleOptionViewItem &option, const Q
QVariant v = index.data();
if(RichResourceTextCheck(v))
return QSize(RichResourceTextWidthHint(m_widget, option.font, v), option.fontMetrics.height());
return QSize(
RichResourceTextWidthHint(m_widget, option.font, v),
qMax(RichResourceTextHeightHint(m_widget, option.font, v), option.fontMetrics.height()));
}
return ForwardingDelegate::sizeHint(option, index);