diff --git a/calc.cpp b/calc.cpp index 00c2c4d7177c89ff39cb66935879fded5d37c3fc..c24edad2106716d5a3eedf90ac57351fe9b5187b 100644 --- a/calc.cpp +++ b/calc.cpp @@ -14,8 +14,8 @@ Calculator::Calculator(QWidget *parent) f_currentNum(""), f_if_currNumChangable(true) { - setMinimumSize(500, 450); - this->setWindowTitle("Casual calculator (standard mode)"); + setMinimumSize(600, 600); + this->setWindowTitle("Casual calculator (standard)"); MainLayout = new QGridLayout(this); f_BtnLayoutCasual = new QGridLayout(this); f_BtnLayoutSciExtr = new QGridLayout(this); @@ -56,7 +56,7 @@ Calculator::Calculator(QWidget *parent) { for (int col = 0; col < 5; col++) { - f_BtnLayoutCasual->addWidget(createButton(ButtonsTxtCasual[row][col], 60, 40), row+2, col); + f_BtnLayoutCasual->addWidget(createButton(ButtonsTxtCasual[row][col], 50, 40), row+2, col); } } @@ -64,7 +64,7 @@ Calculator::Calculator(QWidget *parent) { for (int col = 0; col < 4; col++) { - f_BtnLayoutSciExtr->addWidget(createButton(ButtonsTxtSciExtr[row][col], 60, 40), row+2, col); + f_BtnLayoutSciExtr->addWidget(createButton(ButtonsTxtSciExtr[row][col], 50, 40), row+2, col); } } @@ -73,7 +73,7 @@ Calculator::Calculator(QWidget *parent) f_HBoxBtnLayout->addWidget(f_BtnLayoutSciExtrWidget); f_HBoxBtnLayout->addWidget(f_BtnLayoutCasualExtrWidget); MainLayout->addWidget(f_lcdNum, 0, 0, 1, 8, Qt::AlignmentFlag::AlignHCenter); - MainLayout->addWidget(createButton("Delete", 70, 50), 0, 15, Qt::AlignmentFlag::AlignCenter); + MainLayout->addWidget(createButton("Delete", 40, 35), 0, 8, Qt::AlignmentFlag::AlignCenter); MainLayout->addWidget(f_radioBtnCasual, 1, 0, 1, 2, Qt::AlignmentFlag::AlignCenter); MainLayout->addWidget(f_radioBtnSci, 1, 2, 1, 2, Qt::AlignmentFlag::AlignCenter); @@ -82,7 +82,7 @@ Calculator::Calculator(QWidget *parent) f_BtnLayoutSciExtrWidget->hide(); this->setLayout(MainLayout); - resize (500, 400); + resize (600, 600); } QPushButton* Calculator::createButton(const QString &p_str, size_t p_horz, size_t p_vert) @@ -320,10 +320,10 @@ void Calculator::slotHideSci(bool p_is) this->setWindowTitle("Casual Calculator (standard mode)"); f_BtnLayoutSciExtrWidget->hide(); - setMinimumSize(500, 450); - resize(600, 450); - qDebug() << "Resize (600, 450)"; - f_lcdNum->setMinimumSize(370,60); + setMinimumSize(600, 600); + resize(600, 600); + qDebug() << "Resize (600, 600)"; + f_lcdNum->setMinimumSize(350,60); f_lcdNum->setDigitCount(20); } } @@ -335,11 +335,11 @@ void Calculator::slotShowSci(bool p_is) this->setWindowTitle("Scientific Calculator (scientific mode)"); f_BtnLayoutSciExtrWidget->show(); - setMinimumSize(800, 450); - resize(800, 450); + setMinimumSize(1000, 600); + resize(1000, 600); qDebug() << "Resize (900, 450)"; - f_lcdNum->setMinimumSize(650,60); + f_lcdNum->setMinimumSize(750,60); f_lcdNum->setDigitCount(35); } }