github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 06:05:58 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Ide: move help icon after line display and make tool in the row default on mac.

Browse source
This commit is contained in:
Zbigniew Rębacz 2026-01-06 23:05:38 +01:00
parent 4193ef4f3f
commit 48158780bf
3 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
uppsrc/ide/ide.h
View file

@ -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();

16
uppsrc/ide/idebar.cpp
View file

@ -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
}

1
uppsrc/ide/idewin.cpp
View file

@ -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());