Switch again BasicBlockWidget base -- to QGraphicsTextItem

That one seems to be the final word here -- we'll see. Anyway it has
proper TextDocument / TextCursor support, can render HTML and is a
GraphicsItem so no playing to get scrollbars away -- it doesn't have
any.

diff --git a/src/gui/widgets/BasicBlockWidget.cxx b/src/gui/widgets/BasicBlockWidget.cxx
index 5dc27ce40efc5760e736dcd3241292e6bd047b7d..eccb679f35e971a2749d9a721c3153334be84bd7 100644 (file)
--- a/src/gui/widgets/BasicBlockWidget.cxx
+++ b/src/gui/widgets/BasicBlockWidget.cxx
@@ -4,14 +4,14 @@
 BasicBlockWidget::BasicBlockWidget(const QString& name, BasicBlock * block,
                                    Mainwindow * mainwindow)
        : width(270), height(45)
-       , _proxy(this), name(name)
+       , _widget("", this)
+       , _table(NULL), name(name)
        , block(block), mainwindow(mainwindow) {
        next[0] = NULL; next[1] = NULL;
-       _widget.setStyleSheet("QWidget { background-color : #ddddff; }");
-       _widget.setLayout(&_layout);
-       _layout.setContentsMargins(0, 0, 0, 0);
-       _proxy.setWidget(&_widget);
-       _proxy.setPos(5, 20);
+       _widget.setTextInteractionFlags(Qt::TextSelectableByMouse|
+                                       Qt::LinksAccessibleByMouse);
+
+       _widget.setPos(5, 20);
 
        if (width < 250) width = 250;
 }
@@ -19,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";
@@ -27,38 +39,25 @@ void BasicBlockWidget::addItem(uint8_t* bytes, size_t num_bytes,
                bytestring += ' ';
        }
 
-       int current_row = _layout.rowCount();
-       QLabel * bytestring_label = new QLabel(bytestring);
-       bytestring_label->setTextInteractionFlags(Qt::TextSelectableByMouse|
-                                                 Qt::LinksAccessibleByMouse);
-       bytestring_label->setWordWrap(false);
-       _layout.addWidget(bytestring_label, current_row, 0);
-       bytestring_label->setVisible(true);
+       _table->cellAt(row, 0).firstCursorPosition().insertText(bytestring);
 
        line = line.replace('\t', ' ').toHtmlEscaped();
        if (href != "") {
                line = "<a href=\"" + href + "\">" + line + "</a>";
        }
-       QLabel * instruction_label = new QLabel(line);
-       instruction_label->setTextInteractionFlags(Qt::TextSelectableByMouse|
-                                                  Qt::LinksAccessibleByMouse);
-       instruction_label->setWordWrap(false);
-       instruction_label->setFocusPolicy(Qt::StrongFocus);
-       if (href != "") {
-               QObject::connect(instruction_label, &QLabel::linkActivated,
-                                [=](QString str) {
-                                        if (str.startsWith("function:")) {
-                                                        QString address = str.remove("function:");
-                                                        mainwindow->switchMainPlaneToAddress(address.toInt(NULL, 16));
-                                                }
-                                });
-       }
-       _layout.addWidget(instruction_label, current_row, 1);
-       instruction_label->setVisible(true);
 
-       width = 12 + _widget.childrenRect().width();
-       height = 25 + _widget.childrenRect().height();
+       _table->cellAt(row, 1).firstCursorPosition().insertHtml(line);
+
+       QObject::connect(&_widget, &QGraphicsTextItem::linkActivated,
+                        [=](QString str) {
+                                if (str.startsWith("function:")) {
+                                        QString address = str.remove("function:");
+                                        mainwindow->switchMainPlaneToAddress(address.toInt(NULL, 16));
+                                }
+                        });
+
+       width = 10 + _widget.boundingRect().width();
+       height = 25 + _widget.boundingRect().height();
 
        if (width < 250) width = 250;
-       _widget.resize(width - 12, height - 25);
 }

diff --git a/src/gui/widgets/BasicBlockWidget.hxx b/src/gui/widgets/BasicBlockWidget.hxx
index c351c3a69a28093762c600a079b7b7acca0de2ca..8ee33a56f21a43e6bcccfb26bbde48b6e395f58f 100644 (file)
--- a/src/gui/widgets/BasicBlockWidget.hxx
+++ b/src/gui/widgets/BasicBlockWidget.hxx
@@ -10,8 +10,9 @@
 
 class Mainwindow;
 
-class BasicBlockWidget : public QGraphicsItem
+class BasicBlockWidget : public QObject, public QGraphicsItem
 {
+       Q_OBJECT
 public:
        BasicBlockWidget(const QString& name, BasicBlock * block, Mainwindow * mainwindow);
 
@@ -65,9 +66,8 @@ public:
        }
 private:
        uint32_t width, height;
-       QGraphicsProxyWidget _proxy;
-       QGridLayout _layout;
-       QLabel _widget;
+       QGraphicsTextItem _widget;
+       QTextTable* _table;
        QString name;
        BasicBlock * block;
        Mainwindow * mainwindow;