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

diff --git a/src/gui/widgets/BasicBlockWidget.cxx b/src/gui/widgets/BasicBlockWidget.cxx
index ab06f88..c434c46 100644
--- a/src/gui/widgets/BasicBlockWidget.cxx
+++ b/src/gui/widgets/BasicBlockWidget.cxx
@@ -2,15 +2,27 @@
 
 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.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);
 
-	if (width < 270) width = 270;
+	_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) {
+                               QString line, const QString& href) {
 	QString bytestring;
 
 	for (size_t i(0); i < num_bytes; ++i) {
@@ -20,20 +32,19 @@ void BasicBlockWidget::addItem(uint8_t* bytes, size_t num_bytes,
 		bytestring += ' ';
 	}
 
-	QString old_text = _widget.text();
-	if (old_text == "") {
-		old_text = "<table style=\"background-color: #ccccff;\">";
-	}
-	QString new_text =
-		old_text.remove("</table>") +
-		"<tr><td>" + bytestring +
-		"</td><td>" + line +
-		"</td><td>" + "" +
-		"</td></tr></table>";
-
-	_widget.setText(new_text);
+	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));
+
+	_widget.resizeColumnToContents(0);
+	_widget.resizeColumnToContents(1);
+	_widget.resizeColumnToContents(2);
+
 	width = 12 + _widget.sizeHint().width();
 	height = 25 + _widget.sizeHint().height();
 
 	if (width < 250) width = 250;
+	_widget.resize(width - 12, height - 25);
 }