From 6ed19100686b8e82ad356a0ad8cd9acb39025556 Mon Sep 17 00:00:00 2001 From: "Sergey V. Zhdanovskih" Date: Sat, 8 Jun 2024 01:16:12 +0300 Subject: [PATCH] Minor improvements --- .gitignore | 3 +++ projects/GKCore/GKCore/Charts/ChartRenderer.cs | 10 ++++++++++ projects/GKCore/GKCore/Charts/TreeChartModel.cs | 5 +++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e822d7d4d..4e9633f4c 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,6 @@ opencover.xml /projects/GKv3/packages/**/ .idea/ adb-copy.cmd + +GEDKeeper2Lux.sln +/projects/plugins/GKLuxTree/ diff --git a/projects/GKCore/GKCore/Charts/ChartRenderer.cs b/projects/GKCore/GKCore/Charts/ChartRenderer.cs index f9970494f..52050ab86 100644 --- a/projects/GKCore/GKCore/Charts/ChartRenderer.cs +++ b/projects/GKCore/GKCore/Charts/ChartRenderer.cs @@ -61,6 +61,11 @@ protected ChartRenderer() { } + public virtual void SetViewport(int width, int height) + { + // dummy + } + public abstract void SetSmoothing(bool value); public virtual void BeginDrawing() @@ -158,6 +163,11 @@ public abstract void DrawRoundedRectangle(IPen pen, IColor fillColor, float x, f public abstract void DrawPath(IPen pen, IBrush brush, IGfxPath path); + public virtual IFont CreateFont(string fontName, float size, bool bold) + { + return AppHost.GfxProvider.CreateFont(fontName, size, bold); + } + public IPen CreatePen(int argb, float width = 1.0f) { return CreatePen(GetColor(argb), width); diff --git a/projects/GKCore/GKCore/Charts/TreeChartModel.cs b/projects/GKCore/GKCore/Charts/TreeChartModel.cs index 8378ba6e2..a49678075 100644 --- a/projects/GKCore/GKCore/Charts/TreeChartModel.cs +++ b/projects/GKCore/GKCore/Charts/TreeChartModel.cs @@ -941,8 +941,9 @@ private void Predef() // https://social.msdn.microsoft.com/Forums/en-US/98717e53-89f7-4d5f-823b-7184781a7b85/wpf-formattedtext-randomly-disappears-in-high-resolution-images fsz = Math.Max(fsz, 5.0f); #endif - fBoldFont = AppHost.GfxProvider.CreateFont(fOptions.DefFontName, fsz, true); - fDrawFont = AppHost.GfxProvider.CreateFont(fOptions.DefFontName, fsz, false); + string fontName = fOptions.DefFontName; + fBoldFont = fRenderer.CreateFont(fontName, fsz, true); + fDrawFont = fRenderer.CreateFont(fontName, fsz, false); if (fRenderer != null) { fDefCharWidth = fRenderer.GetTextWidth("A", fDrawFont); }