Skip to content

Commit b3481bf

Browse files
authored
Merge pull request #14 from vigri/develop
Negative margins & wayland-opengl
2 parents 155807e + 70d87e4 commit b3481bf

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

src/core/ImageViewBase.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@
77
#include <Transform.h>
88

99
#include <QApplication>
10+
1011
#if QT_VERSION_MAJOR == 5
1112
#include <QGLWidget>
1213
#define QOpenGLWidget QGLWidget
1314
#else
1415
#include <QtOpenGLWidgets/QOpenGLWidget>
1516
#endif
17+
1618
#include <QMouseEvent>
1719
#include <QPaintEngine>
1820
#include <QPainter>

src/core/filters/page_layout/OptionsWidget.ui

+12
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,9 @@ QToolButton:pressed {
205205
<property name="decimals">
206206
<number>1</number>
207207
</property>
208+
<property name="minimum">
209+
<double>-9999.000000000000000</double>
210+
</property>
208211
<property name="maximum">
209212
<double>9999.000000000000000</double>
210213
</property>
@@ -215,6 +218,9 @@ QToolButton:pressed {
215218
<property name="decimals">
216219
<number>1</number>
217220
</property>
221+
<property name="minimum">
222+
<double>-9999.000000000000000</double>
223+
</property>
218224
<property name="maximum">
219225
<double>9999.000000000000000</double>
220226
</property>
@@ -225,6 +231,9 @@ QToolButton:pressed {
225231
<property name="decimals">
226232
<number>1</number>
227233
</property>
234+
<property name="minimum">
235+
<double>-9999.000000000000000</double>
236+
</property>
228237
<property name="maximum">
229238
<double>9999.000000000000000</double>
230239
</property>
@@ -242,6 +251,9 @@ QToolButton:pressed {
242251
<property name="decimals">
243252
<number>1</number>
244253
</property>
254+
<property name="minimum">
255+
<double>-9999.000000000000000</double>
256+
</property>
245257
<property name="maximum">
246258
<double>9999.000000000000000</double>
247259
</property>

0 commit comments

Comments
 (0)