diff --git a/src/main.cpp b/src/main.cpp index ea581800..e8e64d26 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -39,6 +39,7 @@ int main(int argc, char* argv[]) { SpdLogger logger("logs/log.txt", 5); Application::setAttribute(Qt::AA_EnableHighDpiScaling); + Application::setAttribute(Qt::AA_UseHighDpiPixmaps); Application app(argc, argv); app.setAttribute(Qt::AA_DontCreateNativeWidgetSiblings); diff --git a/src/translations/Dyt_zh_CN.ts b/src/translations/Dyt_zh_CN.ts index 392901c4..2c9eeb9e 100644 --- a/src/translations/Dyt_zh_CN.ts +++ b/src/translations/Dyt_zh_CN.ts @@ -2235,17 +2235,17 @@ - + default - + silver - + blue @@ -2309,7 +2309,7 @@ 属性 - + Main View 主视图 @@ -2435,12 +2435,12 @@ OsgWidget - + warning 警告 - + open dyt file failed 打开dyt文件失败。 @@ -2463,8 +2463,8 @@ - - + + play 开始 @@ -2529,7 +2529,7 @@ - + pause 暂停 diff --git a/src/ui/FrameTitleBar.cpp b/src/ui/FrameTitleBar.cpp index dd99f9d1..fc73b5f9 100644 --- a/src/ui/FrameTitleBar.cpp +++ b/src/ui/FrameTitleBar.cpp @@ -186,3 +186,9 @@ void FrameTitleBar::SetSysButton(unsigned int sysBtn) { ui->sys_max->setVisible(static_cast(ftbButton_ & FTB_MAX)); ui->sys_close->setVisible(static_cast(ftbButton_ & FTB_CLOSE)); } + + +void FrameTitleBar::showEvent(QShowEvent * event) +{ + OnMaxBtnClicked(); +} \ No newline at end of file diff --git a/src/ui/FrameTitleBar.h b/src/ui/FrameTitleBar.h index 20c1c6e8..88c8123c 100644 --- a/src/ui/FrameTitleBar.h +++ b/src/ui/FrameTitleBar.h @@ -46,6 +46,8 @@ protected: void mouseMoveEvent(QMouseEvent* event) override; void mouseDoubleClickEvent(QMouseEvent* event) override; + virtual void showEvent(QShowEvent *event) override; + protected: void OnMinBtnClicked(); void OnMaxBtnClicked(); diff --git a/src/ui/MainFrame.cpp b/src/ui/MainFrame.cpp index 3fbc9538..166746ea 100644 --- a/src/ui/MainFrame.cpp +++ b/src/ui/MainFrame.cpp @@ -40,7 +40,7 @@ MainFrame::MainFrame(QWidget *parent) : assert(nullptr == s_instance); s_instance = this; - ui->titleFrame->SetMainWidget(this); + ui->titleFrame->SetMainWidget(this); ui->titleFrame->SetTitle(tr("Dyt")); ui->titleFrame->InitMenuWidget(); diff --git a/src/viewer/OsgWidget.cpp b/src/viewer/OsgWidget.cpp index 181b8b90..5be81ae1 100644 --- a/src/viewer/OsgWidget.cpp +++ b/src/viewer/OsgWidget.cpp @@ -212,15 +212,6 @@ void OsgWidget::paintEvent(QPaintEvent*) { frame(); } -void OsgWidget::showEvent(QShowEvent * event) -{ - if (nullptr == view_) { - return; - } - qreal devicePixelRatio = screen()->devicePixelRatio(); - viewUI_->Resize(size().width() * devicePixelRatio, size().height() * devicePixelRatio); -} - void OsgWidget::dragEnterEvent(QDragEnterEvent* event) { LOG_INFO("OsgWidget::dragEnterEvent - Available formats:{}", event->mimeData()->formats().join(",").toStdString()); diff --git a/src/viewer/OsgWidget.h b/src/viewer/OsgWidget.h index 2b5c8d75..bb973ae4 100644 --- a/src/viewer/OsgWidget.h +++ b/src/viewer/OsgWidget.h @@ -28,8 +28,6 @@ protected: void resizeEvent(QResizeEvent* event) override; void paintEvent( QPaintEvent* /*event*/ ) override; - - virtual void showEvent(QShowEvent *event) override; // 拖拽事件处理 void dragEnterEvent(QDragEnterEvent* event) override;