Ticket #2448: epgresize.patch

libs/libmythtv/tv_play.cpp

@@ -4690 +4690 @@
         return;
     }
 
-    // Resize window to the MythTV GUI size
-    MythMainWindow *mwnd = gContext->GetMainWindow();
-    bool using_gui_size_for_tv = gContext->GetNumSetting("GuiSizeForTV", 0);
-    if (!using_gui_size_for_tv)
-    {
-        mwnd->setGeometry(saved_gui_bounds.left(), saved_gui_bounds.top(),
-                          saved_gui_bounds.width(), saved_gui_bounds.height());
-        mwnd->setFixedSize(saved_gui_bounds.size());
-    }
-
     // Collect channel info
     pbinfoLock.lock();
     uint    chanid  = playbackinfo->chanid.toUInt();
@@ -4748 +4738 @@
             DoPause();
     }
 
-    // Resize the window back to the MythTV Player size
-    if (!using_gui_size_for_tv)
-    {
-        mwnd->setGeometry(player_bounds.left(), player_bounds.top(),
-                          player_bounds.width(), player_bounds.height());
-        mwnd->setFixedSize(player_bounds.size());
-    }
-
     // If user selected a new channel in the EPG, change to that channel
     if (changeChannel)
         EPGChannelUpdate(chanid, channum);

libs/libmythtv/guidegrid.cpp

@@ -48 +48 @@
                                   chanid, channum,
                                   player, allowsecondaryepg, "guidegrid");
 
+    if (!gContext->GetNumSetting("GuiSizeForTV", 0)) {
+        MythMainWindow *mainWindow = gContext->GetMainWindow();
+        QRect mwRect = mainWindow->geometry();
+        int x = gContext->GetNumSetting("GuiOffsetX");
+        int y = gContext->GetNumSetting("GuiOffsetY");
+        if (mwRect.x() != x || mwRect.y() != y)
+            gg->move(x,y);
+    }
+
     gg->Show();
 
     if (thread)

libs/libmythtv/progfind.cpp

@@ -52 +52 @@
                                      "program finder", ggActive);
 
     programFind->Initialize();
+
+    if (!gContext->GetNumSetting("GuiSizeForTV", 0)) {
+        MythMainWindow *mainWindow = gContext->GetMainWindow();
+        QRect mwRect = mainWindow->geometry();
+        int x = gContext->GetNumSetting("GuiOffsetX");
+        int y = gContext->GetNumSetting("GuiOffsetY");
+        if (mwRect.x() != x || mwRect.y() != y)
+            programFind->move(x,y);
+    }
+
     programFind->Show();
 
     if (thread)