summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Kendall <mkendall@mythtv.org>2011-03-20 03:21:26 (GMT)
committer Mark Kendall <mkendall@mythtv.org>2011-03-20 03:24:22 (GMT)
commitdb3cfd3273016b741b68541ed322cc89e599a3a1 (patch)
treec252642321d47ed7e88e8185923ccd4a447b757c
parent4ce7cd8cbb892390e8d389462ccba716c6e6acf4 (diff)
libmythui: Revert recent Compiz/fullscreen window fixes.
Some multi-screen setups (TwinView) are still broken despite an attempted fix. I can't honestly see any combination of initialisation sequence that fixes both the Compiz issue and doesn't break Twinview setups, so reverting until someone can figure out a better way. Refs #9589 (cherry picked from commit 003fc8fb14acc9a6c4aeea2001d33d4cdb3c253d)
-rw-r--r--mythtv/libs/libmythui/mythmainwindow.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/mythtv/libs/libmythui/mythmainwindow.cpp b/mythtv/libs/libmythui/mythmainwindow.cpp
index 6b605ba..121f4c2 100644
--- a/mythtv/libs/libmythui/mythmainwindow.cpp
+++ b/mythtv/libs/libmythui/mythmainwindow.cpp
@@ -883,21 +883,20 @@ void MythMainWindow::Init(void)
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())
{
VERBOSE(VB_GENERAL, "Using Full Screen Window");
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));
GetMythUI()->ThemeWidget(this);
+ Show();
// Set cursor call must come after Show() to work on some systems.
setCursor((hideCursor) ? (Qt::BlankCursor) : (Qt::ArrowCursor));