From 48158780bff23c68545c997df6a0407d00c1b9fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20R=C4=99bacz?= <klugier@yahoo.com>
Date: Tue, 6 Jan 2026 23:05:38 +0100
Subject: [PATCH] Ide: move help icon after line display and make tool in the
 row default on mac.

---
 uppsrc/ide/ide.h      |  9 ++++++++-
 uppsrc/ide/idebar.cpp | 16 +++++++++-------
 uppsrc/ide/idewin.cpp |  1 -
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/uppsrc/ide/ide.h b/uppsrc/ide/ide.h
index 6da01dd4c..aa45bb891 100644
--- a/uppsrc/ide/ide.h
+++ b/uppsrc/ide/ide.h
@@ -627,7 +627,13 @@ public:
 	byte      default_charset;
 	bool      indent_spaces;
 	bool      show_status_bar;
-	bool      toolbar_in_row;
+	bool      toolbar_in_row =
+#ifdef PLATFORM_MACOS
+		true
+#else
+		false
+#endif
+		;
 	bool      disable_custom_caption = false;
 	bool      show_tabs;
 	bool      show_spaces;
@@ -1042,6 +1048,7 @@ public:
 		void  InsertParameters();
 
 	void      HelpMenu(Bar& menu);
+	void      HelpShowTopicMenu(Bar& menu);
 	    void  ViewIdeLogFile();
 		void  About();
 
diff --git a/uppsrc/ide/idebar.cpp b/uppsrc/ide/idebar.cpp
index 131772c42..b80d9ad3e 100644
--- a/uppsrc/ide/idebar.cpp
+++ b/uppsrc/ide/idebar.cpp
@@ -968,7 +968,6 @@ void Ide::HelpMenu(Bar& menu)
 {
 	LTIMESTOP("HelpMenu");
 	if(!IsEditorMode()) {
-//		menu.Add(AK_BROWSETOPICS, IdeImg::help(), THISBACK(ShowTopics));
 		menu.Add(editor.GetWord().GetCount(), AK_SEARCHTOPICS, THISBACK(SearchTopics));
 	}
 	menu.AddMenu(AK_BROWSETOPICS_WIN, CtrlImg::help(), THISBACK(ShowTopicsWin));
@@ -984,13 +983,15 @@ void Ide::HelpMenu(Bar& menu)
 		menu.Separator();
 		menu.Add("About..", IdeImg::info(), THISBACK(About));
 	}
-	else {
-		if(!toolbar_in_row) {
-			menu.GapRight();
-			menu.Separator();
-		}
-		menu.Add(AK_BROWSETOPICS_WIN, CtrlImg::help(), THISBACK(ShowTopicsWin));
+}
+
+void Ide::HelpShowTopicMenu(Bar& menu)
+{
+	if(!toolbar_in_row) {
+		menu.GapRight();
 	}
+	menu.Separator();
+	menu.Add(AK_BROWSETOPICS_WIN, CtrlImg::help(), THISBACK(ShowTopicsWin));
 }
 
 void Ide::MainMenu(Bar& menu)
@@ -1058,6 +1059,7 @@ void Ide::MainTool(Bar& bar)
 #ifdef PLATFORM_COCOA
 	bar.GapRight();
 	bar.Add(display, HorzLayoutZoom(170));
+	HelpShowTopicMenu(bar);
 #endif
 }
 
diff --git a/uppsrc/ide/idewin.cpp b/uppsrc/ide/idewin.cpp
index c5d162722..0070ea8f2 100644
--- a/uppsrc/ide/idewin.cpp
+++ b/uppsrc/ide/idewin.cpp
@@ -523,7 +523,6 @@ Ide::Ide()
 	menubar.AreaLook(1);
 	toolbar.WhenHelp = ~statusbar;
 	toolbar.AreaLook(1);
-	toolbar_in_row = false;
 	WhenClose = THISBACK(Exit);
 
 	editor_p.Add(editor.SizePos());