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=0164bdc9513d67e541a2415ae7aa8cb1f9117a1a;hb=8ab2c60ccb7a4be4119f0672c0fb51816a41d71e;hpb=d51782798930575415d53300340ede3a004f1661

diff --git a/src/gui/widgets/BasicBlockWidget.cxx b/src/gui/widgets/BasicBlockWidget.cxx
index 0164bdc..5dc27ce 100644
--- a/src/gui/widgets/BasicBlockWidget.cxx
+++ b/src/gui/widgets/BasicBlockWidget.cxx
@@ -1,65 +1,64 @@
 #include "BasicBlockWidget.hxx"
+#include "gui/Mainwindow.hxx"
 
-BasicBlockWidget::BasicBlockWidget(const QString& name, BasicBlock * block)
-	: x(-5), y(-20)
-	, dx(270), dy(45)
-	, name(name)
-	, block(block) {
+BasicBlockWidget::BasicBlockWidget(const QString& name, BasicBlock * block,
+                                   Mainwindow * mainwindow)
+	: width(270), height(45)
+	, _proxy(this), name(name)
+	, block(block), mainwindow(mainwindow) {
 	next[0] = NULL;	next[1] = NULL;
-    _widget.setGridStyle(Qt::NoPen);
-    _widget.setMinimumHeight(_widget.rowHeight(0) + 10);
-    _widget.setMaximumHeight(20);
-    _widget.resizeColumnToContents(0);
-    _widget.resizeColumnToContents(1);
-    _widget.resizeColumnToContents(2);
-    _widget.updateGeometry();
-    _widget.setMaximumWidth(260);
-    _widget.setColumnCount(3);
-    _widget.verticalHeader()->hide();
-    _widget.horizontalHeader()->hide();
-    dx = _widget.rowHeight(0) + 20;
-    if (dx < 270) dx = 270;
+	_widget.setStyleSheet("QWidget { background-color : #ddddff; }");
+	_widget.setLayout(&_layout);
+	_layout.setContentsMargins(0, 0, 0, 0);
+	_proxy.setWidget(&_widget);
+	_proxy.setPos(5, 20);
+
+	if (width < 250) width = 250;
 }
 
 void BasicBlockWidget::addItem(uint8_t* bytes, size_t num_bytes,
-                               const QString& line) {
-    size_t current_row = _widget.rowCount();
-    int column_width;
-
-    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 += ' ';
-    }
-
-    _widget.setRowCount(current_row + 1);
-
-    _widget.setItem(current_row, 0, new QTableWidgetItem(bytestring));
-    _widget.setItem(current_row, 1, new QTableWidgetItem(line));
-    _widget.setItem(current_row, 2, new QTableWidgetItem(""));
-    _widget.updateGeometry();
-
-    _widget.resizeColumnToContents(0);
-    _widget.resizeColumnToContents(1);
-    _widget.resizeColumnToContents(2);
+                               QString line, const QString& href) {
+	QString bytestring;
 
-    _widget.resizeRowToContents(current_row);
+	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 += ' ';
+	}
 
-    column_width =
-        _widget.columnWidth(0) +
-        _widget.columnWidth(1) +
-        _widget.columnWidth(2) +
-        2;
+	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.setMinimumWidth(column_width);
-    _widget.setMinimumHeight(_widget.rowHeight(0) * (_widget.rowCount()) + 2);
-    _widget.setMaximumHeight(_widget.rowHeight(0) * (_widget.rowCount()) + 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.childrenRect().width();
+	height = 25 + _widget.childrenRect().height();
 
-    dy = _widget.rowHeight(0) * (_widget.rowCount()) + 25;
-    dx = column_width + 10;
-    if (dx < 270) dx = 270;
+	if (width < 250) width = 250;
+	_widget.resize(width - 12, height - 25);
 }