Fix PDF refreshing bug by adding std::move

Author: makuke1234

src/hdcbuffer.cpp

@@ -30,4 +30,8 @@ pdfv::hdc::Renderer::RenderT & pdfv::hdc::Renderer::getPage(std::size_t pageIdx)
 {
 	return this->bmBuffer.at(pageIdx).hrender;
 }
+void pdfv::hdc::Renderer::removePage(std::size_t pageIdx) noexcept
+{
+	this->bmBuffer.erase(pageIdx);
+}
 

src/hdcbuffer.hpp

@@ -52,5 +52,12 @@ namespace pdfv::hdc
 		 * @return RenderT& Reference to requested page's render object
 		 */
 		RenderT & getPage(std::size_t pageIdx);
+
+		/**
+		 * @brief Removes pre-rendered page from buffer
+		 * 
+		 * @param pageIdx Page index
+		 */
+		void removePage(std::size_t pageIdx) noexcept;
 	};
 }

src/lib.cpp

@@ -24,7 +24,7 @@ pdfv::Pdfium::Pdfium() noexcept
 pdfv::Pdfium::Pdfium(Pdfium && other) noexcept
 	: m_fdoc(other.m_fdoc), m_fpage(other.m_fpage),
 	m_fpagenum(other.m_fpagenum), m_numPages(other.m_numPages),
-	m_buf(std::move(other.m_buf))
+	m_buf(std::move(other.m_buf)), m_optRenderer(std::move(other.m_optRenderer))
 {
 	DEBUGPRINT("pdfv::Pdfium::Pdfium(%p)\n", static_cast<void *>(&other));
 	other.m_fdoc  = nullptr;
@@ -34,11 +34,12 @@ pdfv::Pdfium & pdfv::Pdfium::operator=(Pdfium && other) noexcept
 {
 	DEBUGPRINT("pdfv::Pdfium::operator=(%p)\n", static_cast<void *>(&other));
 
-	this->m_fdoc     = other.m_fdoc;
-	this->m_fpage    = other.m_fpage;
-	this->m_fpagenum = other.m_fpagenum;
-	this->m_numPages = other.m_numPages;
-	this->m_buf      = std::move(other.m_buf);
+	this->m_fdoc        = other.m_fdoc;
+	this->m_fpage       = other.m_fpage;
+	this->m_fpagenum    = other.m_fpagenum;
+	this->m_numPages    = other.m_numPages;
+	this->m_buf         = std::move(other.m_buf);
+	this->m_optRenderer = std::move(other.m_optRenderer);
 
 	other.m_fdoc  = nullptr;
 	other.m_fpage = nullptr;
@@ -258,8 +259,8 @@ pdfv::error::Errorcode pdfv::Pdfium::pageRender(HDC dc, pdfv::xy<int> pos, pdfv:
 				DEBUGPRINT("render!\n");
 				auto argv{ reinterpret_cast<void **>(args) };
 
-				auto self{ static_cast<Pdfium *>(argv[0]) };
-				auto dc  { static_cast<HDC>(argv[1]) };
+				auto self{ static_cast<Pdfium * >(argv[0]) };
+				auto dc  { static_cast<HDC      >(argv[1]) };
 				auto size{ static_cast<xy<int> *>(argv[2]) };
 
 				auto memdc { ::CreateCompatibleDC(dc) };
@@ -298,3 +299,8 @@ pdfv::error::Errorcode pdfv::Pdfium::pageRender(HDC dc, pdfv::xy<int> pos, pdfv:
 		return error::pdf_page;
 	}
 }
+
+void pdfv::Pdfium::flush() noexcept
+{
+	this->m_optRenderer.clear();
+}

src/lib.hpp

@@ -151,5 +151,7 @@ namespace pdfv
 		{
 			return this->m_fdoc != nullptr;
 		}
+
+		void flush() noexcept;
 	};
 }

src/tabs.cpp

@@ -13,6 +13,27 @@ pdfv::TabObject::TabObject(std::wstring && v1, pdfv::Pdfium && v2)
 {
 	this->first.append(pdfv::Tabs::padding);
 }
+pdfv::TabObject::TabObject(TabObject && other) noexcept
+	: first(std::move(other.first)), second(std::move(other.second)), zoom(other.zoom),
+	yMaxScroll(other.yMaxScroll), yMinScroll(other.yMinScroll), page(other.page)
+{
+}
+pdfv::TabObject & pdfv::TabObject::operator=(TabObject && other) noexcept
+{
+	this->first      = std::move(other.first);
+	this->second     = std::move(other.second);
+	this->zoom       = other.zoom;
+	
+	this->yMaxScroll = other.yMaxScroll;
+	this->yMinScroll = other.yMinScroll;
+	this->page       = other.page;
+
+	return *this;
+}
+pdfv::TabObject::~TabObject() noexcept
+{
+	this->second.flush();
+}
 
 
 
