Skip to content

Commit d064f0f

Browse files
committed
fix board scroll
1 parent 82e38f4 commit d064f0f

File tree

1 file changed

+15
-6
lines changed

1 file changed

+15
-6
lines changed

src/main.cpp

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ QMainWindow* mainWindow;
3232
QMainWindow* tool;
3333
QMainWindow* tool2;
3434
QScrollArea *scrollArea;
35+
QWidget *mainWidget;
3536

3637

3738
#ifdef screenshot
@@ -73,11 +74,18 @@ class MainWindow : public QMainWindow {
7374
event->ignore();
7475
}
7576
void resizeEvent(QResizeEvent *event) override {
76-
board->setFixedSize(event->size().width(), event->size().height());
7777
drawing->setFixedSize(
7878
QGuiApplication::primaryScreen()->geometry().width(),
7979
QGuiApplication::primaryScreen()->geometry().height()
8080
);
81+
board->setFixedSize(
82+
QGuiApplication::primaryScreen()->geometry().width(),
83+
QGuiApplication::primaryScreen()->geometry().height()
84+
);
85+
mainWidget->setFixedSize(
86+
QGuiApplication::primaryScreen()->geometry().width(),
87+
QGuiApplication::primaryScreen()->geometry().height()
88+
);
8189
printf("%d %d\n",event->size().width(), event->size().height());
8290
new_x = get_int((char*)"cur-x");
8391
new_y = get_int((char*)"cur-y");
@@ -174,18 +182,19 @@ int main(int argc, char *argv[]) {
174182
QApplication app(argc, argv);
175183

176184
mainWindow = new MainWindow();
185+
mainWidget = new QWidget();
177186

178187
scrollArea = new QScrollArea();
179188
scrollArea->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
180189
scrollArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
181190

182191
scale = QGuiApplication::primaryScreen()->geometry().height() / 1080.0;
183192

184-
drawing = new DrawingWidget();
185-
board = new WhiteBoard(mainWindow);
193+
board = new WhiteBoard(mainWidget);
186194
board->setType(get_int((char*)"page"));
187195
board->setOverlayType(get_int((char*)"page-overlay"));
188196

197+
drawing = new DrawingWidget(mainWidget);
189198
drawing->penSize[PEN] = get_int((char*)"pen-size");
190199
drawing->penSize[ERASER] = get_int((char*)"eraser-size");
191200
drawing->penSize[MARKER] = get_int((char*)"marker-size");
@@ -194,7 +203,7 @@ int main(int argc, char *argv[]) {
194203
drawing->lineStyle=NORMAL;
195204
drawing->penColor = QColor(get_string((char*)"color"));
196205

197-
scrollArea->setWidget(drawing);
206+
scrollArea->setWidget(mainWidget);
198207
mainWindow->setCentralWidget(scrollArea);
199208
mainWindow->setWindowIcon(QIcon(":tr.org.pardus.pen.svg"));
200209
mainWindow->setWindowTitle(QString(_("Pardus Pen")));
@@ -217,8 +226,8 @@ int main(int argc, char *argv[]) {
217226
} else {
218227
#endif
219228
tool = nullptr;
220-
floatingSettings = new FloatingSettings(mainWindow);
221-
floatingWidget = new FloatingWidget(mainWindow);
229+
floatingSettings = new FloatingSettings(mainWidget);
230+
floatingWidget = new FloatingWidget(mainWidget);
222231
#ifndef ETAP19
223232
}
224233
#endif

0 commit comments

Comments
 (0)