[Commits] [SCM] claws branch, master, updated. 4.1.1-99-gabed0c4a5
jonathan at claws-mail.org
jonathan at claws-mail.org
Sun Oct 22 11:51:47 UTC 2023
The branch, master has been updated
via abed0c4a511d0d247eaa17cd235f433863dc3025 (commit)
from 13cf4f62cc8f7d529042c4708dc7f0bc3c9d5f8b (commit)
Summary of changes:
src/plugins/litehtml_viewer/container_linux.cpp | 4 ++++
src/plugins/litehtml_viewer/container_linux.h | 4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
- Log -----------------------------------------------------------------
commit abed0c4a511d0d247eaa17cd235f433863dc3025
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date: Mon Oct 9 01:54:07 2023 -0700
Use custom get_default_font_size() and _name()
diff --git a/src/plugins/litehtml_viewer/container_linux.cpp b/src/plugins/litehtml_viewer/container_linux.cpp
index 76992ed31..3b6219d87 100644
--- a/src/plugins/litehtml_viewer/container_linux.cpp
+++ b/src/plugins/litehtml_viewer/container_linux.cpp
@@ -216,10 +216,12 @@ int container_linux::pt_to_px( int pt ) const
return (int) ((double) pt * dpi / 72.0);
}
+/*
int container_linux::get_default_font_size() const
{
return pt_to_px(12);
}
+*/
void container_linux::draw_list_marker( litehtml::uint_ptr hdc, const litehtml::list_marker& marker )
{
@@ -920,10 +922,12 @@ gint container_linux::clear_images(gsize desired_size)
return num;
}
+/*
const char* container_linux::get_default_font_name() const
{
return "Times New Roman";
}
+*/
std::shared_ptr<litehtml::element> container_linux::create_element(const char *tag_name,
const litehtml::string_map &attributes,
diff --git a/src/plugins/litehtml_viewer/container_linux.h b/src/plugins/litehtml_viewer/container_linux.h
index 4537ea0b4..a09384601 100644
--- a/src/plugins/litehtml_viewer/container_linux.h
+++ b/src/plugins/litehtml_viewer/container_linux.h
@@ -84,8 +84,8 @@ public:
int text_width(const char* text, litehtml::uint_ptr hFont) override;
void draw_text(litehtml::uint_ptr hdc, const char* text, litehtml::uint_ptr hFont, litehtml::web_color color, const litehtml::position& pos) override;
int pt_to_px(int pt) const override;
- int get_default_font_size() const override;
- const char* get_default_font_name() const override;
+ //int 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;
void get_image_size(const char* src, const char* baseurl, litehtml::size& sz) override;
void draw_background(litehtml::uint_ptr hdc, const std::vector<litehtml::background_paint>& bg) override;
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list