[FarGroup/FarManager] master: Correction of 5137 (1803e969e)

[farg...@farmanager.com]

Repository : https://github.com/FarGroup/FarManager
On branch : master
Link : https://github.com/FarGroup/FarManager/commit/1803e969e179232de176f108c73b850dd0c7d55f

>---------------------------------------------------------------

commit 1803e969e179232de176f108c73b850dd0c7d55f
Author: Alex Alabuzhev <alab...@gmail.com>
Date: Sat Sep 20 19:09:04 2025 +0100

Correction of 5137


>---------------------------------------------------------------

1803e969e179232de176f108c73b850dd0c7d55f
far/changelog | 5 +++++
far/fileview.cpp | 16 +---------------
far/fileview.hpp | 1 -
far/vbuild.m4 | 2 +-
far/viewer.cpp | 9 +++++++++
5 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/far/changelog b/far/changelog
index 684d47f35..71ca10e5c 100644
--- a/far/changelog
+++ b/far/changelog
@@ -1,3 +1,8 @@
+--------------------------------------------------------------------------------
+drkns 2025-09-20 19:08:13+01:00 - build 6560
+
+1. Correction of 5137.
+
--------------------------------------------------------------------------------
MZK 2025-09-19 20:55:44-04:00 - build 6559

diff --git a/far/fileview.cpp b/far/fileview.cpp
index c848dbcfb..57f37918a 100644
--- a/far/fileview.cpp
+++ b/far/fileview.cpp
@@ -584,21 +584,7 @@ bool FileViewer::CanFastHide() const
return (Global->Opt->AllCtrlAltShiftRule & CASR_VIEWER) != 0;
}

-int FileViewer::ViewerControl(int Command, intptr_t Param1, void *Param2) const
-{
- const auto result = m_View->ViewerControl(Command, Param1, Param2);
- if (result&&VCTL_GETINFO==Command)
- {
- const auto Info=static_cast<ViewerInfo*>(Param2);
- if (IsTitleBarVisible())
- Info->Options |= VOPT_SHOWTITLEBAR;
- if (IsKeyBarVisible())
- Info->Options |= VOPT_SHOWKEYBAR;
- }
- return result;
-}
-
- string FileViewer::GetTitle() const
+string FileViewer::GetTitle() const
{
return m_View->GetTitle();
}
diff --git a/far/fileview.hpp b/far/fileview.hpp
index fc1573dda..41fdfb1a6 100644
--- a/far/fileview.hpp
+++ b/far/fileview.hpp
@@ -105,7 +105,6 @@ public:
архива для клавиши F2 сделать вызов ShiftF2.
*/
void SetSaveToSaveAs(bool ToSaveAs) { m_SaveToSaveAs=ToSaveAs; InitKeyBar(); }
- int ViewerControl(int Command, intptr_t Param1, void *Param2) const;
bool IsFullScreen() const {return m_FullScreen;}
long long GetViewFileSize() const;
long long GetViewFilePos() const;
diff --git a/far/vbuild.m4 b/far/vbuild.m4
index e561a75d7..2ed2610f5 100644
--- a/far/vbuild.m4
+++ b/far/vbuild.m4
@@ -1 +1 @@
-6559
+6560
diff --git a/far/viewer.cpp b/far/viewer.cpp
index 9a2e7d337..a5f738d6d 100644
--- a/far/viewer.cpp
+++ b/far/viewer.cpp
@@ -3915,6 +3915,15 @@ int Viewer::ViewerControl(int Command, intptr_t Param1, void *Param2)

Info->TabSize=ViOpt.TabSize;
Info->LeftPos=LeftPos;
+
+ if (HostFileViewer)
+ {
+ if (HostFileViewer->IsTitleBarVisible())
+ Info->Options |= VOPT_SHOWTITLEBAR;
+ if (HostFileViewer->IsKeyBarVisible())
+ Info->Options |= VOPT_SHOWKEYBAR;
+ }
+
return TRUE;
}