Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-16 23:34:10 +02:00
Code Activity

Improved settings reloading recent file menu item updating

Browse source
This commit is contained in:
Brian Fiete 2023-06-01 08:00:16 -04:00
parent c1f4466dd1
commit ed444416f0
4 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
BeefLibs/Beefy2D/src/sys/SysMenu.bf
View file

@ -3,6 +3,7 @@ using System.Collections;
using System.Text; using System.Text;
using Beefy.widgets; using Beefy.widgets;
using Beefy; using Beefy;
using System.Diagnostics;
namespace Beefy.sys namespace Beefy.sys
{ {
@ -22,10 +23,6 @@ namespace Beefy.sys
public Event<MenuItemUpdateHandler> mOnMenuItemUpdate ~ _.Dispose(); public Event<MenuItemUpdateHandler> mOnMenuItemUpdate ~ _.Dispose();
public List<SysMenu> mChildren ~ DeleteContainerAndItems!(_); public List<SysMenu> mChildren ~ DeleteContainerAndItems!(_);
public this()
{
}
public int ChildCount public int ChildCount
{ {
get get
@ -135,6 +132,8 @@ namespace Beefy.sys
{ {
mWindow.mSysMenuMap.Remove((int)mNativeBFMenu); mWindow.mSysMenuMap.Remove((int)mNativeBFMenu);
mWindow.DeleteMenuItem(mNativeBFMenu); mWindow.DeleteMenuItem(mNativeBFMenu);
if (mParent != null)
mParent.mChildren.Remove(this);
} }
public void UpdateChildItems() public void UpdateChildItems()

5
BeefySysLib/platform/win/WinBFApp.cpp
View file

@ -2131,8 +2131,9 @@ void WinBFWindow::RemoveMenuItem(BFMenu* item)
WinBFMenu* aMenu = (WinBFMenu*) item; WinBFMenu* aMenu = (WinBFMenu*) item;
WinBFMenu* parentMenu = (WinBFMenu*) item->mParent; WinBFMenu* parentMenu = (WinBFMenu*) item->mParent;
//auto itr = mMenuIDMap.find(aMenu->mMenuId); if (parentMenu != NULL)
//mMenuIDMap.erase(itr); parentMenu->mBFMenuList.Remove(item);
mMenuIDMap.Remove(aMenu->mMenuId); mMenuIDMap.Remove(aMenu->mMenuId);
::RemoveMenu(parentMenu->mMenu, aMenu->mMenuId, MF_BYCOMMAND); ::RemoveMenu(parentMenu->mMenu, aMenu->mMenuId, MF_BYCOMMAND);

7
IDE/src/IDEApp.bf
View file

@ -5189,13 +5189,16 @@ namespace IDE
[IDECommand] [IDECommand]
public void ReloadSettings() public void ReloadSettings()
{ {
delete mSettings; var prevSettings = mSettings;
mSettings = new .(); defer delete prevSettings;
mSettings = new .(prevSettings);
DeleteAndNullify!(mKeyChordState); DeleteAndNullify!(mKeyChordState);
mSettings.Load(); mSettings.Load();
mSettings.Apply(); mSettings.Apply();
UpdateRecentFileMenuItems();
UpdateRecentDisplayedFilesMenuItems();
} }
public void CheckReloadSettings() public void CheckReloadSettings()

17
IDE/src/Settings.bf
View file

@ -1106,12 +1106,24 @@ namespace IDE
public bool mEnableDevMode; public bool mEnableDevMode;
public TutorialsFinished mTutorialsFinished = .(); public TutorialsFinished mTutorialsFinished = .();
public this() public this()
{ {
SetDefaults(); SetDefaults();
} }
public this(Settings prevSettings)
{
Swap!(mRecentFiles, prevSettings.mRecentFiles);
for (var recent in mRecentFiles.mRecents)
{
recent.mList.ClearAndDeleteItems();
for (var item in recent.mMenuItems)
item.Dispose();
recent.mMenuItems.ClearAndDeleteItems();
}
}
public void SetDefaults() public void SetDefaults()
{ {
mVSSettings.SetDefaults(); mVSSettings.SetDefaults();
@ -1192,6 +1204,9 @@ namespace IDE
public bool WantsReload() public bool WantsReload()
{ {
if (mSettingFileDateTime == default)
return false;
String path = scope .(); String path = scope .();
GetSettingsPath(path); GetSettingsPath(path);