b4824 -- Привычное поведение при показе числа фоновых окон.

FarGroup · Oct 14, 2016 · dd9047f · dd9047f
1 parent c871197
commit dd9047f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/far/changelog b/far/changelog
@@ -1,3 +1,9 @@
+w17 14.10.2016 20:34:39 +0300 - build 4824
+
+1. Привычное поведение при показе числа фоновых окон.
+   Panel.ScreenNumber теперь 3-state, с умолчанием = 1.
+   Число диалогов показываем только для состояния 2.
+
 zg 13.10.2016 17:16:58 +0200 - build 4823
 
 1. 0003327: ECTL_REDRAW does not redraw during processing.

diff --git a/far/config.cpp b/far/config.cpp
@@ -1781,7 +1781,7 @@ void Options::InitConfigData()
 		{FSSF_PANELLAYOUT,   NKeyPanelLayout,L"DetailedJunction", OPT_DEF(PanelDetailedJunction, false)},
 		{FSSF_PRIVATE,       NKeyPanelLayout,L"DoubleGlobalColumnSeparator", OPT_DEF(DoubleGlobalColumnSeparator, false)},
 		{FSSF_PRIVATE,       NKeyPanelLayout,L"FreeInfo", OPT_DEF(ShowPanelFree, false)},
-		{FSSF_PRIVATE,       NKeyPanelLayout,L"ScreensNumber", OPT_DEF(ShowScreensNumber, true)},
+		{FSSF_PRIVATE,       NKeyPanelLayout,L"ScreensNumber", OPT_DEF(ShowScreensNumber, 1)},
 		{FSSF_PRIVATE,       NKeyPanelLayout,L"Scrollbar", OPT_DEF(ShowPanelScrollbar, false)},
 		{FSSF_PRIVATE,       NKeyPanelLayout,L"ScrollbarMenu", OPT_DEF(ShowMenuScrollbar, true)},
 		{FSSF_PRIVATE,       NKeyPanelLayout,L"ShowUnknownReparsePoint", OPT_DEF(ShowUnknownReparsePoint, false)},

diff --git a/far/config.hpp b/far/config.hpp
@@ -698,7 +698,7 @@ class Options: noncopyable
 
 	BoolOption ShowPanelScrollbar;
 	BoolOption ShowMenuScrollbar;
-	BoolOption ShowScreensNumber;
+	Bool3Option ShowScreensNumber;
 	BoolOption ShowSortMode;
 	BoolOption ShowMenuBar;
 	StringOption FormatNumberSeparators;

diff --git a/far/panel.cpp b/far/panel.cpp
@@ -784,7 +784,7 @@ void Panel::ShowScreensCount() const
 	{
 		int Viewers = Global->WindowManager->GetWindowCountByType(windowtype_viewer);
 		int Editors = Global->WindowManager->GetWindowCountByType(windowtype_editor);
-		int Dialogs = Global->WindowManager->GetWindowCountByType(windowtype_dialog);
+		int Dialogs = Global->Opt->ShowScreensNumber > 1 ? Global->WindowManager->GetWindowCountByType(windowtype_dialog) : 0;
 
 		if (Viewers>0 || Editors>0 || Dialogs > 0)
 		{

diff --git a/far/vbuild.m4 b/far/vbuild.m4
@@ -1 +1 @@
-m4_define(BUILD,4823)m4_dnl
+m4_define(BUILD,4824)m4_dnl