nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 08:08:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'more_fixes_around_margins' of https://github.com/andreasbuhr/GoldenCheetah into andreasbuhr-more_fixes_around_margins

Browse Source
This commit is contained in:
Alejandro Martinez
2024-01-11 18:13:30 -03:00
parent 0d8167999e 716f40ab3a
commit e95e347653
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deprecated/NewMainWindow.cpp
View File

@@ -33,7 +33,7 @@ NewMainWindow::NewMainWindow(QApplication *app) : QMainWindow(NULL), state(Inact
setCentralWidget(main); setCentralWidget(main);
layout = new QVBoxLayout(main); layout = new QVBoxLayout(main);
layout->setSpacing(0); layout->setSpacing(0);
layout->setMargin(0); layout->setContentsMargins(QMargins());
// toolbar // toolbar
setupToolbar(); setupToolbar();

4
src/Charts/UserChart.cpp
View File

@@ -1398,7 +1398,7 @@ EditUserSeriesDialog::EditUserSeriesDialog(Context *context, bool rangemode, Gen
// set the dialog // set the dialog
QVBoxLayout *main = new QVBoxLayout(this); QVBoxLayout *main = new QVBoxLayout(this);
main->setMargin(10*dpiXFactor); main->setContentsMargins(10*dpiXFactor,10*dpiXFactor,10*dpiXFactor,10*dpiXFactor);
QHBoxLayout *hf = new QHBoxLayout(); QHBoxLayout *hf = new QHBoxLayout();
QVBoxLayout *pl = new QVBoxLayout(); QVBoxLayout *pl = new QVBoxLayout();
QFormLayout *cf = new QFormLayout(); QFormLayout *cf = new QFormLayout();
@@ -1731,7 +1731,7 @@ EditUserAxisDialog::EditUserAxisDialog(Context *context, GenericAxisInfo &info)
// set the dialog // set the dialog
QVBoxLayout *main = new QVBoxLayout(this); QVBoxLayout *main = new QVBoxLayout(this);
main->setMargin(10*dpiXFactor); main->setContentsMargins(10*dpiXFactor,10*dpiXFactor,10*dpiXFactor,10*dpiXFactor);
QFormLayout *cf = new QFormLayout(); QFormLayout *cf = new QFormLayout();
main->addLayout(cf); main->addLayout(cf);
main->addStretch(); main->addStretch();

3
src/Gui/GcWindowLayout.cpp
View File

@@ -119,7 +119,8 @@ QSize GcWindowLayout::minimumSize() const
foreach (item, itemList) foreach (item, itemList)
size = size.expandedTo(item->minimumSize()); size = size.expandedTo(item->minimumSize());
size += QSize(2*margin(), 2*margin()); QMargins m = contentsMargins();
size += QSize(m.left()+m.right(), m.top()+m.bottom());
return size; return size;
} }