pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-04-07 14:09:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

[win-nix] fix bug 54309

Browse Source
This commit is contained in:
Maxim Kadushkin
2021-12-05 01:06:58 +03:00
parent e530fbcb5d
commit 810bef61ad
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
win-linux/res/styles/message.qss
View File

@ -14,13 +14,13 @@ QLabel[class=msg-icon][type=msg-confirm] {
background-position: top right;
}
#messageBody[scaling="1.25x"] QLabel[class=msg-icon] {
/*background-image: url(":/message_icons_1.25x.png");*/
background-image: url(":/message_icons_1.25x.png");
}
#messageBody[scaling="1.5x"] QLabel[class=msg-icon] {
background-image: url(":/message_icons_1.5x.png");
}
#messageBody[scaling="1.75x"] QLabel[class=msg-icon] {
/*background-image: url(":/message_icons_1.75x.png");*/
background-image: url(":/message_icons_1.75x.png");
}
#messageBody[scaling="2x"] QLabel[class=msg-icon] {
background-image: url(":/message_icons_2x.png");
@ -28,9 +28,15 @@ QLabel[class=msg-icon][type=msg-confirm] {
#messageBody QLabel[class=msg-report] {
font-size: 11px;
}
#messageBody[scaling="1.25x"] QLabel[class=msg-report] {
font-size: 14px;
}
#messageBody[scaling="1.5x"] QLabel[class=msg-report] {
font-size: 17px;
}
#messageBody[scaling="1.75x"] QLabel[class=msg-report] {
font-size: 19px;
}
#messageBody[scaling="2x"] QLabel[class=msg-report] {
font-size: 22px;
}
@ -46,6 +52,17 @@ QLabel[class=msg-icon][type=msg-confirm] {
height: 33px;
font-size: 17px;
}
#messageBody[scaling="1.25x"] QPushButton {
padding:0 25px;
height: 28px;
font-size: 14px;
}
#messageBody[scaling="1.75x"] QPushButton {
padding:0 35px;
height: 38px;
font-size: 19px;
}
QPushButton {
outline: 0 none;

10
win-linux/src/cmessage.cpp
View File

@ -216,11 +216,17 @@ CMessage::CMessage(QWidget * p)
_styles.append(QString("QPushButton{min-width:%1px;}").arg(int(40*m_priv->dpiRatio)));
m_centralWidget->setStyleSheet( _styles );
if ( m_priv->dpiRatio > 1.55 ) {
if ( m_priv->dpiRatio > 1.75 ) {
m_centralWidget->setProperty("scaling", "2x");
} else
if ( m_priv->dpiRatio > 1 ) {
if ( m_priv->dpiRatio > 1.55 ) {
m_centralWidget->setProperty("scaling", "1.75x");
} else
if ( m_priv->dpiRatio > 1.25 ) {
m_centralWidget->setProperty("scaling", "1.5x");
} else
if ( m_priv->dpiRatio > 1 ) {
m_centralWidget->setProperty("scaling", "1.25x");
}
m_priv->focusConnection = QObject::connect(qApp, &QApplication::focusChanged, [&] (QWidget * from, QWidget *to){