Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix highlighting on plugin panel
  • Loading branch information
alabuzhev committed Apr 6, 2016
1 parent 74b99b9 commit 872c3e2
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
6 changes: 5 additions & 1 deletion far/changelog
@@ -1,4 +1,8 @@
drkns 06.04.2016 19:17:59 +0200 - build 4614
drkns 06.04.2016 19:41:18 +0200 - build 4615

1. С форума: ANSI плагины потеряли курсор файловой панели (4602).

drkns 06.04.2016 19:17:59 +0200 - build 4614

1. Уточнение 4425.

Expand Down
6 changes: 4 additions & 2 deletions far/filelist.cpp
Expand Up @@ -7849,7 +7849,9 @@ FarColor FileList::GetShowColor(int Position, bool FileColor) const
else if (m_ListData[Position].Selected)
Pos = HighlightFiles::SELECTED_COLOR;

if (Global->Opt->Highlight && (m_PanelMode != panel_mode::PLUGIN_PANEL || !(m_CachedOpenPanelInfo.Flags & OPIF_DISABLEHIGHLIGHTING)))
const auto HighlightingEnabled = Global->Opt->Highlight && (m_PanelMode != panel_mode::PLUGIN_PANEL || !(m_CachedOpenPanelInfo.Flags & OPIF_DISABLEHIGHLIGHTING));

if (HighlightingEnabled)
{
if (!m_ListData[Position].Colors)
{
Expand All @@ -7862,7 +7864,7 @@ FarColor FileList::GetShowColor(int Position, bool FileColor) const
ColorAttr = FileColor ? Colors.FileColor : Colors.MarkColor;
}

if (!Global->Opt->Highlight || (!ColorAttr.ForegroundColor && !ColorAttr.BackgroundColor)) // black on black, default
if (!HighlightingEnabled || (!ColorAttr.ForegroundColor && !ColorAttr.BackgroundColor)) // black on black, default
{
static const PaletteColors PalColor[] = {COL_PANELTEXT, COL_PANELSELECTEDTEXT, COL_PANELCURSOR, COL_PANELSELECTEDCURSOR};
ColorAttr=colors::PaletteColorToFarColor(PalColor[Pos]);
Expand Down
2 changes: 1 addition & 1 deletion far/vbuild.m4
@@ -1 +1 @@
m4_define(BUILD,4614)m4_dnl
m4_define(BUILD,4615)m4_dnl

0 comments on commit 872c3e2

Please sign in to comment.