From 88d5b792fb464097a07ccbc14996d0d144befb00 Mon Sep 17 00:00:00 2001 From: Neil Date: Tue, 31 Aug 2021 07:52:37 +1000 Subject: Simplify Style types FontSpecification, FontMeasurements, Style, FontRealised. Rely on shared_ptr and use standard copying where possible. Check extraFontFlag and checkMonospaced for FontSpecification comparisons. --- src/ViewStyle.h | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'src/ViewStyle.h') diff --git a/src/ViewStyle.h b/src/ViewStyle.h index 843efc660..edebee7ce 100644 --- a/src/ViewStyle.h +++ b/src/ViewStyle.h @@ -28,16 +28,10 @@ public: */ -class FontRealised : public FontMeasurements { +class FontRealised { public: + FontMeasurements measurements; std::shared_ptr font; - FontRealised() noexcept; - // FontRealised objects can not be copied. - FontRealised(const FontRealised &) = delete; - FontRealised(FontRealised &&) = delete; - FontRealised &operator=(const FontRealised &) = delete; - FontRealised &operator=(FontRealised &&) = delete; - virtual ~FontRealised(); void Realise(Surface &surface, int zoomLevel, Scintilla::Technology technology, const FontSpecification &fs, const char *localeName); }; -- cgit v1.2.3