fix secure lock sign and popup window height

Author: IluhaPuts

Diff for: keychain_win/keychain_gui/src/PopupWindow.cpp

@@ -19,7 +19,6 @@ PopupWindow::PopupWindow(const KeychainWarningMessage wMessage, QWidget *parent)
 	body->setWordWrap(true);
 	body->setStyleSheet("background:transparent;border-width:0;color:rgb(147,148,151);font:14px \"Segoe UI\";padding:10px;");
 
-	
 	QFont myFont= body->font();
 	int mCount = wMessage.MessgeCount();
 	QString messageStr = wMessage.GetMessage();
@@ -30,12 +29,12 @@ PopupWindow::PopupWindow(const KeychainWarningMessage wMessage, QWidget *parent)
 
 	int strWidth = fm.width(messageStr);
 	int strHeight = k+k/2;
-	int numLines = std::ceil(strWidth / 350.0)+((mCount>1)?((mCount-1)*2):1);
+	int numLines = std::ceil(strWidth / 330.0)+((mCount>1)?((mCount-1)*2):0);
 
 
 	body->setText(messageStr);
-	body->setFixedHeight(strHeight*numLines+20);
-	this->setFixedHeight(body->height()+10);
+	body->setFixedHeight(strHeight*numLines+15);
+	this->setFixedHeight(body->height());
 
 	body->setAlignment(Qt::AlignJustify);
 	if (wMessage.isWarn()==false) {

Diff for: keychain_win/keychain_gui/src/keychain_gui_win.cpp

@@ -160,7 +160,7 @@ keychain_gui_win::keychain_gui_win(Transaction &transaction, QWidget *parent)
 		QString lang = QGuiApplication::inputMethod()->locale().languageToString(QGuiApplication::inputMethod()->locale().language());
 		languageLabel->setText(lang.mid(0, 2).toUpper());
 	}
-	if (!transaction.isCreatePassword() && warningMessage.isWarn()) {
+	//if (!transaction.isCreatePassword() && warningMessage.isWarn()) {
 		lockIcon = new LockIcon(warningMessage, this);
 		popupWindow = new PopupWindow(warningMessage, this);
 		popupWindow->setVisible(false);
@@ -171,7 +171,7 @@ keychain_gui_win::keychain_gui_win(Transaction &transaction, QWidget *parent)
 		else
 			lockIcon->move(width() - 55, 28);
 		lockIcon->setMouseTracking(true);
-	}
+	//}
 
 	this->connect(OKButton, &QPushButton::released, this, &keychain_gui_win::transaction_sign);
 	this->connect(CancelButton, &QPushButton::released, this, &keychain_gui_win::cancel_sign);