zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 14:51:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

hide the old main window as it no longer contains the startup.

Browse source
This commit is contained in:
Christoph Oelckers 2024-01-02 17:23:05 +01:00
parent 2431d214e6
commit 4afe1686da
3 changed files with 3 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/platform/win32/i_mainwindow.cpp
View file

@ -52,7 +52,7 @@ void MainWindow::Create(const FString& caption, int x, int y, int width, int hei
WS_EX_APPWINDOW, WS_EX_APPWINDOW,
WinClassName, WinClassName,
wcaption.c_str(), wcaption.c_str(),
WS_OVERLAPPEDWINDOW | WS_VISIBLE | WS_CLIPCHILDREN, WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN,
x, y, width, height, x, y, width, height,
(HWND)NULL, (HWND)NULL,
(HMENU)NULL, (HMENU)NULL,

6
src/common/widgets/widgetresourcedata.cpp
View file

@ -19,8 +19,7 @@ std::vector<uint8_t> LoadWidgetFontData(const std::string& name)
I_FatalError("Unable to find %s", name.c_str()); I_FatalError("Unable to find %s", name.c_str());
auto reader = WidgetResources->GetEntryReader(lump, FileSys::READER_SHARED); auto reader = WidgetResources->GetEntryReader(lump, FileSys::READER_SHARED);
std::vector<uint8_t> buffer; std::vector<uint8_t> buffer(reader.GetLength());
buffer.resize(reader.GetLength());
reader.Read(buffer.data(), buffer.size()); reader.Read(buffer.data(), buffer.size());
return buffer; return buffer;
} }
@ -32,8 +31,7 @@ std::vector<uint8_t> LoadWidgetImageData(const std::string& name)
I_FatalError("Unable to find %s", name.c_str()); I_FatalError("Unable to find %s", name.c_str());
auto reader = WidgetResources->GetEntryReader(lump, FileSys::READER_SHARED); auto reader = WidgetResources->GetEntryReader(lump, FileSys::READER_SHARED);
std::vector<uint8_t> buffer; std::vector<uint8_t> buffer(reader.GetLength());
buffer.resize(reader.GetLength());
reader.Read(buffer.data(), buffer.size()); reader.Read(buffer.data(), buffer.size());
return buffer; return buffer;
} }

30
src/win32/zdoom.rc
View file

@ -202,36 +202,6 @@ END
// Dialog // Dialog
// //
IDD_IWADDIALOG DIALOGEX 0, 0, 225, 248
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_APPWINDOW
CAPTION "Welcome"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
ICON IDI_ICON1,IDC_STATIC,7,7,20,20
LTEXT "Welcome to GZDoom!",IDC_STATIC,43,8,180,8
LTEXT "<Version info>",IDC_WELCOME_VERSION,43,18,180,8
GROUPBOX "IWAD selection",IDC_STATIC,8,32,208,117
LTEXT "Select which game file (IWAD) to run.",IDC_STATIC,12,44,190,8
LISTBOX IDC_IWADLIST,12,56,200,87,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
GROUPBOX "Video settings",IDC_STATIC,8,155,68,65
CONTROL "&Fullscreen",IDC_WELCOME_FULLSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,206,48,10
GROUPBOX "Extra Graphics",IDC_STATIC,159,155,59,64
CONTROL "Disable &autoload",IDC_WELCOME_NOAUTOLOAD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,166,65,10
CONTROL "&Lights",IDC_WELCOME_LIGHTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,164,165,43,10
CONTROL "&Brightmaps",IDC_WELCOME_BRIGHTMAPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,164,177,51,10
CONTROL "&Widescreen",IDC_WELCOME_WIDESCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,164,188,48,12
CONTROL "&Don't ask me again",IDC_DONTASKIWAD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,83,190,72,10
DEFPUSHBUTTON "&Play Game!",IDOK,8,227,90,14
PUSHBUTTON "E&xit",IDCANCEL,166,227,50,14
CONTROL "&OpenGL",IDC_WELCOME_VULKAN1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,13,167,41,10
#ifdef HAVE_VULKAN
CONTROL "&Vulkan",IDC_WELCOME_VULKAN2,"Button",BS_AUTORADIOBUTTON,13,176,37,10
#endif
#ifdef HAVE_GLES2
CONTROL "OpenGL &ES",IDC_WELCOME_VULKAN4,"Button",BS_AUTORADIOBUTTON,13,185,53,10
#endif
END
IDD_CRASHDIALOG DIALOGEX 0, 0, 415, 308 IDD_CRASHDIALOG DIALOGEX 0, 0, 415, 308
STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU