Skip to content

Commit

Permalink
Merge pull request ScanTailor-Advanced#14 from vigri/develop
Browse files Browse the repository at this point in the history
Negative margins & wayland-opengl
  • Loading branch information
vigri authored Apr 23, 2022
2 parents 155807e + 70d87e4 commit b3481bf
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/core/ImageViewBase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@
#include <Transform.h>

#include <QApplication>

#if QT_VERSION_MAJOR == 5
#include <QGLWidget>
#define QOpenGLWidget QGLWidget
#else
#include <QtOpenGLWidgets/QOpenGLWidget>
#endif

#include <QMouseEvent>
#include <QPaintEngine>
#include <QPainter>
Expand Down
12 changes: 12 additions & 0 deletions src/core/filters/page_layout/OptionsWidget.ui
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,9 @@ QToolButton:pressed {
<property name="decimals">
<number>1</number>
</property>
<property name="minimum">
<double>-9999.000000000000000</double>
</property>
<property name="maximum">
<double>9999.000000000000000</double>
</property>
Expand All @@ -215,6 +218,9 @@ QToolButton:pressed {
<property name="decimals">
<number>1</number>
</property>
<property name="minimum">
<double>-9999.000000000000000</double>
</property>
<property name="maximum">
<double>9999.000000000000000</double>
</property>
Expand All @@ -225,6 +231,9 @@ QToolButton:pressed {
<property name="decimals">
<number>1</number>
</property>
<property name="minimum">
<double>-9999.000000000000000</double>
</property>
<property name="maximum">
<double>9999.000000000000000</double>
</property>
Expand All @@ -242,6 +251,9 @@ QToolButton:pressed {
<property name="decimals">
<number>1</number>
</property>
<property name="minimum">
<double>-9999.000000000000000</double>
</property>
<property name="maximum">
<double>9999.000000000000000</double>
</property>
Expand Down

0 comments on commit b3481bf

Please sign in to comment.