@@ -334,9 +355,9 @@ void pdfv::Tabs::move(xy<int> newpos) noexcept
 		w::moveWin(this->getTabsHandle(), this->m_pos.x, this->m_pos.y);
 	}
 }
-void pdfv::Tabs::redrawTabs() noexcept
+void pdfv::Tabs::redrawTabs(bool erase) noexcept
 {
-	w::redraw(this->getTabsHandle());
+	w::redraw(this->getTabsHandle(), erase);
 	this->updateScrollbar();
 	this->updatePageCounter();
 	this->updateZoom();
@@ -398,6 +419,7 @@ void pdfv::Tabs::remove(std::wstring_view title) noexcept
 	{
 		if ((it)->first == title)
 		{
+			// Remove this page from buffer
 			this->m_tabs.erase(it);
 			TabCtrl_DeleteItem(this->m_tabshwnd, index);
 			break;
@@ -463,7 +485,7 @@ pdfv::Tabs::ListType::iterator pdfv::Tabs::rename(std::wstring_view title, const
 		return this->m_tabs[index].first;
 	}
 }
-void pdfv::Tabs::select(const ssize_t index) noexcept
+void pdfv::Tabs::select(const ssize_t index, bool erase) noexcept
 {
 	if (index == Tabs::endpos)
 	{
@@ -473,17 +495,17 @@ void pdfv::Tabs::select(const ssize_t index) noexcept
 	{
 		TabCtrl_SetCurSel(this->m_tabshwnd, std::clamp(index, ssize_t(0), ssize_t(this->m_tabs.size() - 1)));
 	}
-	this->selChange();
+	this->selChange(erase);
 }
 [[nodiscard]] std::size_t pdfv::Tabs::size() const noexcept
 {
 	return this->m_tabs.size();
 }
-void pdfv::Tabs::selChange() noexcept
+void pdfv::Tabs::selChange(bool erase) noexcept
 {
 	this->m_tabindex = TabCtrl_GetCurSel(this->m_tabshwnd);
 
-	this->redrawTabs();
+	this->redrawTabs(erase);
 }
 
 void pdfv::Tabs::updateScrollbar() noexcept

src/tabs.hpp

@@ -24,10 +24,10 @@ namespace pdfv
 		TabObject(std::wstring_view v1, pdfv::Pdfium && v2 = pdfv::Pdfium());
 		TabObject(std::wstring && v1, pdfv::Pdfium && v2 = pdfv::Pdfium());
 		TabObject(const TabObject & other) = delete;
-		TabObject(TabObject && other) noexcept = default;
+		TabObject(TabObject && other) noexcept;
 		TabObject & operator=(const TabObject & other) = delete;
-		TabObject & operator=(TabObject && other) noexcept = default;
-		~TabObject() noexcept = default;
+		TabObject & operator=(TabObject && other) noexcept;
+		~TabObject() noexcept;
 
 	private:
 
@@ -132,8 +132,10 @@ namespace pdfv
 		/**
 		 * @brief Redraws the tab control
 		 * 
+		 * @param erase Whether to erase the control
+		 * 
 		 */
-		void redrawTabs() noexcept;
+		void redrawTabs(bool erase = false) noexcept;
 		/**
 		 * @brief Redraws the tab canvas
 		 * 
@@ -185,17 +187,19 @@ namespace pdfv
 		 * @brief Selects a tab, makes it active
 		 * 
 		 * @param index Tab index, Tabs::endpos by default
+		 * @param erase Controls whether to erase the tab
 		 */
-		void select(const ssize_t index = Tabs::endpos) noexcept;
+		void select(const ssize_t index = Tabs::endpos, bool erase = false) noexcept;
 		/**
 		 * @return std::size_t Number of tab currently present
 		 */
 		[[nodiscard]] std::size_t size() const noexcept;
 		/**
 		 * @brief Handles the tab control active tab changes
 		 * 
+		 * @param erase Controls whether to erase the tab
 		 */
-		void selChange() noexcept;
+		void selChange(bool erase = false) noexcept;
 
 		void updateScrollbar() noexcept;
 

src/version.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #define APP_CLASSNAME  L"PdfiumViewCpp"
-#define VERSION_STRING L"0.8b pre3"
+#define VERSION_STRING L"0.8"
 #define PRODUCT_NAME   L"PdfiumView"
 #define APP_NAME PRODUCT_NAME L" v" VERSION_STRING