diff options
| -rw-r--r-- | gui/init.cpp | 2 | ||||
| -rw-r--r-- | gui/mapping-dialog.ui | 36 | ||||
| -rw-r--r-- | spline/spline-widget.cpp | 27 |
3 files changed, 60 insertions, 5 deletions
diff --git a/gui/init.cpp b/gui/init.cpp index 9821404d..3aae5772 100644 --- a/gui/init.cpp +++ b/gui/init.cpp @@ -263,7 +263,9 @@ int otr_main(int argc, char** argv, std::function<std::unique_ptr<QWidget>()> co #endif QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); +#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); +#endif QApplication app(argc, argv); diff --git a/gui/mapping-dialog.ui b/gui/mapping-dialog.ui index 0f0aa7c0..8d72533d 100644 --- a/gui/mapping-dialog.ui +++ b/gui/mapping-dialog.ui @@ -46,6 +46,12 @@ <string>Yaw</string> </attribute> <layout class="QVBoxLayout" name="verticalLayout_2"> + <property name="leftMargin"> + <number>12</number> + </property> + <property name="rightMargin"> + <number>12</number> + </property> <item> <widget class="QFrame" name="frame"> <property name="sizePolicy"> @@ -120,6 +126,12 @@ <string>Pitch</string> </attribute> <layout class="QVBoxLayout" name="verticalLayout_3"> + <property name="leftMargin"> + <number>12</number> + </property> + <property name="rightMargin"> + <number>12</number> + </property> <item> <widget class="QFrame" name="frame_2"> <property name="sizePolicy"> @@ -215,6 +227,12 @@ <string>Roll</string> </attribute> <layout class="QVBoxLayout" name="verticalLayout_4"> + <property name="leftMargin"> + <number>12</number> + </property> + <property name="rightMargin"> + <number>12</number> + </property> <item> <widget class="QFrame" name="frame_3"> <property name="sizePolicy"> @@ -293,6 +311,12 @@ <string>X</string> </attribute> <layout class="QVBoxLayout" name="verticalLayout_5"> + <property name="leftMargin"> + <number>12</number> + </property> + <property name="rightMargin"> + <number>12</number> + </property> <item> <widget class="QFrame" name="frame444"> <property name="sizePolicy"> @@ -367,6 +391,12 @@ <string>Y</string> </attribute> <layout class="QVBoxLayout" name="verticalLayout_6"> + <property name="leftMargin"> + <number>12</number> + </property> + <property name="rightMargin"> + <number>12</number> + </property> <item> <widget class="QFrame" name="frame555"> <property name="sizePolicy"> @@ -441,6 +471,12 @@ <string>Z</string> </attribute> <layout class="QVBoxLayout" name="verticalLayout_7"> + <property name="leftMargin"> + <number>12</number> + </property> + <property name="rightMargin"> + <number>12</number> + </property> <item> <widget class="QFrame" name="frame666"> <property name="sizePolicy"> diff --git a/spline/spline-widget.cpp b/spline/spline-widget.cpp index e182e45a..2429ffc3 100644 --- a/spline/spline-widget.cpp +++ b/spline/spline-widget.cpp @@ -78,6 +78,10 @@ bool spline_widget::is_preview_only() const return preview_only; } +#if QT_VERSION < QT_VERSION_CHECK(5, 11, 0) +# define OTR_OBSOLETE_QT_WORKAROUND +#endif + void spline_widget::drawBackground() { QPainter painter(&background_img); @@ -108,7 +112,11 @@ void spline_widget::drawBackground() const double maxx = config->max_input(); const double maxy = config->max_output(); - const double space_width = metrics.horizontalAdvance(' '); +#ifndef OTR_OBSOLETE_QT_WORKAROUND + double space_width = metrics.horizontalAdvance(' '); +#else + double space_width = metrics.averageCharWidth(); +#endif // vertical grid for (int i = 0; i <= maxy; i += ystep) @@ -120,7 +128,12 @@ void spline_widget::drawBackground() pen); QString text = QString::number(i); QRectF rect = metrics.boundingRect(text); - painter.drawText(QPointF(pixel_bounds.x() - metrics.horizontalAdvance(text) - space_width, +#ifndef OTR_OBSOLETE_QT_WORKAROUND + double advance = metrics.horizontalAdvance(text); +#else + double advance = rect.right(); +#endif + painter.drawText(QPointF(pixel_bounds.x() - advance - space_width, y - rect.height()/2 - rect.top()), text); } @@ -135,11 +148,15 @@ void spline_widget::drawBackground() pen); const QString text = QString::number(i); - QRectF rect = metrics.boundingRect(text); +#ifndef OTR_OBSOLETE_QT_WORKAROUND + double advance = metrics.horizontalAdvance(text); +#else + double advance = rect.right(); +#endif - painter.drawText(QPointF(x - rect.width()/2 - rect.left(), - pixel_bounds.height() - rect.top() + rect.height() + metrics.descent()/4), + painter.drawText(QPointF(x - advance/2 - rect.left(), + pixel_bounds.height() - rect.top() + rect.height()), text); } } |