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

diff --git a/src/gui/widgets/BasicBlockWidget.cxx b/src/gui/widgets/BasicBlockWidget.cxx
index 5dc27ce..f611329 100644
--- a/src/gui/widgets/BasicBlockWidget.cxx
+++ b/src/gui/widgets/BasicBlockWidget.cxx
@@ -3,15 +3,13 @@
 
 BasicBlockWidget::BasicBlockWidget(const QString& name, BasicBlock * block,
                                    Mainwindow * mainwindow)
-	: width(270), height(45)
-	, _proxy(this), name(name)
+	: width(270), height(45), name(name)
+	, _widget("", this), _table(NULL)
 	, 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);
-	_proxy.setPos(5, 20);
+	_widget.setPos(5, 20);
+	_widget.setTextInteractionFlags(Qt::TextSelectableByMouse|
+	                                Qt::LinksAccessibleByMouse);
 
 	if (width < 250) width = 250;
 }
@@ -19,6 +17,18 @@ BasicBlockWidget::BasicBlockWidget(const QString& name, BasicBlock * block,
 void BasicBlockWidget::addItem(uint8_t* bytes, size_t num_bytes,
                                QString line, const QString& href) {
 	QString bytestring;
+	int row;
+
+	if (_table) {
+		row = _table->rows();
+		_table->appendRows(1);
+	} else {
+		row = 0;
+		QTextTableFormat format;
+		format.setBorderStyle(QTextFrameFormat::BorderStyle_None);
+		format.setBorder(0);
+		_table = _widget.textCursor().insertTable(1, 3, format);
+	}
 
 	for (size_t i(0); i < num_bytes; ++i) {
 		const char * hexdigits = "0123456789ABCDEF";
@@ -27,38 +37,47 @@ void BasicBlockWidget::addItem(uint8_t* bytes, size_t num_bytes,
 		bytestring += ' ';
 	}
 
-	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);
+	_table->cellAt(row, 0).firstCursorPosition().insertText(bytestring);
 
 	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();
+	_table->cellAt(row, 1).firstCursorPosition().insertHtml(line);
+
+	QObject::connect(&_widget, &QGraphicsTextItem::linkActivated,
+	                 [=](QString str) {
+		                 if (str.startsWith("function:")) {
+			                 QString address = str.remove("function:");
+			                 mainwindow->switchMainPlaneToAddress(address.toInt(NULL, 16));
+		                 }
+	                 });
+
+	width = 10 + _widget.boundingRect().width();
+	height = 25 + _widget.boundingRect().height();
 
 	if (width < 250) width = 250;
-	_widget.resize(width - 12, height - 25);
 }
+
+void BasicBlockWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
+	           QWidget *widget) {
+	painter->fillRect(0, 0, width, height, QColor(0xcc, 0xcc, 0xff, 0xff));
+	painter->setPen(QColor(0x00, 0x00, 0xff, 0xff));
+	painter->drawRect(0, 0, width, height);
+	painter->drawText(5, 15, name);
+}
+
+QRectF BasicBlockWidget::boundingRect() const  {
+	qreal penWidth = 1;
+	QRectF result(- penWidth / 2, - penWidth / 2,
+	              width + penWidth, height + penWidth);
+	return result;
+}
+
+std::array<QPointF, 3> BasicBlockWidget::getExits() const {
+	return { { mapToScene(QPointF(  width/3, height)),
+			   mapToScene(QPointF(  width/2, height)),
+			   mapToScene(QPointF(2*width/3, height)) } };
+}
+