Disassembly widget 2.0

src/common/Helpers.cpp

@@ -4,19 +4,55 @@
 
 #include <QAbstractButton>
 #include <QAbstractItemView>
+#include <QAbstractTextDocumentLayout>
 #include <QComboBox>
 #include <QCryptographicHash>
 #include <QDockWidget>
 #include <QFileInfo>
+#include <QFontMetricsF>
 #include <QMenu>
 #include <QPlainTextEdit>
 #include <QString>
+#include <QTextBlock>
 #include <QTextEdit>
 #include <QTreeWidget>
 #include <QtCore>
 
 #include <cmath>
 
+namespace {
+template<typename TextEditType>
+int calculateMaxDisplayedLines(TextEditType *textEdit)
+{
+    qreal lineHeight = 0;
+    const QTextBlock firstBlock = textEdit->document()->begin();
+    if (firstBlock.isValid()) {
+        lineHeight = textEdit->document()->documentLayout()->blockBoundingRect(firstBlock).height();
+    }
+
+    if (lineHeight <= 0) {
+        const QFontMetricsF fm(textEdit->font());
+        lineHeight = fm.lineSpacing();
+    }
+
+    qreal availableHeight = textEdit->viewport()->height();
+    const qreal margin = textEdit->document()->documentMargin();
+    availableHeight -= margin;
+
+    const qreal exactLines = availableHeight / lineHeight;
+    const qreal floorValue = std::floor(exactLines);
+    const qreal fractionalPart = exactLines - floorValue;
+
+    // If the last line is more than 15% visible then count it, otherwise leave it
+    // avoids the issue where there is empty space at the bottom of a textedit widget
+    if (fractionalPart >= 0.15) {
+        return std::ceil(availableHeight / lineHeight);
+    }
+
+    return floorValue;
+}
+}
+
 namespace qhelpers {
 
 QString formatByteCount(ut64 bytecount)
@@ -174,20 +210,12 @@ void SizePolicyMinMax::restoreHeight(QWidget *widget) const
 
 int getMaxFullyDisplayedLines(QTextEdit *textEdit)
 {
-    const QFontMetrics fontMetrics(textEdit->document()->defaultFont());
-    return (textEdit->height()
-            - (textEdit->contentsMargins().top() + textEdit->contentsMargins().bottom()
-               + (int)(textEdit->document()->documentMargin() * 2)))
-            / fontMetrics.lineSpacing();
+    return calculateMaxDisplayedLines(textEdit);
 }
 
 int getMaxFullyDisplayedLines(QPlainTextEdit *plainTextEdit)
 {
-    const QFontMetrics fontMetrics(plainTextEdit->document()->defaultFont());
-    return (plainTextEdit->height()
-            - (plainTextEdit->contentsMargins().top() + plainTextEdit->contentsMargins().bottom()
-               + (int)(plainTextEdit->document()->documentMargin() * 2)))
-            / fontMetrics.lineSpacing();
+    return calculateMaxDisplayedLines(plainTextEdit);
 }
 
 QByteArray applyColorToSvg(const QByteArray &data, QColor color)

src/shortcuts/DefaultShortcuts.cpp

@@ -215,6 +215,10 @@ const QHash<QString, Shortcut> &getDefaultShortcuts()
           { { Qt::Key_Space },
             QT_TRANSLATE_NOOP("DisassemblyWidget", "Switch to Graph"),
             "DisassemblyWidget" } },
+        { "Disassembly.moveLeft",
+          { QList<QKeySequence> { Qt::Key_H }
+                    + QKeySequence::keyBindings(QKeySequence::MoveToPreviousChar),
+            QT_TRANSLATE_NOOP("DisassemblyWidget", "Move Cursor Down"), "DisassemblyWidget" } },
         { "Disassembly.moveDown",
           { QList<QKeySequence> { Qt::Key_J }
                     + QKeySequence::keyBindings(QKeySequence::MoveToNextLine),
@@ -223,6 +227,10 @@ const QHash<QString, Shortcut> &getDefaultShortcuts()
           { QList<QKeySequence> { Qt::Key_K }
                     + QKeySequence::keyBindings(QKeySequence::MoveToPreviousLine),
             QT_TRANSLATE_NOOP("DisassemblyWidget", "Move Cursor Up"), "DisassemblyWidget" } },
+        { "Disassembly.moveRight",
+          { QList<QKeySequence> { Qt::Key_L }
+                    + QKeySequence::keyBindings(QKeySequence::MoveToNextChar),
+            QT_TRANSLATE_NOOP("DisassemblyWidget", "Move Cursor Up"), "DisassemblyWidget" } },
         { "Disassembly.pageDown",
           { QKeySequence::keyBindings(QKeySequence::MoveToNextPage),
             QT_TRANSLATE_NOOP("DisassemblyWidget", "Move Cursor Down By Page"),