Skip to content

Commit 2f6e042

Browse files
committed
Refactor screen size handling in mainwindow.cpp
1 parent 45e0a59 commit 2f6e042

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

App/Client/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ int main(int argc, char *argv[])
205205
//w->setWindowIcon(QIcon::themeName("app"));
206206
//w->setWindowTitle(app.applicationDisplayName());
207207
app.processEvents();
208-
w->show();
208+
RC_SHOW_WINDOW(w);
209209
app.processEvents();
210210
// For time-consuming operations
211211
nRet = w->Initial();

App/Client/mainwindow.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,17 +95,17 @@ MainWindow::MainWindow(QWidget *parent)
9595
setWindowIcon(QIcon(":/images/app"));
9696
#endif
9797

98-
int widthScreen = 0;
98+
QSize screenSize;
9999
if(QApplication::primaryScreen()) {
100-
widthScreen = QApplication::primaryScreen()->availableGeometry().width();
100+
screenSize = QApplication::primaryScreen()->availableSize();
101101
//TODO: 当支持多屏幕时,修改此处
102-
//widthScreen = QApplication::primaryScreen()->availableVirtualGeometry().width();
102+
//screenSize = QApplication::primaryScreen()->availableVirtualSize();
103103
}
104-
if(widthScreen)
105-
setMaximumWidth(widthScreen);
104+
if(!screenSize.isEmpty())
105+
setMaximumSize(screenSize);
106106

107-
m_StatusBarMessage.setSizePolicy(QSizePolicy::Policy::Expanding,
108-
QSizePolicy::Policy::Fixed);
107+
//m_StatusBarMessage.setSizePolicy(QSizePolicy::Policy::Expanding,
108+
// QSizePolicy::Policy::Fixed);
109109
//m_StatusBarMessage.setWordWrap(true);
110110
this->statusBar()->addWidget(&m_StatusBarMessage);
111111

0 commit comments

Comments
 (0)