X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fgui%2Fwidgets%2FBasicBlockWidget.cxx;h=cceb2ffd26a064d57464b0b4b0df9d93bfe95abf;hp=282eab27c53b0e869f4a3241445397bfabf77891;hb=1b95144814ee74e611fd8a3806e54f064b120460;hpb=d80925a9bd94f07a119acefc8b71d10f41ab81be

diff --git a/src/gui/widgets/BasicBlockWidget.cxx b/src/gui/widgets/BasicBlockWidget.cxx
index 282eab2..cceb2ff 100644
--- a/src/gui/widgets/BasicBlockWidget.cxx
+++ b/src/gui/widgets/BasicBlockWidget.cxx
@@ -2,25 +2,38 @@
 
 BasicBlockWidget::BasicBlockWidget(const QString& name, BasicBlock * block)
 	: width(270), height(45)
-	, name(name), block(block) {
+	, name(name), block(block)
+	, _proxy(this) {
 	next[0] = NULL;	next[1] = NULL;
-    _widget.move(5, 20);
+	_proxy.setWidget(&_widget);
+	_widget.setTextInteractionFlags(Qt::TextSelectableByMouse|Qt::LinksAccessibleByMouse);
+	_widget.setStyleSheet("QLabel { background-color : #ddddff; }");
+	_proxy.setPos(5, 20);
 
-    if (width < 270) width = 270;
+	if (width < 270) width = 270;
 }
 
 void BasicBlockWidget::addItem(uint8_t* bytes, size_t num_bytes,
-                               const QString& line) {
-    QString bytestring;
+                               QString line, const QString& href) {
+	QString bytestring;
 
-    for (size_t i(0); i < num_bytes; ++i) {
-        const char * hexdigits = "0123456789ABCDEF";
-        bytestring += hexdigits[(bytes[i] >> 4) & 0xF];
-        bytestring += hexdigits[bytes[i] & 0xF];
-        bytestring += ' ';
-    }
+	for (size_t i(0); i < num_bytes; ++i) {
+		const char * hexdigits = "0123456789ABCDEF";
+		bytestring += hexdigits[(bytes[i] >> 4) & 0xF];
+		bytestring += hexdigits[bytes[i] & 0xF];
+		bytestring += ' ';
+	}
 
 	QString old_text = _widget.text();
+	if (old_text == "") {
+		old_text = "<table>";
+	}
+
+	line = line.toHtmlEscaped();
+	if (href != "") {
+		line = "<a href=\"" + href + "\">" + line + "</a>";
+	}
+
 	QString new_text =
 		old_text.remove("</table>") +
 		"<tr><td>" + bytestring +
@@ -32,5 +45,6 @@ void BasicBlockWidget::addItem(uint8_t* bytes, size_t num_bytes,
 	width = 12 + _widget.sizeHint().width();
 	height = 25 + _widget.sizeHint().height();
 
-    if (width < 250) width = 250;
+	if (width < 250) width = 250;
+	_widget.resize(width - 12, height - 25);
 }