X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fgui%2Fwidgets%2FBasicBlockWidget.cxx;h=5dc27ce40efc5760e736dcd3241292e6bd047b7d;hp=e65b6e2a49940ea1da922be8cdb7eb4cf17ca63c;hb=8ab2c60ccb7a4be4119f0672c0fb51816a41d71e;hpb=9904a19c01453a1d86d0249424f2afe9e3263af0

diff --git a/src/gui/widgets/BasicBlockWidget.cxx b/src/gui/widgets/BasicBlockWidget.cxx
index e65b6e2..5dc27ce 100644
--- a/src/gui/widgets/BasicBlockWidget.cxx
+++ b/src/gui/widgets/BasicBlockWidget.cxx
@@ -1,20 +1,23 @@
 #include "BasicBlockWidget.hxx"
+#include "gui/Mainwindow.hxx"
 
-BasicBlockWidget::BasicBlockWidget(const QString& name, BasicBlock * block)
+BasicBlockWidget::BasicBlockWidget(const QString& name, BasicBlock * block,
+                                   Mainwindow * mainwindow)
 	: width(270), height(45)
-	, name(name), block(block)
-	, _proxy(this) {
+	, _proxy(this), name(name)
+	, block(block), mainwindow(mainwindow) {
 	next[0] = NULL;	next[1] = NULL;
+	_widget.setStyleSheet("QWidget { background-color : #ddddff; }");
+	_widget.setLayout(&_layout);
+	_layout.setContentsMargins(0, 0, 0, 0);
 	_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 < 250) width = 250;
 }
 
 void BasicBlockWidget::addItem(uint8_t* bytes, size_t num_bytes,
-                               const QString& line) {
+                               QString line, const QString& href) {
 	QString bytestring;
 
 	for (size_t i(0); i < num_bytes; ++i) {
@@ -24,20 +27,37 @@ void BasicBlockWidget::addItem(uint8_t* bytes, size_t num_bytes,
 		bytestring += ' ';
 	}
 
-	QString old_text = _widget.text();
-	if (old_text == "") {
-		old_text = "<table>";
+	int current_row = _layout.rowCount();
+	QLabel * bytestring_label = new QLabel(bytestring);
+	bytestring_label->setTextInteractionFlags(Qt::TextSelectableByMouse|
+	                                          Qt::LinksAccessibleByMouse);
+	bytestring_label->setWordWrap(false);
+	_layout.addWidget(bytestring_label, current_row, 0);
+	bytestring_label->setVisible(true);
+
+	line = line.replace('\t', ' ').toHtmlEscaped();
+	if (href != "") {
+		line = "<a href=\"" + href + "\">" + line + "</a>";
 	}
-	QString new_text =
-		old_text.remove("</table>") +
-		"<tr><td>" + bytestring +
-		"</td><td>" + line.toHtmlEscaped() +
-		"</td><td>" + "" +
-		"</td></tr></table>";
-
-	_widget.setText(new_text);
-	width = 12 + _widget.sizeHint().width();
-	height = 25 + _widget.sizeHint().height();
+	QLabel * instruction_label = new QLabel(line);
+	instruction_label->setTextInteractionFlags(Qt::TextSelectableByMouse|
+	                                           Qt::LinksAccessibleByMouse);
+	instruction_label->setWordWrap(false);
+	instruction_label->setFocusPolicy(Qt::StrongFocus);
+	if (href != "") {
+		QObject::connect(instruction_label, &QLabel::linkActivated,
+		                 [=](QString str) {
+			                 if (str.startsWith("function:")) {
+					                 QString address = str.remove("function:");
+					                 mainwindow->switchMainPlaneToAddress(address.toInt(NULL, 16));
+				                 }
+		                 });
+	}
+	_layout.addWidget(instruction_label, current_row, 1);
+	instruction_label->setVisible(true);
+
+	width = 12 + _widget.childrenRect().width();
+	height = 25 + _widget.childrenRect().height();
 
 	if (width < 250) width = 250;
 	_widget.resize(width - 12, height - 25);