X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fgui%2Fwidgets%2FBasicBlockWidget.cxx;h=2880af34a8cf2ff23ca13798d1f81291aa3ee99b;hp=c434c46949f6a4cede34ea28652ba2f1c5c2c61f;hb=8ba5b5b647e39ce4b337b6b56a246f293c511954;hpb=459e107cb0f6fcf17618e06837fc8ff5b3f0ce8d

diff --git a/src/gui/widgets/BasicBlockWidget.cxx b/src/gui/widgets/BasicBlockWidget.cxx
index c434c46..2880af3 100644
--- a/src/gui/widgets/BasicBlockWidget.cxx
+++ b/src/gui/widgets/BasicBlockWidget.cxx
@@ -1,20 +1,15 @@
 #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("QTableWidget { background-color : #ddddff; }");
-	_widget.setSizeAdjustPolicy(QAbstractScrollArea::AdjustToContents);
-	_widget.verticalHeader()->setDefaultSectionSize(18);
-	_widget.setColumnCount(3);
-	_widget.verticalHeader()->hide();
-	_widget.horizontalHeader()->hide();
-	_widget.setShowGrid(false);
-	_widget.setWordWrap(false);
-	_widget.setMinimumSize(210, 40);
-
+	_widget.setStyleSheet("QWidget { background-color : #ddddff; }");
+	_widget.setLayout(&_layout);
+	_layout.setContentsMargins(0, 0, 0, 0);
 	_proxy.setWidget(&_widget);
 	_proxy.setPos(5, 20);
 
@@ -32,18 +27,37 @@ void BasicBlockWidget::addItem(uint8_t* bytes, size_t num_bytes,
 		bytestring += ' ';
 	}
 
-	int current_row = _widget.rowCount();
-	_widget.setRowCount(1 + current_row);
-	_widget.setItem(current_row, 0, new QTableWidgetItem(bytestring));
-	_widget.setItem(current_row, 1, new QTableWidgetItem(line.replace('\t', ' ')));
-//	_widget.setItem(current_row, 2, new QTableWidgetItem(href));
+	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);
 
-	_widget.resizeColumnToContents(0);
-	_widget.resizeColumnToContents(1);
-	_widget.resizeColumnToContents(2);
+	line = line.replace('\t', ' ').toHtmlEscaped();
+	if (href != "") {
+		line = "<a href=\"" + href + "\">" + line + "</a>";
+	}
+	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.sizeHint().width();
-	height = 25 + _widget.sizeHint().height();
+	height = 25 + _widget.childrenRect().height();
 
 	if (width < 250) width = 250;
 	_widget.resize(width - 12, height - 25);