X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fgui%2Fwidgets%2FBasicBlockWidget.hxx;h=557f556a33edbb0424ce4baaa583ede926b4c473;hp=803331c7cfd9a597750daaeb31041c413041a190;hb=2ac7c08ca9536a5b0c08c6ff331241ce6b082af0;hpb=b5f582057f66328e643cdff8181308fba7641185

diff --git a/src/gui/widgets/BasicBlockWidget.hxx b/src/gui/widgets/BasicBlockWidget.hxx
index 803331c..557f556 100644
--- a/src/gui/widgets/BasicBlockWidget.hxx
+++ b/src/gui/widgets/BasicBlockWidget.hxx
@@ -5,19 +5,63 @@ class BasicBlockWidget : public QGraphicsItem
 public:
     BasicBlockWidget(const QString& name)
 		: x(-5), y(-20)
-		, dx(250), dy(270)
+		, dx(270), dy(45)
 		, name(name) {
-		_widget.setMinimumWidth(_widget.sizeHintForColumn(0) + 10);
-		dy = _widget.sizeHint().height() + 20;
-		dx = _widget.sizeHintForColumn(0) + 10;
+		_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;
     }
 
-	void addItem(const QString& line) {
-		_widget.addItem(line);
-		_widget.setMinimumWidth(_widget.sizeHintForColumn(0));
-		dy = _widget.sizeHint().height() + 20;
-		dx = _widget.sizeHintForColumn(0) + 10;
+	void 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) +
+			2;
+
+		_widget.setMinimumWidth(column_width);
+		_widget.setMinimumHeight(_widget.rowHeight(1) * (_widget.rowCount()) + 2);
+		_widget.setMaximumHeight(_widget.rowHeight(1) * (_widget.rowCount()) + 2);
+
+
+		dy = _widget.rowHeight(0) * (_widget.rowCount()) + 25;
+		dx = column_width + 10;
 		if (dx < 270) dx = 270;
 	}
 
@@ -39,6 +83,6 @@ public:
     }
 private:
     int x, y, dx, dy;
-    QListWidget _widget;
+    QTableWidget _widget;
 	QString name;
 };