QTableWidget -> QLabel + HTML

[frida/frida.git] / src / gui / widgets / BasicBlockWidget.cxx

diff --git a/src/gui/widgets/BasicBlockWidget.cxx b/src/gui/widgets/BasicBlockWidget.cxx
index 7b33fe0a17fe43f530519c8e3c1544bae375b0d2..282eab27c53b0e869f4a3241445397bfabf77891 100644 (file)
--- a/src/gui/widgets/BasicBlockWidget.cxx
+++ b/src/gui/widgets/BasicBlockWidget.cxx
@@ -5,26 +5,12 @@ BasicBlockWidget::BasicBlockWidget(const QString& name, BasicBlock * block)
        , name(name), block(block) {
        next[0] = NULL; next[1] = NULL;
     _widget.move(5, 20);
-    _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();
-    width = _widget.rowHeight(0) + 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) {
@@ -34,31 +20,17 @@ void BasicBlockWidget::addItem(uint8_t* bytes, size_t num_bytes,
         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 old_text = _widget.text();
+       QString new_text =
+               old_text.remove("</table>") +
+               "<tr><td>" + bytestring +
+               "</td><td>" + line +
+               "</td><td>" + "" +
+               "</td></tr></table>";
 
-    _widget.resizeRowToContents(current_row);
+       _widget.setText(new_text);
+       width = 12 + _widget.sizeHint().width();
+       height = 25 + _widget.sizeHint().height();
 
-    column_width =
-        _widget.columnWidth(0) +
-        _widget.columnWidth(1) +
-        _widget.columnWidth(2) +
-        2;
-
-    _widget.setMinimumWidth(column_width);
-    _widget.setMinimumHeight(_widget.rowHeight(0) * (_widget.rowCount()) + 2);
-    _widget.setMaximumHeight(_widget.rowHeight(0) * (_widget.rowCount()) + 2);
-
-
-    height = _widget.rowHeight(0) * (_widget.rowCount()) + 25;
-    width = column_width + 10;
-    if (width < 270) width = 270;
+    if (width < 250) width = 250;
 }