Don't use pixel_t for pt

DRKV333 · DRKV333 · commit d24b17726d9f · 2025-07-17T17:41:37.000Z
diff --git a/containers/cairo/container_cairo.cpp b/containers/cairo/container_cairo.cpp
@@ -9,7 +9,7 @@
 #endif
 
 
-litehtml::pixel_t container_cairo::pt_to_px(litehtml::pixel_t pt ) const
+litehtml::pixel_t container_cairo::pt_to_px(float pt ) const
 {
 	double dpi = get_screen_dpi();
 
diff --git a/containers/cairo/container_cairo.h b/containers/cairo/container_cairo.h
@@ -39,7 +39,7 @@ class container_cairo : public litehtml::document_container
 	container_cairo() = default;
 	virtual ~container_cairo() = default;
 
-	litehtml::pixel_t pt_to_px(litehtml::pixel_t pt) const override;
+	litehtml::pixel_t pt_to_px(float pt) const override;
 	litehtml::pixel_t get_default_font_size() const override;
 	const char*	get_default_font_name() const override;
 	void get_image_size(const char* src, const char* baseurl, litehtml::size& sz) override;
diff --git a/containers/haiku/container_haiku.cpp b/containers/haiku/container_haiku.cpp
@@ -281,7 +281,7 @@ LiteHtmlView::draw_text( litehtml::uint_ptr hdc, const char* text,
 }
 
 litehtml::pixel_t
-LiteHtmlView::pt_to_px( litehtml::pixel_t pt ) const
+LiteHtmlView::pt_to_px( float pt ) const
 {
 	std::cout << "pt_to_px" << std::endl;
 	return pt * 1.3333333333;
diff --git a/containers/haiku/container_haiku.h b/containers/haiku/container_haiku.h
@@ -38,7 +38,7 @@ class LiteHtmlView : public BView, public litehtml::document_container
 	virtual void						delete_font(litehtml::uint_ptr hFont) override;
 	virtual litehtml::pixel_t			text_width(const char* text, litehtml::uint_ptr hFont) override;
 	virtual void						draw_text(litehtml::uint_ptr hdc, const char* text, litehtml::uint_ptr hFont, litehtml::web_color color, const litehtml::position& pos) override;
-	virtual litehtml::pixel_t			pt_to_px(litehtml::pixel_t pt) const override;
+	virtual litehtml::pixel_t			pt_to_px(float pt) const override;
 	virtual litehtml::pixel_t			get_default_font_size() const override;
 	virtual const char*					get_default_font_name() const override;
 	virtual void 						load_image(const char* src, const char* baseurl, bool redraw_on_ready) override;
diff --git a/containers/test/test_container.cpp b/containers/test/test_container.cpp
@@ -125,7 +125,7 @@ void test_container::draw_text(uint_ptr hdc, const char* text, uint_ptr hFont, w
 	font->draw_text(*(canvas*)hdc, text, color, (int) pos.x, (int) pos.y);
 }
 
-pixel_t test_container::pt_to_px(pixel_t pt) const { return pt * 96 / 72; }
+pixel_t test_container::pt_to_px(float pt) const { return pt * 96 / 72; }
 pixel_t test_container::get_default_font_size() const { return 16; }
 const char* test_container::get_default_font_name() const { return "Terminus"; }
 
diff --git a/containers/test/test_container.h b/containers/test/test_container.h
@@ -21,7 +21,7 @@ class test_container : public document_container
 	void			delete_font(uint_ptr /*hFont*/) override {}
 	pixel_t			text_width(const char* text, uint_ptr hFont) override;
 	void			draw_text(uint_ptr hdc, const char* text, uint_ptr hFont, web_color color, const position& pos) override;
-	pixel_t			pt_to_px(pixel_t pt) const override;
+	pixel_t			pt_to_px(float pt) const override;
 	pixel_t			get_default_font_size() const override;
 	const char*		get_default_font_name() const override;
 	void 			load_image(const char* src, const char* baseurl, bool redraw_on_ready) override;
diff --git a/containers/windows/win32/win32_container.cpp b/containers/windows/win32/win32_container.cpp
@@ -185,7 +185,7 @@ void win32_container::draw_text( uint_ptr hdc, const char* text, uint_ptr hFont,
 	release_clip((HDC) hdc);
 }
 
-litehtml::pixel_t win32_container::pt_to_px(litehtml::pixel_t pt) const
+litehtml::pixel_t win32_container::pt_to_px(float pt) const
 {
 	return MulDiv(pt, GetDeviceCaps(m_tmp_hdc, LOGPIXELSY), 72);
 }
diff --git a/containers/windows/win32/win32_container.h b/containers/windows/win32/win32_container.h
@@ -33,7 +33,7 @@ class win32_container : public litehtml::document_container
 	void				draw_text(uint_ptr hdc, const char* text, uint_ptr hFont, litehtml::web_color color, const litehtml::position& pos) override;
 	void				transform_text(litehtml::string& text, litehtml::text_transform tt) override;
 
-	litehtml::pixel_t	pt_to_px(litehtml::pixel_t pt) const override;
+	litehtml::pixel_t	pt_to_px(float pt) const override;
 	void				draw_list_marker(uint_ptr hdc, const litehtml::list_marker& marker) override;
 	void				load_image(const char* src, const char* baseurl, bool redraw_on_ready) override;
 	void				get_image_size(const char* src, const char* baseurl, litehtml::size& sz) override;
diff --git a/include/litehtml/document_container.h b/include/litehtml/document_container.h
@@ -37,7 +37,7 @@ namespace litehtml
 		virtual void				delete_font(litehtml::uint_ptr hFont) = 0;
 		virtual pixel_t				text_width(const char* text, litehtml::uint_ptr hFont) = 0;
 		virtual void				draw_text(litehtml::uint_ptr hdc, const char* text, litehtml::uint_ptr hFont, litehtml::web_color color, const litehtml::position& pos) = 0;
-		virtual pixel_t				pt_to_px(pixel_t pt) const = 0;
+		virtual pixel_t				pt_to_px(float pt) const = 0;
 		virtual pixel_t				get_default_font_size() const = 0;
 		virtual const char*			get_default_font_name() const = 0;
 		virtual void				draw_list_marker(litehtml::uint_ptr hdc, const litehtml::list_marker& marker) = 0;

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`#endif`
`10`	`10`
`11`	`11`
`12`		`-litehtml::pixel_t container_cairo::pt_to_px(litehtml::pixel_t pt ) const`
	`12`	`+litehtml::pixel_t container_cairo::pt_to_px(float pt ) const`
`13`	`13`	`{`
`14`	`14`	`double dpi = get_screen_dpi();`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ LiteHtmlView::draw_text( litehtml::uint_ptr hdc, const char* text,`
`281`	`281`	`}`
`282`	`282`
`283`	`283`	`litehtml::pixel_t`
`284`		`-LiteHtmlView::pt_to_px( litehtml::pixel_t pt ) const`
	`284`	`+LiteHtmlView::pt_to_px( float pt ) const`
`285`	`285`	`{`
`286`	`286`	`std::cout << "pt_to_px" << std::endl;`
`287`	`287`	`return pt * 1.3333333333;`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ void test_container::draw_text(uint_ptr hdc, const char* text, uint_ptr hFont, w`
`125`	`125`	`font->draw_text((canvas)hdc, text, color, (int) pos.x, (int) pos.y);`
`126`	`126`	`}`
`127`	`127`
`128`		`-pixel_t test_container::pt_to_px(pixel_t pt) const { return pt * 96 / 72; }`
	`128`	`+pixel_t test_container::pt_to_px(float pt) const { return pt * 96 / 72; }`
`129`	`129`	`pixel_t test_container::get_default_font_size() const { return 16; }`
`130`	`130`	`const char* test_container::get_default_font_name() const { return "Terminus"; }`
`131`	`131`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ void win32_container::draw_text( uint_ptr hdc, const char* text, uint_ptr hFont,`
`185`	`185`	`release_clip((HDC) hdc);`
`186`	`186`	`}`
`187`	`187`
`188`		`-litehtml::pixel_t win32_container::pt_to_px(litehtml::pixel_t pt) const`
	`188`	`+litehtml::pixel_t win32_container::pt_to_px(float pt) const`
`189`	`189`	`{`
`190`	`190`	`return MulDiv(pt, GetDeviceCaps(m_tmp_hdc, LOGPIXELSY), 72);`
`191`	`191`	`}`