diff --git a/src/d_iwad.cpp b/src/d_iwad.cpp index 9db146ccd..e8df42d30 100644 --- a/src/d_iwad.cpp +++ b/src/d_iwad.cpp @@ -768,7 +768,12 @@ const FIWADInfo *FIWadManager::FindIWAD(TArray &wadfiles, const char *i int iwadType = IdentifyVersion(wadfiles, iwad, basewad, optionalwad); //gameiwad = iwadType; const FIWADInfo *iwad_info = &mIWadInfos[iwadType]; - if (DoomStartupInfo.Name.IsEmpty()) DoomStartupInfo.Name = iwad_info->Name; + if (DoomStartupInfo.Name.IsEmpty()) + { + DoomStartupInfo.Name = iwad_info->Name; + if (iwad_info->gametype == GAME_Doom) + DoomStartupInfo.Name << " v" << VERSIONSTR; + } if (DoomStartupInfo.BkColor == 0 && DoomStartupInfo.FgColor == 0) { DoomStartupInfo.BkColor = iwad_info->BkColor; diff --git a/src/win32/i_main.cpp b/src/win32/i_main.cpp index 90c5c7309..a1f60ea10 100644 --- a/src/win32/i_main.cpp +++ b/src/win32/i_main.cpp @@ -362,7 +362,7 @@ void LayoutMainWindow (HWND hWnd, HWND pane) if (DoomStartupInfo.Name.IsNotEmpty() && GameTitleWindow != NULL) { - bannerheight = GameTitleFontHeight + 5; + bannerheight = GameTitleFontHeight + 2; MoveWindow (GameTitleWindow, 0, 0, w, bannerheight, TRUE); InvalidateRect (GameTitleWindow, NULL, FALSE); } @@ -447,11 +447,11 @@ LRESULT CALLBACK LConProc (HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) // Create game title static control memset (&lf, 0, sizeof(lf)); hdc = GetDC (hWnd); - lf.lfHeight = -MulDiv(12, GetDeviceCaps(hdc, LOGPIXELSY), 72); + lf.lfHeight = -MulDiv(10, GetDeviceCaps(hdc, LOGPIXELSY), 72); lf.lfCharSet = ANSI_CHARSET; - lf.lfWeight = FW_BOLD; - lf.lfPitchAndFamily = VARIABLE_PITCH | FF_ROMAN; - strcpy (lf.lfFaceName, "Trebuchet MS"); + lf.lfWeight = FW_NORMAL; + lf.lfPitchAndFamily = DEFAULT_PITCH | FF_MODERN; + strcpy (lf.lfFaceName, "DejaVu Sans"); GameTitleFont = CreateFontIndirect (&lf); oldfont = SelectObject (hdc, GetStockObject (DEFAULT_GUI_FONT)); @@ -484,7 +484,7 @@ LRESULT CALLBACK LConProc (HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) } SendMessage (view, EM_SETREADONLY, TRUE, 0); SendMessage (view, EM_EXLIMITTEXT, 0, 0x7FFFFFFE); - SendMessage (view, EM_SETBKGNDCOLOR, 0, RGB(70,70,70)); + SendMessage (view, EM_SETBKGNDCOLOR, 0, RGB(20,20,20)); // Setup default font for the log. //SendMessage (view, WM_SETFONT, (WPARAM)GetStockObject (DEFAULT_GUI_FONT), FALSE); format.cbSize = sizeof(format); @@ -585,7 +585,7 @@ LRESULT CALLBACK LConProc (HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) drawitem = (LPDRAWITEMSTRUCT)lParam; // This background color should match the edit control's. - hbr = CreateSolidBrush (RGB(70,70,70)); + hbr = CreateSolidBrush (RGB(20,20,20)); FillRect (drawitem->hDC, &drawitem->rcItem, hbr); DeleteObject (hbr);