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

diff --git a/src/gui/widgets/BasicBlockWidget.cxx b/src/gui/widgets/BasicBlockWidget.cxx
index 94e0758..e65b6e2 100644
--- a/src/gui/widgets/BasicBlockWidget.cxx
+++ b/src/gui/widgets/BasicBlockWidget.cxx
@@ -2,65 +2,43 @@
 
 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);
-    _widget.setGridStyle(Qt::NoPen);
-	_widget.setShowGrid(false);
-	_widget.setWordWrap(false);
-    _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();
-    width = _widget.rowHeight(0) + 20;
-    if (width < 270) width = 270;
+	_proxy.setWidget(&_widget);
+	_widget.setTextInteractionFlags(Qt::TextSelectableByMouse|Qt::LinksAccessibleByMouse);
+	_widget.setStyleSheet("QLabel { background-color : #ddddff; }");
+	_proxy.setPos(5, 20);
+
+	if (width < 270) width = 270;
 }
 
 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);
-
-    _widget.resizeRowToContents(current_row);
-
-    column_width =
-        _widget.columnWidth(0) +
-        _widget.columnWidth(1) +
-        _widget.columnWidth(2) +
-        5;
-
-    _widget.setMinimumWidth(column_width);
-    _widget.setMinimumHeight((1 + _widget.rowHeight(0)) * (_widget.rowCount()) + 2);
-    _widget.setMaximumHeight((1 + _widget.rowHeight(0)) * (_widget.rowCount()) + 2);
-
-
-    height = (1 + _widget.rowHeight(0)) * (_widget.rowCount()) + 25;
-    width = column_width + 10;
-    if (width < 270) width = 270;
+	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 += ' ';
+	}
+
+	QString old_text = _widget.text();
+	if (old_text == "") {
+		old_text = "<table>";
+	}
+	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();
+
+	if (width < 250) width = 250;
+	_widget.resize(width - 12, height - 25);
 }