修改: spark-webapp-runtime/main.cpp

修改:     spark-webapp-runtime/mainwindow.cpp
	修改:     spark-webapp-runtime/mainwindow.h
This commit is contained in:
2021-12-29 23:24:26 +08:00
parent 2453752bd7
commit e084d58377
3 changed files with 22 additions and 14 deletions

View File

@@ -1,4 +1,4 @@
#include "mainwindow.h"
#include "mainwindow.h"
#include <DWidgetUtil>
#include <DTitlebar>
@@ -20,11 +20,11 @@ MainWindow::MainWindow(QString szTitle,
bool nFullScreen,
bool nFixSize,
bool nHideButtons,
DAboutDialog *dialog,
QDialog *dialog,
QWidget *parent)
: DMainWindow(parent)
, m_widget(new Widget(szUrl))
, m_dialog(dialog)
// , m_dialog(dialog)
, m_tray(new QSystemTrayIcon)
, btnBack(new DToolButton(titlebar()))
, btnForward(new DToolButton(titlebar()))
@@ -47,8 +47,8 @@ MainWindow::MainWindow(QString szTitle,
, isCanceled(false)
, mtray(tray)
, mFixSize(nFixSize)
, m_width(nWidth)
, m_height(nHeight)
, m_width(nWidth)
, m_height(nHeight)
{
/* 初始化 MainWindow */
setCentralWidget(m_widget);
@@ -205,13 +205,15 @@ void MainWindow::resizeEvent(QResizeEvent *event)
}
void MainWindow::closeEvent(QCloseEvent *event)
{}
/*
{
if (!mtray) {
m_dialog->close(); // 不启用托盘时,关闭主窗口则关闭关于窗口
}
event->accept();
}
*/
void MainWindow::fullScreen()
{
if (m_fullScreen->isChecked()) {