Bug fix for Qt GUI using default settings to force the minimum viewport until after the GUI has been drawn/resized at least once to ensure that the menu bar size has been finalized and the viewport meets demanded values. At the first resize event, the viewport minimum size is reset back to 1x values so that the window can still be shrunk by dragging the lower window corners and edges.

src/drivers/Qt/ConsoleViewerGL.cpp

@@ -60,8 +60,8 @@ ConsoleViewGL_t::ConsoleViewGL_t(QWidget *parent)
 	rh = 240;
 	mouseButtonMask = 0;
 
-	setMinimumWidth( GL_NES_WIDTH );
-	setMinimumHeight( GL_NES_HEIGHT );
+	setMinimumWidth( 256 );
+	setMinimumHeight( 224 );
 	setFocusPolicy(Qt::StrongFocus);
 
 	QScreen *screen = QGuiApplication::primaryScreen();

src/drivers/Qt/ConsoleViewerSDL.cpp

@@ -41,8 +41,8 @@ ConsoleViewSDL_t::ConsoleViewSDL_t(QWidget *parent)
 	setAutoFillBackground(true);
 	setPalette(pal);
 
-	setMinimumWidth( GL_NES_WIDTH );
-	setMinimumHeight( GL_NES_HEIGHT );
+	setMinimumWidth( 256 );
+	setMinimumHeight( 224 );
 	setFocusPolicy(Qt::StrongFocus);
 
 	view_width  = GL_NES_WIDTH;
@@ -275,7 +275,7 @@ void ConsoleViewSDL_t::resizeEvent(QResizeEvent *event)
 	s = event->size();
 	view_width  = s.width();
 	view_height = s.height();
-	printf("SDL Resize: %i x %i \n", view_width, view_height);
+	//printf("SDL Resize: %i x %i \n", view_width, view_height);
 
 	gui_draw_area_width = view_width;
 	gui_draw_area_height = view_height;

src/drivers/Qt/ConsoleWindow.cpp

@@ -85,30 +85,15 @@
 consoleWin_t::consoleWin_t(QWidget *parent)
 	: QMainWindow( parent )
 {
-	int opt, xWinSize = 512, yWinSize = 512;
+	int opt, xWinSize = 256, yWinSize = 240;
 	int use_SDL_video = false;
 	int setFullScreen = false;
 
-	g_config->getOption( "SDL.WinSizeX", &xWinSize );
-	g_config->getOption( "SDL.WinSizeY", &yWinSize );
-
-	if ( xWinSize < 256 ) xWinSize = 256;
-	if ( yWinSize < 256 ) yWinSize = 256;
-
-	this->resize( xWinSize, yWinSize );
-
-	g_config->getOption( "SDL.Fullscreen", &setFullScreen );
-	g_config->setOption( "SDL.Fullscreen", 0 ); // Reset full screen config parameter to false so it is never saved this way
-
-	if ( setFullScreen )
-	{
-		this->showFullScreen();
-	}
-
 	createMainMenu();
 
 	g_config->getOption( "SDL.VideoDriver", &use_SDL_video );
 
+	firstResize    = true;
 	closeRequested = false;
 	errorMsgValid  = false;
 	viewport_GL    = NULL;
@@ -164,7 +149,7 @@ consoleWin_t::consoleWin_t(QWidget *parent)
 	g_config->getOption( "SDL.WinSizeX", &xWinSize );
 	g_config->getOption( "SDL.WinSizeY", &yWinSize );
 
-	if ( (xWinSize >= 256) && (yWinSize >= 256) )
+	if ( (xWinSize >= 256) && (yWinSize >= 224) )
 	{
 		this->resize( xWinSize, yWinSize );
 	}
@@ -172,7 +157,20 @@ consoleWin_t::consoleWin_t(QWidget *parent)
 	{
 		QSize reqSize = calcRequiredSize();
 
-		this->resize( reqSize );
+		// Since the height of menu is unknown until Qt has shows the window
+		// Set the minimum viewport sizes to exactly what we need so that 
+		// the window is resized appropriately. On the first resize event,
+		// we will set the minimum viewport size back to 1x values that the
+		// window can be shrunk by dragging lower corner.
+		if ( viewport_GL != NULL )
+		{
+			viewport_GL->setMinimumSize( reqSize );
+		}
+		else if ( viewport_SDL != NULL )
+		{
+			viewport_SDL->setMinimumSize( reqSize );
+		}
+		//this->resize( reqSize );
 	}
 
 	g_config->getOption( "SDL.Fullscreen", &setFullScreen );
@@ -299,7 +297,7 @@ QSize consoleWin_t::calcRequiredSize(void)
 	}
 
 	dw = 0;
-	dh = menubar->height();
+	dh = 0;
 
 	if ( sqrPixChkd )
 	{
@@ -308,12 +306,36 @@ QSize consoleWin_t::calcRequiredSize(void)
 	rw=(int)((r-l)*xscale);
 	rh=(int)((b-t)*yscale);
 
+	//printf("view %i x %i \n", rw, rh );
+
 	out.setWidth( rw + dw );
 	out.setHeight( rh + dh );
 
+	//printf("Win %i x %i \n", rw + dw, rh + dh );
+
 	return out;
 }
 
+void consoleWin_t::resizeEvent(QResizeEvent *event)
+{
+	if ( firstResize )
+	{
+		// We are assuming that window has been exposed and all sizing of menu is finished
+		// Restore minimum sizes to 1x values after first resize event so that
+		// window is still able to be shrunk by dragging lower corners.
+		if ( viewport_GL != NULL )
+		{
+			viewport_GL->setMinimumSize( QSize( 256, 224 ) );
+		}
+		else if ( viewport_SDL != NULL )
+		{
+			viewport_SDL->setMinimumSize( QSize( 256, 224 ) );
+		}
+		firstResize = false;
+	}
+	//printf("%i x %i \n", event->size().width(), event->size().height() );
+}
+
 void consoleWin_t::setCyclePeriodms( int ms )
 {
 	// If timer is already running, it will be restarted.

src/drivers/Qt/ConsoleWindow.h

@@ -189,11 +189,13 @@ class  consoleWin_t : public QMainWindow
 		bool        errorMsgValid;
 		bool        closeRequested;
 		bool        recentRomMenuReset;
+		bool        firstResize;
 
 		std::list <std::string*> romList;
 
 		unsigned int updateCounter;
 	protected:
+		void resizeEvent(QResizeEvent *event);
 		void closeEvent(QCloseEvent *event);
 		void keyPressEvent(QKeyEvent *event);
 		void keyReleaseEvent(QKeyEvent *event);