Skip to content

Commit 09b2b5c

Browse files
sulincixsulincix
committed
visual bug fixes
1 parent c2fcbc6 commit 09b2b5c

File tree

4 files changed

+46
-53
lines changed

4 files changed

+46
-53
lines changed

‎src/SetupWidgets.cpp‎

Lines changed: 37 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,13 @@ static QVBoxLayout *penSettingsLayout;
1414
static QVBoxLayout *pageSettingsLayout;
1515
static QVBoxLayout *shapeSettingsLayout;
1616

17-
void create_seperator(bool f){
18-
(void)f;
19-
QLabel *hlina = new QLabel();
20-
hlina->setStyleSheet("background: black;");
21-
hlina->setFixedSize(
22-
colorDialog->size().width(),
23-
1
24-
);
25-
}
26-
2717
void setupWidgets(){
2818
// Pen Settings Menu
2919
QWidget *penSettings = new QWidget();
3020
penSettingsLayout = new QVBoxLayout(penSettings);
3121
penSettingsLayout->setSpacing(padding);
3222
penSettingsLayout->setContentsMargins(padding, padding, padding, padding);
23+
penSettings->setStyleSheet(QString("background-color: none;"));
3324
floatingSettings->addPage(penSettings);
3425

3526
// Pen button with menu
@@ -54,6 +45,7 @@ void setupWidgets(){
5445

5546
// Page settings menu
5647
QWidget *pageSettings = new QWidget();
48+
pageSettings->setStyleSheet(QString("background-color: none;"));
5749
pageSettingsLayout = new QVBoxLayout(pageSettings);
5850
pageSettingsLayout->setSpacing(0);
5951
pageSettingsLayout->setContentsMargins(0, 0, 0, 0);
@@ -67,6 +59,7 @@ void setupWidgets(){
6759

6860
// Shape settings menu
6961
QWidget *shapeSettings = new QWidget();
62+
shapeSettings->setStyleSheet(QString("background-color: none;"));
7063
shapeSettingsLayout = new QVBoxLayout(shapeSettings);
7164
shapeSettingsLayout->setSpacing(0);
7265
shapeSettingsLayout->setContentsMargins(0, 0, 0, 0);
@@ -91,10 +84,10 @@ void setupWidgets(){
9184
floatingWidget->addWidget(toolButtons[NEXT]);
9285
floatingWidget->addWidget(toolButtons[CLEAR]);
9386
floatingWidget->addWidget(toolButtons[MINIFY]);
94-
floatingWidget->addWidget(create_color_button(QColor("#ff0000")));
95-
floatingWidget->addWidget(create_color_button(QColor("#00ae4d")));
9687
floatingWidget->addWidget(create_color_button(QColor("#0078d7")));
88+
floatingWidget->addWidget(create_color_button(QColor("#00ae4d")));
9789
floatingWidget->addWidget(create_color_button(QColor("#ffc000")));
90+
floatingWidget->addWidget(create_color_button(QColor("#ff0000")));
9891
// disable minify if fual enabled
9992
toolButtons[MINIFY]->setEnabled(!get_bool("fuar"));
10093

@@ -169,15 +162,14 @@ void setupWidgets(){
169162
QWidget *stylDialog = new QWidget();
170163
QGridLayout *styleLayout = new QGridLayout(stylDialog);
171164
// spline
172-
styleLayout->addWidget(penButtons[PEN], 0, 0);
173-
styleLayout->addWidget(penButtons[ERASER], 0, 1);
174-
styleLayout->addWidget(penButtons[MARKER], 0, 2);
175-
styleLayout->addWidget(penButtons[SELECTION], 0, 3);
176-
styleLayout->addWidget(toolButtons[COLORPICKER], 0, 4);
165+
styleLayout->addWidget(penButtons[PEN], 0, 0, Qt::AlignCenter);
166+
styleLayout->addWidget(penButtons[ERASER], 0, 1, Qt::AlignCenter);
167+
styleLayout->addWidget(penButtons[MARKER], 0, 2, Qt::AlignCenter);
168+
styleLayout->addWidget(penButtons[SELECTION], 0, 3, Qt::AlignCenter);
169+
styleLayout->addWidget(toolButtons[COLORPICKER], 0, 4, Qt::AlignCenter);
177170

178171
penSettingsLayout->addWidget(stylDialog);
179172

180-
create_seperator(true);
181173

182174
/********** Color selection options **********/
183175
// color selection
@@ -208,12 +200,12 @@ void setupWidgets(){
208200
modeDialog = new QWidget();
209201
QGridLayout *modeLayout = new QGridLayout(modeDialog);
210202
// spline
211-
modeLayout->addWidget(penButtons[SPLINE], 0, 0);
212-
modeLayout->addWidget(penButtons[LINE], 0, 1);
213-
modeLayout->addWidget(penButtons[CIRCLE], 0, 2);
214-
modeLayout->addWidget(penButtons[TRIANGLE], 0, 3);
215-
modeLayout->addWidget(penButtons[RECTANGLE], 0, 4);
216-
modeLayout->addWidget(penButtons[VECTOR], 1, 0);
203+
modeLayout->addWidget(penButtons[SPLINE], 0, 0, Qt::AlignCenter);
204+
modeLayout->addWidget(penButtons[LINE], 0, 1, Qt::AlignCenter);
205+
modeLayout->addWidget(penButtons[CIRCLE], 0, 2, Qt::AlignCenter);
206+
modeLayout->addWidget(penButtons[TRIANGLE], 0, 3, Qt::AlignCenter);
207+
modeLayout->addWidget(penButtons[RECTANGLE], 0, 4, Qt::AlignCenter);
208+
modeLayout->addWidget(penButtons[VECTOR], 1, 0, Qt::AlignCenter);
217209
modeLayout->addWidget(penButtons[VECTOR2], 1, 1);
218210

219211
shapeSettingsLayout->addWidget(modeDialog);
@@ -223,9 +215,9 @@ void setupWidgets(){
223215

224216
penTypeDialog = new QWidget();
225217
QGridLayout *penTypeLayout = new QGridLayout(penTypeDialog);
226-
penTypeLayout->addWidget(penButtons[NORMAL], 0, 0);
227-
penTypeLayout->addWidget(penButtons[DOTLINE], 0, 1);
228-
penTypeLayout->addWidget(penButtons[LINELINE], 0, 2);
218+
penTypeLayout->addWidget(penButtons[NORMAL], 0, 0, Qt::AlignCenter);
219+
penTypeLayout->addWidget(penButtons[DOTLINE], 0, 1, Qt::AlignCenter);
220+
penTypeLayout->addWidget(penButtons[LINELINE], 0, 2, Qt::AlignCenter);
229221

230222
shapeSettingsLayout->addWidget(penTypeDialog);
231223

@@ -274,12 +266,12 @@ void setupWidgets(){
274266
QWidget *pageDialog = new QWidget();
275267
QGridLayout *pageLayout = new QGridLayout(pageDialog);
276268
// spline
277-
pageLayout->addWidget(penButtons[BLANK], 0, 0);
278-
pageLayout->addWidget(penButtons[SQUARES], 0, 1);
279-
pageLayout->addWidget(penButtons[LINES], 0, 2);
280-
pageLayout->addWidget(penButtons[MUSIC], 0, 3);
281-
pageLayout->addWidget(penButtons[CUSTOM], 0, 4);
282-
pageLayout->addWidget(penButtons[ISOMETRIC], 0, 5);
269+
pageLayout->addWidget(penButtons[BLANK], 0, 0, Qt::AlignCenter);
270+
pageLayout->addWidget(penButtons[SQUARES], 0, 1, Qt::AlignCenter);
271+
pageLayout->addWidget(penButtons[LINES], 0, 2, Qt::AlignCenter);
272+
pageLayout->addWidget(penButtons[MUSIC], 0, 3, Qt::AlignCenter);
273+
pageLayout->addWidget(penButtons[CUSTOM], 0, 4, Qt::AlignCenter);
274+
pageLayout->addWidget(penButtons[ISOMETRIC], 0, 5, Qt::AlignCenter);
283275

284276
struct dirent *ep;
285277
DIR *dp = opendir (BGDIR);
@@ -298,7 +290,7 @@ void setupWidgets(){
298290
board->ratios[drawing->getPageNum()] = 100;
299291
board->updateTransform();
300292
});
301-
pageLayout->addWidget(toolButtons[i+200], i / 6, i % 6);
293+
pageLayout->addWidget(toolButtons[i+200], i / 6, i % 6, Qt::AlignCenter);
302294
i++;
303295
printf ("%s\n", ep->d_name);
304296
}
@@ -310,25 +302,22 @@ void setupWidgets(){
310302
);
311303
pageSettingsLayout->addWidget(pageDialog);
312304

313-
create_seperator(false);
314-
315-
316305

317306
/********** clear & screenshot **********/
318307

319308
QWidget *miscDialog = new QWidget();
320309
QGridLayout *miscLayout = new QGridLayout(miscDialog);
321-
miscLayout->addWidget(toolButtons[OVERLAYROTATEUP], 0,0);
322-
miscLayout->addWidget(toolButtons[OVERLAYSCALEUP], 0, 1);
323-
miscLayout->addWidget(toolButtons[OVERLAYSCALEDOWN], 0, 2);
324-
miscLayout->addWidget(toolButtons[OVERLAYROTATEDOWN], 0, 3);
325-
miscLayout->addWidget(toolButtons[SAVE], 0, 4);
326-
miscLayout->addWidget(toolButtons[OPEN], 0, 5);
327-
328-
miscLayout->addWidget(toolButtons[CLOSE], 1, 0);
329-
miscLayout->addWidget(toolButtons[SCREENSHOT], 1, 1);
330-
miscLayout->addWidget(toolButtons[FULLSCREEN], 1, 2);
331-
miscLayout->addWidget(toolButtons[ROTATE], 1, 3);
310+
miscLayout->addWidget(toolButtons[OVERLAYROTATEUP], 0, 0, Qt::AlignCenter);
311+
miscLayout->addWidget(toolButtons[OVERLAYSCALEUP], 0, 1, Qt::AlignCenter);
312+
miscLayout->addWidget(toolButtons[OVERLAYSCALEDOWN], 0, 2, Qt::AlignCenter);
313+
miscLayout->addWidget(toolButtons[OVERLAYROTATEDOWN], 0, 3, Qt::AlignCenter);
314+
miscLayout->addWidget(toolButtons[SAVE], 0, 4, Qt::AlignCenter);
315+
miscLayout->addWidget(toolButtons[OPEN], 0, 5, Qt::AlignCenter);
316+
317+
miscLayout->addWidget(toolButtons[CLOSE], 1, 0, Qt::AlignCenter);
318+
miscLayout->addWidget(toolButtons[SCREENSHOT], 1, 1, Qt::AlignCenter);
319+
miscLayout->addWidget(toolButtons[FULLSCREEN], 1, 2, Qt::AlignCenter);
320+
miscLayout->addWidget(toolButtons[ROTATE], 1, 3, Qt::AlignCenter);
332321
if(get_bool("fuar")){
333322
toolButtons[SAVE]->setEnabled(false);
334323
toolButtons[OPEN]->setEnabled(false);

‎src/widgets/Button.cpp‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ QPushButton* create_button_text(const char* name, ButtonEvent event) {
2323
QFont font = button->font();
2424
font.setPointSize(18*scale);
2525
button->setFont(font);
26+
button->setStyleSheet(QString("background-color: none;"));
27+
2628
return button;
2729
}
2830
QPushButton* create_button(const char* name, ButtonEvent event) {
@@ -34,13 +36,14 @@ QPushButton* create_button(const char* name, ButtonEvent event) {
3436
set_icon(name, button);
3537
QFont font = button->font();
3638
font.setPointSize(18*scale);
37-
button->setFixedSize(butsize+padding, butsize+padding);
39+
button->setFixedSize(butsize, butsize);
3840
button->setFont(font);
41+
button->setStyleSheet(QString("background-color: none;"));
3942
return button;
4043
}
4144
QPushButton* create_color_button(QColor color){
4245
QPushButton* button = new QPushButton();
43-
button->setFixedSize(butsize+padding, butsize+padding);
46+
button->setFixedSize(butsize, butsize);
4447
button->setStyleSheet(QString(
4548
"background-color: "+color.name()+";"
4649
"border-radius: 12px;"

‎src/widgets/FloatingSettings.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,11 @@ FloatingSettings::FloatingSettings(QWidget *parent) : QWidget(parent) {
3232
layout = new QVBoxLayout(this);
3333
setLayout(layout);
3434
QString style = QString(
35-
"QWidget {"
35+
"QWidget {"
3636
"border-radius:13px;"
3737
"background-color: #cc939393;"
38-
"}");
38+
"}"
39+
);
3940
layout->setSpacing(0);
4041
layout->setContentsMargins(0, 0, 0, 0);
4142
setStyleSheet(style);

‎src/widgets/FloatingWidget.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ void FloatingWidget::setVertical(bool state) {
8787
tool->setFixedSize(width, height);
8888
}
8989
} else {
90-
layout->addWidget(widgets[i], column, row);
90+
layout->addWidget(widgets[i], column, row, Qt::AlignCenter);
9191
setFixedSize(height, width);
9292
if(tool != nullptr){
9393
tool->setFixedSize(height, width);

0 commit comments

Comments
 (0)