Disable changing window size only after first.
--HG-- branch : develop
This commit is contained in:
parent
8b6d8aee70
commit
f4aabbcf06
|
@ -58,7 +58,7 @@ const DialogLayoutSettings::FormatsVector DialogLayoutSettings::pageFormatNames
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
DialogLayoutSettings::DialogLayoutSettings(VLayoutGenerator *generator, QWidget *parent, bool disableSettings)
|
DialogLayoutSettings::DialogLayoutSettings(VLayoutGenerator *generator, QWidget *parent, bool disableSettings)
|
||||||
: QDialog(parent), disableSettings(disableSettings), ui(new Ui::DialogLayoutSettings), oldPaperUnit(Unit::Mm),
|
: QDialog(parent), disableSettings(disableSettings), ui(new Ui::DialogLayoutSettings), oldPaperUnit(Unit::Mm),
|
||||||
oldLayoutUnit(Unit::Mm), generator(generator)
|
oldLayoutUnit(Unit::Mm), generator(generator), isInitialized(false)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
|
@ -100,9 +100,6 @@ DialogLayoutSettings::DialogLayoutSettings(VLayoutGenerator *generator, QWidget
|
||||||
|
|
||||||
QPushButton *bRestoreDefaults = ui->buttonBox->button(QDialogButtonBox::RestoreDefaults);
|
QPushButton *bRestoreDefaults = ui->buttonBox->button(QDialogButtonBox::RestoreDefaults);
|
||||||
connect(bRestoreDefaults, &QPushButton::clicked, this, &DialogLayoutSettings::RestoreDefaults);
|
connect(bRestoreDefaults, &QPushButton::clicked, this, &DialogLayoutSettings::RestoreDefaults);
|
||||||
|
|
||||||
setMaximumSize(size());
|
|
||||||
setMinimumSize(size());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
@ -334,6 +331,27 @@ QString DialogLayoutSettings::MakeGroupsHelp()
|
||||||
return tr("\n\tThree groups: big, middle, small = 0\n\tTwo groups: big, small = 1\n\tDescending area = 2\n");
|
return tr("\n\tThree groups: big, middle, small = 0\n\tTwo groups: big, small = 1\n\tDescending area = 2\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
void DialogLayoutSettings::showEvent(QShowEvent *event)
|
||||||
|
{
|
||||||
|
QDialog::showEvent( event );
|
||||||
|
if ( event->spontaneous() )
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isInitialized)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// do your init stuff here
|
||||||
|
|
||||||
|
setMaximumSize(size());
|
||||||
|
setMinimumSize(size());
|
||||||
|
|
||||||
|
isInitialized = true;//first show windows are held
|
||||||
|
}
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
void DialogLayoutSettings::ConvertLayoutSize()
|
void DialogLayoutSettings::ConvertLayoutSize()
|
||||||
{
|
{
|
||||||
|
|
|
@ -100,6 +100,8 @@ public:
|
||||||
qreal LayoutToPixels(qreal value) const;
|
qreal LayoutToPixels(qreal value) const;
|
||||||
qreal PageToPixels(qreal value) const;
|
qreal PageToPixels(qreal value) const;
|
||||||
static QString MakeGroupsHelp();
|
static QString MakeGroupsHelp();
|
||||||
|
protected:
|
||||||
|
virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE;
|
||||||
public slots:
|
public slots:
|
||||||
void ConvertPaperSize();
|
void ConvertPaperSize();
|
||||||
void ConvertLayoutSize();
|
void ConvertLayoutSize();
|
||||||
|
@ -123,6 +125,7 @@ private:
|
||||||
Unit oldPaperUnit;
|
Unit oldPaperUnit;
|
||||||
Unit oldLayoutUnit;
|
Unit oldLayoutUnit;
|
||||||
VLayoutGenerator *generator;
|
VLayoutGenerator *generator;
|
||||||
|
bool isInitialized;
|
||||||
|
|
||||||
void InitPaperUnits();
|
void InitPaperUnits();
|
||||||
void InitLayoutUnits();
|
void InitLayoutUnits();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user