From 278be7df57b43fa31263715b84f65b5fc6d07c1e Mon Sep 17 00:00:00 2001 From: Alex Alabuzhev Date: Mon, 14 Jun 2021 19:15:05 +0100 Subject: [PATCH] Remove workaround for transparent editor highlighting --- far/changelog | 7 +++++++ far/editor.cpp | 8 +------- far/vbuild.m4 | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/far/changelog b/far/changelog index f49b7eea1b..d933a3850e 100644 --- a/far/changelog +++ b/far/changelog @@ -1,3 +1,10 @@ +-------------------------------------------------------------------------------- +drkns 14.06.2021 19:10:39 +0100 - build 5821 + +1. Removed the workaround for plugins that erroneously add transparent editor highlighting. + Transparency is now taken into account. + If your plugin/script suddenly stopped working - fill the colors properly. + -------------------------------------------------------------------------------- drkns 12.06.2021 12:39:43 +0100 - build 5820 diff --git a/far/editor.cpp b/far/editor.cpp index 62c55f1396..69f22cfce7 100644 --- a/far/editor.cpp +++ b/far/editor.cpp @@ -5662,13 +5662,7 @@ int Editor::EditorControl(int Command, intptr_t Param1, void *Param2) ColorItem newcol; newcol.StartPos=col->StartPos; newcol.EndPos=col->EndPos; - - // BUGBUG Colorer sends transparent colors - auto OpaqueColor = col->Color; - colors::make_opaque(OpaqueColor.ForegroundColor); - colors::make_opaque(OpaqueColor.BackgroundColor); - newcol.SetColor(OpaqueColor); - + newcol.SetColor(col->Color); newcol.Flags=col->Flags; newcol.SetOwner(col->Owner); newcol.Priority=col->Priority; diff --git a/far/vbuild.m4 b/far/vbuild.m4 index d01f253a38..3d971f5a00 100644 --- a/far/vbuild.m4 +++ b/far/vbuild.m4 @@ -1 +1 @@ -5820 +5821