Readjust the window size if the status bar is hidden.

skidau · skidau · commit a6520bb7c028 · 2015-06-10T06:48:21.000Z
Show the OSD if the status bar is hidden. git-svn-id: https://svn.code.sf.net/p/vbam/code@1507 a31d4220-a93d-0410-bf67-fe4944624d44
diff --git a/trunk/src/wx/cmdevents.cpp b/trunk/src/wx/cmdevents.cpp
@@ -2674,6 +2674,7 @@ EVT_HANDLER(StatusBar, "Enable status bar")
 		mf->GetStatusBar()->Hide();
 
 	mf->SendSizeEvent();
+	panel->AdjustSize(true);
 }
 
 EVT_HANDLER(NoStatusMsg, "Disable on-screen status messages")
diff --git a/trunk/src/wx/panel.cpp b/trunk/src/wx/panel.cpp
@@ -1808,7 +1808,7 @@ void DrawingPanel::DrawArea(u8** data)
 
 	// draw OSD text old-style (directly into output buffer), if needed
 	// new style flickers too much, so we'll stick to this for now
-	if (wxGetApp().frame->IsFullScreen())
+	if (wxGetApp().frame->IsFullScreen() || !gopts.statusbar)
 	{
 		GameArea* panel = wxGetApp().frame->GetPanel();
 

Original file line number	Diff line number	Diff line change
`@@ -2674,6 +2674,7 @@ EVT_HANDLER(StatusBar, "Enable status bar")`
`2674`	`2674`	`mf->GetStatusBar()->Hide();`
`2675`	`2675`
`2676`	`2676`	`mf->SendSizeEvent();`
	`2677`	`+ panel->AdjustSize(true);`
`2677`	`2678`	`}`
`2678`	`2679`
`2679`	`2680`	`EVT_HANDLER(NoStatusMsg, "Disable on-screen status messages")`
Original file line number	Diff line number	Diff line change
`@@ -1808,7 +1808,7 @@ void DrawingPanel::DrawArea(u8** data)`
`1808`	`1808`
`1809`	`1809`	`// draw OSD text old-style (directly into output buffer), if needed`
`1810`	`1810`	`// new style flickers too much, so we'll stick to this for now`
`1811`		`- if (wxGetApp().frame->IsFullScreen())`
	`1811`	`+ if (wxGetApp().frame->IsFullScreen() \|\| !gopts.statusbar)`
`1812`	`1812`	`{`
`1813`	`1813`	`GameArea* panel = wxGetApp().frame->GetPanel();`
`1814`	`1814`