Switch again BasicBlockWidget base -- to QGraphicsTextItem

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

diff --git a/src/gui/widgets/BasicBlockWidget.cxx b/src/gui/widgets/BasicBlockWidget.cxx
index 0377be3fa2b31882d7a342c75b972eef68b87d40..eccb679f35e971a2749d9a721c3153334be84bd7 100644 (file)
--- a/src/gui/widgets/BasicBlockWidget.cxx
+++ b/src/gui/widgets/BasicBlockWidget.cxx
@@ -1,22 +1,17 @@
 #include "BasicBlockWidget.hxx"
+#include "gui/Mainwindow.hxx"
 
-BasicBlockWidget::BasicBlockWidget(const QString& name, BasicBlock * block)
+BasicBlockWidget::BasicBlockWidget(const QString& name, BasicBlock * block,
+                                   Mainwindow * mainwindow)
        : width(270), height(45)
-       , name(name), block(block)
-       , _proxy(this) {
+       , _widget("", this)
+       , _table(NULL), name(name)
+       , block(block), mainwindow(mainwindow) {
        next[0] = NULL; next[1] = NULL;
-       _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, 20);
-
-       _proxy.setWidget(&_widget);
-       _proxy.setPos(5, 20);
+       _widget.setTextInteractionFlags(Qt::TextSelectableByMouse|
+                                       Qt::LinksAccessibleByMouse);
+
+       _widget.setPos(5, 20);
 
        if (width < 250) width = 250;
 }
@@ -24,6 +19,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";
@@ -32,19 +39,25 @@ void BasicBlockWidget::addItem(uint8_t* bytes, size_t num_bytes,
                bytestring += ' ';
        }
 
-       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));
+       _table->cellAt(row, 0).firstCursorPosition().insertText(bytestring);
+
+       line = line.replace('\t', ' ').toHtmlEscaped();
+       if (href != "") {
+               line = "<a href=\"" + href + "\">" + line + "</a>";
+       }
+
+       _table->cellAt(row, 1).firstCursorPosition().insertHtml(line);
 
-       _widget.resizeColumnToContents(0);
-       _widget.resizeColumnToContents(1);
-       _widget.resizeColumnToContents(2);
+       QObject::connect(&_widget, &QGraphicsTextItem::linkActivated,
+                        [=](QString str) {
+                                if (str.startsWith("function:")) {
+                                        QString address = str.remove("function:");
+                                        mainwindow->switchMainPlaneToAddress(address.toInt(NULL, 16));
+                                }
+                        });
 
-       width = 12 + _widget.sizeHint().width();
-       height = 25 + _widget.sizeHint().height();
+       width = 10 + _widget.boundingRect().width();
+       height = 25 + _widget.boundingRect().height();
 
        if (width < 250) width = 250;
-       _widget.resize(width - 12, height - 25);
 }