From: Christoph Egger <siccegge@faui49man12.informatik.uni-erlangen.de>
Date: Thu, 8 Jan 2015 17:40:21 +0000 (+0100)
Subject: Properly color text part of basic block widgets
X-Git-Tag: v0.1~140
X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=commitdiff_plain;h=9904a19c01453a1d86d0249424f2afe9e3263af0

Properly color text part of basic block widgets

If the text was smaller than the minimum, rendering was ugly
---

diff --git a/src/gui/widgets/BasicBlockWidget.cxx b/src/gui/widgets/BasicBlockWidget.cxx
index 2003458..e65b6e2 100644
--- a/src/gui/widgets/BasicBlockWidget.cxx
+++ b/src/gui/widgets/BasicBlockWidget.cxx
@@ -7,7 +7,7 @@ BasicBlockWidget::BasicBlockWidget(const QString& name, BasicBlock * block)
 	next[0] = NULL;	next[1] = NULL;
 	_proxy.setWidget(&_widget);
 	_widget.setTextInteractionFlags(Qt::TextSelectableByMouse|Qt::LinksAccessibleByMouse);
-
+	_widget.setStyleSheet("QLabel { background-color : #ddddff; }");
 	_proxy.setPos(5, 20);
 
 	if (width < 270) width = 270;
@@ -26,19 +26,19 @@ void BasicBlockWidget::addItem(uint8_t* bytes, size_t num_bytes,
 
 	QString old_text = _widget.text();
 	if (old_text == "") {
-		old_text = "<table style=\"background-color: #ddddff;\">";
+		old_text = "<table>";
 	}
 	QString new_text =
 		old_text.remove("</table>") +
 		"<tr><td>" + bytestring +
-		"</td><td>" + line +
+		"</td><td>" + line.toHtmlEscaped() +
 		"</td><td>" + "" +
 		"</td></tr></table>";
 
 	_widget.setText(new_text);
-	_widget.resize(_widget.sizeHint().width(), _widget.sizeHint().height());
 	width = 12 + _widget.sizeHint().width();
 	height = 25 + _widget.sizeHint().height();
 
 	if (width < 250) width = 250;
+	_widget.resize(width - 12, height - 25);
 }