Update 0.8 pre1

README.md

@@ -31,9 +31,11 @@ The x86 (32-bit) Windows binaries can be downloaded [here](https://github.com/ma
 # Changelog
 
 * 0.8 (planned)
-	* [ ] Fully get rid of flickering (as much as possible anyways)
+	* Fully get rid of flickering (as much as possible anyways)
+	* Reset zoom on page change
+	* Make zooming less aggressive (+- 10% at a time)
 	* [ ] Add more status bar functionality
-	* [ ] Add zooming capability
+	* [ ] Add zooming capability itself
 
 * 0.7
 	* Fix bugs with command-line usage

src/hdcbuffer.cpp

@@ -9,20 +9,20 @@ void pdfv::hdc::Renderer::clear() noexcept
 {
 	return this->bmBuffer.find(pageIdx) != this->bmBuffer.end();
 }
-void pdfv::hdc::Renderer::putPage(std::size_t pageIdx, xy<int> pos, xy<int> size, std::function<Renderer::RenderT (void *)> render, void * renderArg)
+void pdfv::hdc::Renderer::putPage(std::size_t pageIdx, xy<int> size, std::function<Renderer::RenderT (void *)> render, void * renderArg)
 {
 	bool reRender{ true };
 	if (auto it{ this->bmBuffer.find(pageIdx) }; it != this->bmBuffer.end())
 	{
-		if (it->second.pos == pos && it->second.size == size)
+		if (it->second.size == size)
 		{
 			reRender = false;
 		}
 	}
 
 	if (reRender)
 	{
-		this->bmBuffer[pageIdx] = RenderStats(render(renderArg), pos, size);
+		this->bmBuffer[pageIdx] = RenderStats(render(renderArg), size);
 	}
 }
 

src/hdcbuffer.hpp

@@ -15,7 +15,7 @@ namespace pdfv::hdc
 		struct RenderStats
 		{
 			RenderT hrender;
-			xy<int> pos, size;
+			xy<int> size;
 		};
 
 	private:
@@ -45,7 +45,7 @@ namespace pdfv::hdc
 		 * @param render Rendering function, returns RenderT object
 		 * @param renderArg Argument to the rendering function
 		 */
-		void putPage(std::size_t pageIdx, xy<int> pos, xy<int> size, std::function<RenderT (void *)> render, void * renderArg);
+		void putPage(std::size_t pageIdx, xy<int> size, std::function<RenderT (void *)> render, void * renderArg);
 
 		/**
 		 * @param pageIdx Page index

src/lib.cpp

@@ -240,7 +240,6 @@ pdfv::error::Errorcode pdfv::Pdfium::pageRender(HDC dc, pdfv::xy<int> pos, pdfv:
 		void * args[]{ this, dc, &newsize };
 		this->m_optRenderer.putPage(
 			this->m_fpagenum,
-			pos,
 			newsize,
 			[](void * args) -> hdc::Renderer::RenderT
 			{

src/tabs.cpp

@@ -135,6 +135,8 @@ LRESULT pdfv::Tabs::tabsCanvasProc(UINT msg, WPARAM wp, LPARAM lp)
 			si.fMask  = SIF_POS;
 			si.nPos   = tab->page;
 			::SetScrollInfo(this->m_canvashwnd, SB_VERT, &si, true);
+
+			::SendMessageW(this->getCanvasHandle(), Tabs::WM_ZOOMRESET, 0, 0);
 		}
 		break;
 	}
@@ -144,7 +146,7 @@ LRESULT pdfv::Tabs::tabsCanvasProc(UINT msg, WPARAM wp, LPARAM lp)
 		if (tab != nullptr && tab->second.pdfExists())
 		{
 			auto prevzoom{ tab->zoom };
-			tab->zoom += float(int(wp)) / float(WHEEL_DELTA);
+			tab->zoom += float(int(wp)) / float(10 * WHEEL_DELTA);
 			tab->zoom = std::clamp(tab->zoom, 1.0f, 10.0f);
 			if (prevzoom != tab->zoom)
 			{

src/version.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #define APP_CLASSNAME  L"PdfiumViewCpp"
-#define VERSION_STRING L"0.7b"
+#define VERSION_STRING L"0.8b pre1"
 #define PRODUCT_NAME   L"PdfiumView"
 #define APP_NAME PRODUCT_NAME L" v" VERSION_STRING
 
@@ -19,8 +19,8 @@
 	" * Ability to open hyperlinks/websites\n\n" \
 	"The project is open for any feature requests. Post them under the Issues tab in GitHub."
 
-#define VERSION_SEQUENCE      0,7
-#define VERSION_SEQUENCE_STR "0.7"
+#define VERSION_SEQUENCE      0,8
+#define VERSION_SEQUENCE_STR "0.8"
 
 #define DEFAULT_OPEN_FILTER L""
 #define DEFAULT_OPEN_TITLE  L""