From 81f27e87acb3b7e7c24691280df6a54736ce961e Mon Sep 17 00:00:00 2001
From: Jakub Melka <Jakub.Melka@seznam.cz>
Date: Sun, 24 May 2020 16:56:02 +0200
Subject: [PATCH] Bugfixing

---
 PdfForQtLib/sources/pdfform.cpp | 23 +++++++++++++++++++----
 PdfForQtLib/sources/pdfform.h   |  1 +
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/PdfForQtLib/sources/pdfform.cpp b/PdfForQtLib/sources/pdfform.cpp
index 56cc887..68e34e3 100644
--- a/PdfForQtLib/sources/pdfform.cpp
+++ b/PdfForQtLib/sources/pdfform.cpp
@@ -1444,6 +1444,19 @@ void PDFFormManager::mouseMoveEvent(QWidget* widget, QMouseEvent* event)
         {
             event->accept();
         }
+
+        if (hasFormFieldWidgetText(info.editor->getWidgetAnnotation()))
+        {
+            m_mouseCursor = QCursor(Qt::IBeamCursor);
+        }
+        else
+        {
+            m_mouseCursor = QCursor(Qt::ArrowCursor);
+        }
+    }
+    else
+    {
+        m_mouseCursor = std::nullopt;
     }
 }
 
@@ -1586,8 +1599,7 @@ PDFFormManager::MouseEventInfo PDFFormManager::getMouseEventInfo(QWidget* widget
 
 const std::optional<QCursor>& PDFFormManager::getCursor() const
 {
-    static const std::optional<QCursor> dummy;
-    return dummy;
+    return m_mouseCursor;
 }
 
 void PDFFormManager::clearEditors()
@@ -1988,11 +2000,14 @@ PDFFormFieldComboBoxEditor::PDFFormFieldComboBoxEditor(PDFFormManager* formManag
 
     initializeTextEdit(&m_textEdit);
 
+    QFontMetricsF fontMetrics(m_textEdit.getFont());
+    const qreal lineSpacing = fontMetrics.lineSpacing();
+
     const int listBoxItems = qMin(7, int(parentField->getOptions().size()));
     QRectF comboBoxRectangle = m_formManager->getWidgetRectangle(m_formWidget);
     QRectF listBoxPopupRectangle = comboBoxRectangle;
-    listBoxPopupRectangle.translate(0, -comboBoxRectangle.height() * (listBoxItems));
-    listBoxPopupRectangle.setHeight(comboBoxRectangle.height() * listBoxItems);
+    listBoxPopupRectangle.translate(0, -lineSpacing * (listBoxItems));
+    listBoxPopupRectangle.setHeight(lineSpacing * listBoxItems);
     m_listBoxPopupRectangle = listBoxPopupRectangle;
     m_dropDownButtonRectangle = comboBoxRectangle;
     m_dropDownButtonRectangle.setLeft(m_dropDownButtonRectangle.right() - m_dropDownButtonRectangle.height());
diff --git a/PdfForQtLib/sources/pdfform.h b/PdfForQtLib/sources/pdfform.h
index 153da52..d178b82 100644
--- a/PdfForQtLib/sources/pdfform.h
+++ b/PdfForQtLib/sources/pdfform.h
@@ -691,6 +691,7 @@ private:
     std::vector<PDFFormFieldWidgetEditor*> m_widgetEditors;
     PDFFormFieldWidgetEditor* m_focusedEditor;
     MouseGrabInfo m_mouseGrabInfo;
+    std::optional<QCursor> m_mouseCursor;
 };
 
 }   // namespace pdf