完善高分屏显示效果

czyt1988 · Dec 15, 2023 · bd495cc · bd495cc
1 parent e3bbaf3
commit bd495cc
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 24 deletions.
diff --git a/readme-cn.md b/readme-cn.md
@@ -682,6 +682,7 @@ int main(int argc, char* argv[])
 {
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
     QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+    QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
 #endif
     QApplication a(argc, argv);
     ......
@@ -697,6 +698,7 @@ int main(int argc, char* argv[])
 {
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
     QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+    QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
 #endif
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
     QApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);

diff --git a/readme.md b/readme.md
@@ -682,6 +682,7 @@ int main(int argc, char* argv[])
 {
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
     QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+    QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
 #endif
     QApplication a(argc, argv);
     ......
@@ -697,6 +698,7 @@ int main(int argc, char* argv[])
 {
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
     QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+    QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
 #endif
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
     QApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);

diff --git a/src/SARibbonBar/SARibbonBar.cpp b/src/SARibbonBar/SARibbonBar.cpp
@@ -239,7 +239,6 @@ void SARibbonBar::PrivateData::init()
     mQuickAccessBar->setIcon(q_ptr->windowIcon());
     //
     mRightButtonGroup = RibbonSubElementDelegate->craeteButtonGroupWidget(q_ptr);
-    mRightButtonGroup->setFrameShape(QFrame::NoFrame);
     //
     setNormalMode();
 }
@@ -1265,7 +1264,6 @@ SARibbonButtonGroupWidget* SARibbonBar::activeRightButtonGroup()
 {
     if (nullptr == d_ptr->mRightButtonGroup) {
         d_ptr->mRightButtonGroup = RibbonSubElementDelegate->craeteButtonGroupWidget(this);
-        d_ptr->mRightButtonGroup->setFrameShape(QFrame::NoFrame);
     }
     d_ptr->mRightButtonGroup->show();
     return d_ptr->mRightButtonGroup;

diff --git a/src/SARibbonBar/SARibbonButtonGroupWidget.cpp b/src/SARibbonBar/SARibbonButtonGroupWidget.cpp
@@ -115,6 +115,7 @@ QAction* SARibbonButtonGroupWidget::addAction(QAction* a)
 QAction* SARibbonButtonGroupWidget::addAction(const QString& text, const QIcon& icon, QToolButton::ToolButtonPopupMode popMode)
 {
     QAction* a = new QAction(icon, text, this);
+
     addAction(a);
     ButtonTyle* btn = qobject_cast< ButtonTyle* >(d_ptr->mItems.back().widget);
     btn->setPopupMode(popMode);

diff --git a/src/SARibbonBar/SARibbonColorToolButton.cpp b/src/SARibbonBar/SARibbonColorToolButton.cpp
@@ -28,10 +28,10 @@ SARibbonColorToolButton::PrivateData::PrivateData(SARibbonColorToolButton* p) :
 
 QPixmap SARibbonColorToolButton::PrivateData::createIconPixmap(const QStyleOptionToolButton& opt, const QSize& iconsize) const
 {
-    if (opt.icon.isNull()) {  //没有有图标
+    if (opt.icon.isNull()) {  // 没有有图标
         return QPixmap();
     }
-    //有icon，在icon下方加入颜色
+    // 有icon，在icon下方加入颜色
     QIcon::State state = (opt.state & QStyle::State_On) ? QIcon::On : QIcon::Off;
     QIcon::Mode mode;
     if (!(opt.state & QStyle::State_Enabled)) {
@@ -42,19 +42,14 @@ QPixmap SARibbonColorToolButton::PrivateData::createIconPixmap(const QStyleOptio
         mode = QIcon::Normal;
     }
     QSize realIconSize = iconsize - QSize(0, c_ribbonbutton_color_height + 1);
-    realIconSize *= q_ptr->devicePixelRatioF();
     QPixmap pixmap     = opt.icon.pixmap(q_ptr->window()->windowHandle(), realIconSize, mode, state);
-    pixmap.setDevicePixelRatio(q_ptr->devicePixelRatioF());
-    QPixmap res(pixmap.size() + QSize(4, c_ribbonbutton_color_height + 4));  //宽度上，颜色块多出2px
-    res.setDevicePixelRatio(q_ptr->devicePixelRatioF());
+    QPixmap res(pixmap.size() + QSize(4, c_ribbonbutton_color_height + 4));  // 宽度上，颜色块多出2px
     res.fill(Qt::transparent);
     QPainter painter(&res);
-    int xpixmap   = (res.width() - pixmap.width()) / 2;
-    int ypixmap   = (res.height() - c_ribbonbutton_color_height - 2 - pixmap.height()) / 2;  //这里要减去2而不是1，这样奇数偶数都不会影响
-    xpixmap /= q_ptr->devicePixelRatioF();
-    ypixmap /= q_ptr->devicePixelRatioF();
-    int w = pixmap.width()/q_ptr->devicePixelRatioF();
-    int h = pixmap.height()/q_ptr->devicePixelRatioF();
+    int xpixmap = (res.width() - pixmap.width()) / 2;
+    int ypixmap = (res.height() - c_ribbonbutton_color_height - 2 - pixmap.height()) / 2;  // 这里要减去2而不是1，这样奇数偶数都不会影响
+    int w         = pixmap.width();
+    int h         = pixmap.height();
     QRect rpixmap = QRect(xpixmap, ypixmap, w, h);
     painter.drawPixmap(rpixmap, pixmap);
     QRect colorRect = rpixmap.adjusted(0, h + 1, 0, c_ribbonbutton_color_height + 1);
@@ -204,7 +199,7 @@ void SARibbonColorToolButton::onButtonClicked(bool checked)
 void SARibbonColorToolButton::paintIcon(QPainter& p, const QStyleOptionToolButton& opt, const QRect& iconDrawRect)
 {
     if (ColorUnderIcon == colorStyle()) {
-        //有icon
+        // 有icon
         QPixmap pm = d_ptr->createIconPixmap(opt, iconDrawRect.size());
         style()->drawItemPixmap(&p, iconDrawRect, Qt::AlignCenter, pm);
     } else {

diff --git a/src/SARibbonBar/SARibbonCtrlContainer.cpp b/src/SARibbonBar/SARibbonCtrlContainer.cpp
@@ -40,7 +40,7 @@ class SARibbonCtrlContainer::PrivateData
     void setContainerWidget(QWidget* w)
     {
         if (containerWidget) {
-            //原来有widget
+            // 原来有widget
             QWidget* oldwidget = containerWidget;
             takeContainerWidget(oldwidget);
             oldwidget->deleteLater();
@@ -118,8 +118,7 @@ bool SARibbonCtrlContainer::hasContainerWidget() const
 void SARibbonCtrlContainer::setIcon(const QIcon& i)
 {
     d_ptr->icon    = i;
-    QPixmap pixmap = i.pixmap(d_ptr->iconSize * devicePixelRatioF());
-    pixmap.setDevicePixelRatio(devicePixelRatioF());
+    QPixmap pixmap = i.pixmap(d_ptr->iconSize);
     d_ptr->labelPixmap->setPixmap(pixmap);
 }
 

diff --git a/src/SARibbonBar/SARibbonToolButton.cpp b/src/SARibbonBar/SARibbonToolButton.cpp
@@ -622,13 +622,9 @@ QPixmap SARibbonToolButton::PrivateData::createIconPixmap(const QStyleOptionTool
     } else {
         mode = QIcon::Normal;
     }
-    //添加高分屏支持
-    qreal pr = QApplication::primaryScreen()->devicePixelRatio();
+    // 添加高分屏支持
     QSize pxiampSize = iconsize - QSize(2, 2);
-    pxiampSize *= pr;
-    QPixmap px = opt.icon.pixmap(pxiampSize, mode, state);
-    px.setDevicePixelRatio(pr);
-    return px;
+    return opt.icon.pixmap(pxiampSize, mode, state);
 }
 
 int SARibbonToolButton::PrivateData::getTextAlignment() const

diff --git a/src/example/MainWindowExample/main.cpp b/src/example/MainWindowExample/main.cpp
@@ -52,6 +52,7 @@ int main(int argc, char* argv[])
     // 以下是针对高分屏的设置，有高分屏需求都需要按照下面进行设置
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
     QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+    QApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
 #endif
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
     QApplication::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);