More bug-fixing, refactoring, release

README.md

@@ -30,14 +30,21 @@ The x86 (32-bit) Windows binaries can be downloaded [here](https://github.com/ma
 
 # Changelog
 
-* 0.4 (planned)
+* 0.5 (planned)
+	* [ ] Add zooming capability
+
+* 0.4
 	* Make about dialog always centered
 		* *About dialog button is also centered*
 	* Make window size less restricted
 	* More refactoring of codebase
 	* Optimise memory usage of file open dialogs
 	* Fix annoying bug with tab becoming active every time attempting to close it
-	* [ ] Add zooming capability
+	* Fix bug with scrolling multiple pages at once with some scrollwheels
+	* Prevent key spamming on tab closing
+	* Add status bar
+	* Update PDFium library
+	* Compress icon
 
 * 0.3.0
 	* Develop about dialog

src/common.cpp

@@ -270,7 +270,7 @@ namespace pdfv
 				nullptr,
 				nullptr
 			);
-			auto hfont{ MainWindow::mwnd.getDefFont() };
+			auto hfont{ window.getDefFont() };
 			w::setFont(button1,    hfont, true);
 			w::setFont(button2,    hfont, true);
 			w::setFont(messagebox, hfont, true);
@@ -302,7 +302,7 @@ namespace pdfv
 {
 	DEBUGPRINT("pdfv::askInfo(%p, %p)\n", static_cast<const void *>(message.data()), static_cast<const void *>(title.data()));
 
-	WNDCLASSEXW wc{ MainWindow::mwnd.getWinClass() };
+	WNDCLASSEXW wc{ window.getWinClass() };
 	wc.lpfnWndProc   = &pdfv::askProc;
 	wc.lpszClassName = L"AskInfoClass";
 	wc.lpszMenuName  = nullptr;
@@ -311,7 +311,7 @@ namespace pdfv
 	{
 		return {};
 	}
-	MainWindow::mwnd.enable(false);
+	window.enable(false);
 	AskProc_finished = false;
 
 	wchar_t temp[2048]{};
@@ -324,14 +324,14 @@ namespace pdfv
 		CW_USEDEFAULT,
 		dip(330, dpi.x),
 		dip(142, dpi.y),
-		MainWindow::mwnd.getHwnd(),
+		window.getHandle(),
 		nullptr,
 		nullptr,
 		reinterpret_cast<LPVOID>(temp)
 	);
 	if (hwnd == nullptr) [[unlikely]]
 	{
-		MainWindow::mwnd.enable();
+		window.enable();
 		::UnregisterClassW(wc.lpszClassName, wc.hInstance);
 		return {};
 	}
@@ -354,7 +354,7 @@ namespace pdfv
 	}
 	::DestroyWindow(hwnd);
 
-	MainWindow::mwnd.enable();
+	window.enable();
 	::UnregisterClassW(wc.lpszClassName, wc.hInstance);
 	return temp;
 }

src/errors.cpp

@@ -39,7 +39,7 @@ void pdfv::error::report(pdfv::error::Errorcode errid, HWND hwnd) noexcept
 }
 void pdfv::error::report(pdfv::error::Errorcode errid) noexcept
 {
-	pdfv::error::report(errid, MainWindow::mwnd.getHwnd());
+	pdfv::error::report(errid, pdfv::window.getHandle());
 }
 
 pdfv::error::Errorcode pdfv::error::lastErr = pdfv::error::Errorcode::success;

src/lib.cpp

@@ -153,7 +153,7 @@ pdfv::error::Errorcode pdfv::Pdfium::pdfLoad(u8 * && data, std::size_t length, s
 		s_errorHappened = true;
 		if (auto err{ this->getLastError() }; err == error::pdf_password)
 		{
-			auto ans{ utf::conv(askInfo(L"Enter password:", MainWindow::mwnd.getTitle())) };
+			auto ans{ utf::conv(askInfo(L"Enter password:", window.getTitle())) };
 			this->m_fdoc = FPDF_LoadMemDocument(this->m_buf.get(), length, ans.c_str());
 			if (this->m_fdoc == nullptr) [[unlikely]]
 			{

src/main.cpp

@@ -21,17 +21,17 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE, LPWSTR cmdLine, int nCmdShow)
 		return pdfv::error::success;
 	}
 
-	if (!pdfv::MainWindow::mwnd.init(hInst, argc, argv.get())) [[unlikely]]
+	if (!pdfv::window.init(hInst, argc, argv.get())) [[unlikely]]
 	{
 		pdfv::error::report();
 		return pdfv::error::error;
 	}
 
-	if (!pdfv::MainWindow::mwnd.run(fname, nCmdShow)) [[unlikely]]
+	if (!pdfv::window.run(fname, nCmdShow)) [[unlikely]]
 	{
 		pdfv::error::report();
 		return pdfv::error::error;
 	}	
 
-	return pdfv::MainWindow::mwnd.msgLoop();
+	return pdfv::window.msgLoop();
 }