2929#include < QObject>
3030#include < QResource>
3131#include < QScreen>
32- #include < QWindow>
3332#include < QSettings>
3433#include < QStatusBar>
3534#include < QTimer>
3635#include < QToolBar>
3736#include < QToolButton>
37+ #include < QWindow>
3838
3939#include " analyze.hpp"
4040#include " config.h"
@@ -1117,14 +1117,14 @@ qt_tm_widget_rep::install_main_menu () {
11171117 main_menu_widget = waiting_main_menu_widget;
11181118 QList<QAction*>* src= main_menu_widget->get_qactionlist ();
11191119 if (!src) return ;
1120- QMenuBar* dest= new QMenuBar ();
1121- QScreen* screen = QGuiApplication::primaryScreen ();
1120+ QMenuBar* dest = new QMenuBar ();
1121+ QScreen* screen = QGuiApplication::primaryScreen ();
11221122#ifdef Q_OS_WIN
11231123 // 设置与 menuToolBar 匹配的固定高度
11241124 // 使用 devicePixelRatio() 获取正确的屏幕缩放比
11251125 // 获取屏幕DPI缩放比例
1126- double dpi = screen ? screen->logicalDotsPerInch () : 96.0 ;
1127- double scale = dpi / 96.0 ;
1126+ double dpi = screen ? screen->logicalDotsPerInch () : 96.0 ;
1127+ double scale= dpi / 96.0 ;
11281128 cout << " scale (DPI-based): " << scale << " (dpi: " << dpi << " )" << LF;
11291129
11301130 int h= (int ) floor (36 * scale + 0.5 );
@@ -1159,8 +1159,9 @@ qt_tm_widget_rep::install_main_menu () {
11591159 }
11601160
11611161 // 添加日志:dest 的 size 和 sizeHint
1162- qDebug () << " [install_main_menu] dest QMenuBar size:" << dest->size ();
1163- qDebug () << " [install_main_menu] dest QMenuBar sizeHint:" << dest->sizeHint ();
1162+ qDebug () << " [install_main_menu] dest QMenuBar size:" << dest->size ();
1163+ qDebug () << " [install_main_menu] dest QMenuBar sizeHint:"
1164+ << dest->sizeHint ();
11641165
11651166 // 移除旧 menuBar
11661167 QList<QWidget*> widgets= menuToolBar->findChildren <QWidget*> ();
@@ -1181,17 +1182,26 @@ qt_tm_widget_rep::install_main_menu () {
11811182 }
11821183
11831184 // 添加日志:menuToolBar 的 size 和 sizeHint
1184- qDebug () << " [install_main_menu] menuToolBar size:" << menuToolBar->size ();
1185- qDebug () << " [install_main_menu] menuToolBar sizeHint:" << menuToolBar->sizeHint ();
1185+ qDebug () << " [install_main_menu] menuToolBar size:" << menuToolBar->size ();
1186+ qDebug () << " [install_main_menu] menuToolBar sizeHint:"
1187+ << menuToolBar->sizeHint ();
11861188
11871189 // 添加新的 menuBar 到 menuToolBar
11881190 menuToolBar->addWidget (dest);
11891191
11901192 // 添加日志:添加 widget 后 menuToolBar 的 size 和 sizeHint
1191- qDebug () << " [install_main_menu] After adding dest to menuToolBar - menuToolBar size:" << menuToolBar->size ();
1192- qDebug () << " [install_main_menu] After adding dest to menuToolBar - menuToolBar sizeHint:" << menuToolBar->sizeHint ();
1193- qDebug () << " [install_main_menu] After adding dest to menuToolBar - dest size:" << dest->size ();
1194- qDebug () << " [install_main_menu] After adding dest to menuToolBar - dest sizeHint:" << dest->sizeHint ();
1193+ qDebug () << " [install_main_menu] After adding dest to menuToolBar - "
1194+ " menuToolBar size:"
1195+ << menuToolBar->size ();
1196+ qDebug () << " [install_main_menu] After adding dest to menuToolBar - "
1197+ " menuToolBar sizeHint:"
1198+ << menuToolBar->sizeHint ();
1199+ qDebug ()
1200+ << " [install_main_menu] After adding dest to menuToolBar - dest size:"
1201+ << dest->size ();
1202+ qDebug ()
1203+ << " [install_main_menu] After adding dest to menuToolBar - dest sizeHint:"
1204+ << dest->sizeHint ();
11951205}
11961206
11971207void
0 commit comments