mirror of
https://github.com/mumble-voip/mumble.git
synced 2025-10-26 11:19:16 +00:00
Delay restoreGeometry to after windowflags are set
This commit is contained in:
parent
a7f4bea0fc
commit
6bce206ee9
@ -279,6 +279,12 @@ void MainWindow::setupGui() {
|
||||
qleChat->setDefaultText(tr("Not connected"));
|
||||
qleChat->setEnabled(false);
|
||||
|
||||
connect(qtvUsers->selectionModel(),
|
||||
SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)),
|
||||
SLOT(qtvUserCurrentChanged(const QModelIndex &, const QModelIndex &)));
|
||||
|
||||
setupView(false);
|
||||
|
||||
if (g.s.bMinimalView && ! g.s.qbaMinimalViewGeometry.isNull())
|
||||
restoreGeometry(g.s.qbaMinimalViewGeometry);
|
||||
else if (! g.s.bMinimalView && ! g.s.qbaMainWindowGeometry.isNull())
|
||||
@ -287,12 +293,6 @@ void MainWindow::setupGui() {
|
||||
restoreState(g.s.qbaMainWindowState);
|
||||
qtvUsers->header()->restoreState(g.s.qbaHeaderState);
|
||||
|
||||
connect(qtvUsers->selectionModel(),
|
||||
SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)),
|
||||
SLOT(qtvUserCurrentChanged(const QModelIndex &, const QModelIndex &)));
|
||||
|
||||
setupView(false);
|
||||
|
||||
qmTray = new QMenu(this);
|
||||
setupIconMenu(false);
|
||||
qstiIcon->setContextMenu(qmTray);
|
||||
@ -593,7 +593,7 @@ void MainWindow::setupView(bool toggle_minimize) {
|
||||
f |= Qt::WindowStaysOnTopHint;
|
||||
|
||||
setWindowFlags(f);
|
||||
|
||||
|
||||
qdwLog->setVisible(showit);
|
||||
qdwChat->setVisible(showit && g.s.bShowChatbar);
|
||||
qtvUsers->header()->setVisible(showit);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user