From 9ec8606194f7996edf21615ac34007e1391eb80f Mon Sep 17 00:00:00 2001 From: Christoph Egger Date: Tue, 26 May 2015 18:06:59 +0200 Subject: [PATCH] Remove adjustSize() hack -- doesn't seem to be necessary any more --- src/gui/widgets/BasicBlockWidget.cxx | 33 +++------------------------- 1 file changed, 3 insertions(+), 30 deletions(-) diff --git a/src/gui/widgets/BasicBlockWidget.cxx b/src/gui/widgets/BasicBlockWidget.cxx index 78618c4..eee78c4 100644 --- a/src/gui/widgets/BasicBlockWidget.cxx +++ b/src/gui/widgets/BasicBlockWidget.cxx @@ -16,8 +16,6 @@ public: CustomQGraphicsTextItem(const QString& text, BasicBlockWidget* parent) : QGraphicsTextItem(text, parent), parent(parent) {} void contextMenuEvent(QGraphicsSceneContextMenuEvent*); - - void adjustSize(); private: void addComment(int row, bool global); @@ -84,31 +82,6 @@ void CustomQGraphicsTextItem::contextMenuEvent(QGraphicsSceneContextMenuEvent* e menu.exec(event->screenPos()); } -/* QGraphicsTextItem has an adjustSize() function that is supposed to - * resize the widget to it's "ideal" size. However it totally ignores - * all directives to not wrap lines and "ideal" is actually just a - * bunch of heuristics. - * - * We are starting with a hopefully absurdly large startingwidth and - * reduce it untill a line is broken (detected by a change in - * height). As long as the width (1000 here) is sufficiently large, - * this should give us a widget without any line-wrapping. - * - * One needs to call this on a Pointer of tye CustomQGraphicsTextItem - * as the adjustSize() function is not polymorphic (vurtual). - */ -void CustomQGraphicsTextItem::adjustSize() { - int width = 1000; - setTextWidth(width); - int height = boundingRect().height(); - while (width > 250 && height == boundingRect().height()) { - setTextWidth(width -= 10); - } - width += 10; - if (width < 250) width = 250; - setTextWidth(width); -} - BasicBlockWidget::BasicBlockWidget(const QString& name, BasicBlock * block, Mainwindow * mainwindow) : width(200), height(45), name(name) @@ -183,7 +156,7 @@ void BasicBlockWidget::updateFunctionName(RenameFunctionEvent *event) { c.insertText(event->new_name.c_str()); QGraphicsTextItem* item = _widget.get(); - ((CustomQGraphicsTextItem*)item)->adjustSize(); + item->adjustSize(); } } } @@ -212,7 +185,7 @@ void BasicBlockWidget::changeCommentHandler(ChangeCommentEvent* event) { cursor.removeSelectedText(); cursor.insertHtml(formatComments(&*inst_it)); QGraphicsTextItem* item = _widget.get(); - ((CustomQGraphicsTextItem*)item)->adjustSize(); + item->adjustSize(); } } @@ -261,7 +234,7 @@ void BasicBlockWidget::populateWidget() { } QGraphicsTextItem* item = _widget.get(); item->setDocument(document); - ((CustomQGraphicsTextItem*)item)->adjustSize(); + item->adjustSize(); } QString BasicBlockWidget::formatComments(Instruction* inst) { -- 2.39.5