summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Kendall <mkendall@mythtv.org>2011-03-17 01:35:24 (GMT)
committer Mark Kendall <mkendall@mythtv.org>2011-03-17 01:35:24 (GMT)
commit4322464f6bd4f5a2c26ab7bb85d0cb8cee8113e2 (patch)
treee1fa7b55f497f4ee08ca8521ccafbbf9732c495d
parentf1ab9ed9b5af39067e6cdee464ee3f7e94999882 (diff)
libmythui: Fix window positioning for multi-screen setups.
3ad6c81aa83491b7e6d2 (fullscreen window fix for Compiz) broke window positioning when using multi-screen setups. Another round of testing later and it looks like we just need to initialise a few vars before the Show(). No obvious regressions...
-rw-r--r--mythtv/libs/libmythui/mythmainwindow.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/mythtv/libs/libmythui/mythmainwindow.cpp b/mythtv/libs/libmythui/mythmainwindow.cpp
index 6e917cb..f75e75d 100644
--- a/mythtv/libs/libmythui/mythmainwindow.cpp
+++ b/mythtv/libs/libmythui/mythmainwindow.cpp
@@ -915,6 +915,10 @@ void MythMainWindow::Init(void)
#endif
setWindowFlags(flags);
+
+ d->screenRect = QRect(d->xbase, d->ybase, d->screenwidth, d->screenheight);
+ d->uiScreenRect = QRect(0, 0, d->screenwidth, d->screenheight);
+
Show();
if (d->does_fill_screen && !GetMythUI()->IsGeometryOverridden())
@@ -923,9 +927,6 @@ void MythMainWindow::Init(void)
setWindowState(Qt::WindowFullScreen);
}
- d->screenRect = QRect(d->xbase, d->ybase, d->screenwidth, d->screenheight);
- d->uiScreenRect = QRect(0, 0, d->screenwidth, d->screenheight);
-
setGeometry(d->xbase, d->ybase, d->screenwidth, d->screenheight);
setFixedSize(QSize(d->screenwidth, d->screenheight));