Skip to content

Commit 41685a6

Browse files
lijy91lijy91
committed
Rename MenuID and MenuItemID to MenuId and MenuItemId
Standardizes type naming for menu and menu item IDs across all platforms by renaming MenuID and MenuItemID to MenuId and MenuItemId. Updates all relevant typedefs, method signatures, and usages in Linux, macOS, and Windows implementations for consistency.
1 parent d05f2af commit 41685a6

File tree

5 files changed

+57
-57
lines changed

5 files changed

+57
-57
lines changed

‎src/menu.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
namespace nativeapi {
1515

16-
typedef long MenuID;
17-
typedef long MenuItemID;
16+
typedef long MenuId;
17+
typedef long MenuItemId;
1818

1919
/**
2020
* @brief Enumeration of different menu item types.
@@ -216,7 +216,7 @@ class MenuItem : public EventEmitter, public NativeObjectProvider {
216216
* This ID is assigned when the item is created and can be used to
217217
* reference the item in event handlers and other operations.
218218
*/
219-
MenuItemID id;
219+
MenuItemId id;
220220

221221
/**
222222
* @brief Get the type of this menu item.
@@ -545,7 +545,7 @@ class Menu : public EventEmitter, public NativeObjectProvider {
545545
* This ID is assigned when the menu is created and can be used to
546546
* reference the menu in various operations.
547547
*/
548-
MenuID id;
548+
MenuId id;
549549

550550
/**
551551
* @brief Add a menu item to the end of the menu.
@@ -592,7 +592,7 @@ class Menu : public EventEmitter, public NativeObjectProvider {
592592
* @param item_id The ID of the menu item to remove
593593
* @return true if the item was found and removed, false otherwise
594594
*/
595-
bool RemoveItemById(MenuItemID item_id);
595+
bool RemoveItemById(MenuItemId item_id);
596596

597597
/**
598598
* @brief Remove a menu item at a specific position.
@@ -652,7 +652,7 @@ class Menu : public EventEmitter, public NativeObjectProvider {
652652
* @param item_id The ID of the menu item to find
653653
* @return Shared pointer to the menu item, or nullptr if not found
654654
*/
655-
std::shared_ptr<MenuItem> GetItemById(MenuItemID item_id) const;
655+
std::shared_ptr<MenuItem> GetItemById(MenuItemId item_id) const;
656656

657657
/**
658658
* @brief Get all menu items in the menu.

‎src/menu_event.h‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
namespace nativeapi {
88

99
// Forward declarations for menu types
10-
typedef long MenuID;
11-
typedef long MenuItemID;
10+
typedef long MenuId;
11+
typedef long MenuItemId;
1212

1313
/**
1414
* @brief Menu opened event.
@@ -17,14 +17,14 @@ typedef long MenuItemID;
1717
*/
1818
class MenuOpenedEvent : public Event {
1919
public:
20-
MenuOpenedEvent(MenuID menu_id) : menu_id_(menu_id) {}
20+
MenuOpenedEvent(MenuId menu_id) : menu_id_(menu_id) {}
2121

22-
MenuID GetMenuId() const { return menu_id_; }
22+
MenuId GetMenuId() const { return menu_id_; }
2323

2424
std::string GetTypeName() const override { return "MenuOpenedEvent"; }
2525

2626
private:
27-
MenuID menu_id_;
27+
MenuId menu_id_;
2828
};
2929

3030
/**
@@ -34,14 +34,14 @@ class MenuOpenedEvent : public Event {
3434
*/
3535
class MenuClosedEvent : public Event {
3636
public:
37-
MenuClosedEvent(MenuID menu_id) : menu_id_(menu_id) {}
37+
MenuClosedEvent(MenuId menu_id) : menu_id_(menu_id) {}
3838

39-
MenuID GetMenuId() const { return menu_id_; }
39+
MenuId GetMenuId() const { return menu_id_; }
4040

4141
std::string GetTypeName() const override { return "MenuClosedEvent"; }
4242

4343
private:
44-
MenuID menu_id_;
44+
MenuId menu_id_;
4545
};
4646

4747
/**
@@ -52,16 +52,16 @@ class MenuClosedEvent : public Event {
5252
*/
5353
class MenuItemClickedEvent : public Event {
5454
public:
55-
MenuItemClickedEvent(MenuItemID item_id, const std::string& item_text)
55+
MenuItemClickedEvent(MenuItemId item_id, const std::string& item_text)
5656
: item_id_(item_id), item_text_(item_text) {}
5757

58-
MenuItemID GetItemId() const { return item_id_; }
58+
MenuItemId GetItemId() const { return item_id_; }
5959
const std::string& GetItemText() const { return item_text_; }
6060

6161
std::string GetTypeName() const override { return "MenuItemClickedEvent"; }
6262

6363
private:
64-
MenuItemID item_id_;
64+
MenuItemId item_id_;
6565
std::string item_text_;
6666
};
6767

@@ -72,14 +72,14 @@ class MenuItemClickedEvent : public Event {
7272
*/
7373
class MenuItemSubmenuOpenedEvent : public Event {
7474
public:
75-
MenuItemSubmenuOpenedEvent(MenuItemID item_id) : item_id_(item_id) {}
75+
MenuItemSubmenuOpenedEvent(MenuItemId item_id) : item_id_(item_id) {}
7676

77-
MenuItemID GetItemId() const { return item_id_; }
77+
MenuItemId GetItemId() const { return item_id_; }
7878

7979
std::string GetTypeName() const override { return "MenuItemSubmenuOpenedEvent"; }
8080

8181
private:
82-
MenuItemID item_id_;
82+
MenuItemId item_id_;
8383
};
8484

8585
/**
@@ -89,14 +89,14 @@ class MenuItemSubmenuOpenedEvent : public Event {
8989
*/
9090
class MenuItemSubmenuClosedEvent : public Event {
9191
public:
92-
MenuItemSubmenuClosedEvent(MenuItemID item_id) : item_id_(item_id) {}
92+
MenuItemSubmenuClosedEvent(MenuItemId item_id) : item_id_(item_id) {}
9393

94-
MenuItemID GetItemId() const { return item_id_; }
94+
MenuItemId GetItemId() const { return item_id_; }
9595

9696
std::string GetTypeName() const override { return "MenuItemSubmenuClosedEvent"; }
9797

9898
private:
99-
MenuItemID item_id_;
99+
MenuItemId item_id_;
100100
};
101101

102102
} // namespace nativeapi

‎src/platform/linux/menu_linux.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
namespace nativeapi {
1414

1515
// Global ID generators
16-
static std::atomic<MenuItemID> g_next_menu_item_id{1};
17-
static std::atomic<MenuID> g_next_menu_id{1};
16+
static std::atomic<MenuItemId> g_next_menu_item_id{1};
17+
static std::atomic<MenuId> g_next_menu_id{1};
1818

1919
// Global registry to map native objects to C++ objects for event emission
20-
static std::unordered_map<MenuItemID, MenuItem*> g_menu_item_registry;
21-
static std::unordered_map<MenuID, Menu*> g_menu_registry;
20+
static std::unordered_map<MenuItemId, MenuItem*> g_menu_item_registry;
21+
static std::unordered_map<MenuId, Menu*> g_menu_registry;
2222

2323
// Private implementation class for MenuItem
2424
class MenuItem::Impl {
@@ -304,7 +304,7 @@ bool Menu::RemoveItem(std::shared_ptr<MenuItem> item) {
304304
return false;
305305
}
306306

307-
bool Menu::RemoveItemById(MenuItemID item_id) {
307+
bool Menu::RemoveItemById(MenuItemId item_id) {
308308
for (auto& item : pimpl_->items_) {
309309
if (item->id == item_id) {
310310
return RemoveItem(item);
@@ -348,7 +348,7 @@ std::shared_ptr<MenuItem> Menu::GetItemAt(size_t index) const {
348348
return nullptr;
349349
}
350350

351-
std::shared_ptr<MenuItem> Menu::GetItemById(MenuItemID item_id) const {
351+
std::shared_ptr<MenuItem> Menu::GetItemById(MenuItemId item_id) const {
352352
for (const auto& item : pimpl_->items_) {
353353
if (item->id == item_id) {
354354
return item;
@@ -464,4 +464,4 @@ void Menu::EmitClosedEvent() {
464464
// TODO: Implement menu closed event emission for GTK
465465
}
466466

467-
} // namespace nativeapi
467+
} // namespace nativeapi

‎src/platform/macos/menu_macos.mm‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
static const void* kMenuIdKey = &kMenuIdKey;
1919

2020
// Forward declarations - moved to global scope
21-
typedef void (^MenuItemClickedBlock)(nativeapi::MenuItemID item_id, const std::string& item_text);
22-
typedef void (^MenuOpenedBlock)(nativeapi::MenuID menu_id);
23-
typedef void (^MenuClosedBlock)(nativeapi::MenuID menu_id);
21+
typedef void (^MenuItemClickedBlock)(nativeapi::MenuItemId item_id, const std::string& item_text);
22+
typedef void (^MenuOpenedBlock)(nativeapi::MenuId menu_id);
23+
typedef void (^MenuClosedBlock)(nativeapi::MenuId menu_id);
2424

2525
@interface NSMenuItemTarget : NSObject
2626
@property(nonatomic, copy) MenuItemClickedBlock clickedBlock;
@@ -35,8 +35,8 @@ @interface NSMenuDelegateImpl : NSObject <NSMenuDelegate>
3535
namespace nativeapi {
3636

3737
// Global ID generators
38-
static std::atomic<MenuItemID> g_next_menu_item_id{1};
39-
static std::atomic<MenuID> g_next_menu_id{1};
38+
static std::atomic<MenuItemId> g_next_menu_item_id{1};
39+
static std::atomic<MenuId> g_next_menu_id{1};
4040

4141
// Removed global registries; events are dispatched via direct back-pointers
4242

@@ -131,10 +131,10 @@ - (void)menuItemClicked:(id)sender {
131131
NSString* title = [menuItem title];
132132
std::string itemText = title ? [title UTF8String] : "";
133133

134-
// Get the MenuItemID from the menu item's associated object
134+
// Get the MenuItemId from the menu item's associated object
135135
NSNumber* itemIdObj = objc_getAssociatedObject(menuItem, kMenuItemIdKey);
136136
if (itemIdObj) {
137-
nativeapi::MenuItemID itemId = [itemIdObj longValue];
137+
nativeapi::MenuItemId itemId = [itemIdObj longValue];
138138
_clickedBlock(itemId, itemText);
139139
}
140140
}
@@ -154,10 +154,10 @@ - (void)menuWillOpen:(NSMenu*)menu {
154154
return;
155155

156156
if (_openedBlock) {
157-
// Get the MenuID from the menu's associated object
157+
// Get the MenuId from the menu's associated object
158158
NSNumber* menuIdObj = objc_getAssociatedObject(menu, kMenuIdKey);
159159
if (menuIdObj) {
160-
nativeapi::MenuID menuId = [menuIdObj longValue];
160+
nativeapi::MenuId menuId = [menuIdObj longValue];
161161
_openedBlock(menuId);
162162
}
163163
}
@@ -173,10 +173,10 @@ - (void)menuDidClose:(NSMenu*)menu {
173173
return;
174174

175175
if (_closedBlock) {
176-
// Get the MenuID from the menu's associated object
176+
// Get the MenuId from the menu's associated object
177177
NSNumber* menuIdObj = objc_getAssociatedObject(menu, kMenuIdKey);
178178
if (menuIdObj) {
179-
nativeapi::MenuID menuId = [menuIdObj longValue];
179+
nativeapi::MenuId menuId = [menuIdObj longValue];
180180
_closedBlock(menuId);
181181
}
182182
}
@@ -207,7 +207,7 @@ - (void)menuDidClose:(NSMenu*)menu {
207207
std::shared_ptr<Menu> submenu_;
208208
size_t submenu_opened_listener_id_;
209209
size_t submenu_closed_listener_id_;
210-
MenuItemID menu_item_id_;
210+
MenuItemId menu_item_id_;
211211

212212
Impl(NSMenuItem* menu_item, MenuItemType type)
213213
: ns_menu_item_(menu_item),
@@ -280,7 +280,7 @@ - (void)menuDidClose:(NSMenu*)menu {
280280
pimpl_->text_ = text.empty() ? std::nullopt : std::optional<std::string>(text);
281281

282282
// 设置默认的 Block 处理器，直接发送事件
283-
pimpl_->ns_menu_item_target_.clickedBlock = ^(MenuItemID item_id, const std::string& item_text) {
283+
pimpl_->ns_menu_item_target_.clickedBlock = ^(MenuItemId item_id, const std::string& item_text) {
284284
try {
285285
EmitSync<MenuItemClickedEvent>(item_id, item_text);
286286
} catch (...) {
@@ -298,7 +298,7 @@ - (void)menuDidClose:(NSMenu*)menu {
298298
OBJC_ASSOCIATION_RETAIN_NONATOMIC);
299299

300300
// 设置默认的 Block 处理器，直接发送事件
301-
pimpl_->ns_menu_item_target_.clickedBlock = ^(MenuItemID item_id, const std::string& item_text) {
301+
pimpl_->ns_menu_item_target_.clickedBlock = ^(MenuItemId item_id, const std::string& item_text) {
302302
try {
303303
EmitSync<MenuItemClickedEvent>(item_id, item_text);
304304
} catch (...) {
@@ -467,10 +467,10 @@ - (void)menuDidClose:(NSMenu*)menu {
467467
continue;
468468
NSObject* targetObj = [sibling target];
469469
if ([targetObj isKindOfClass:[NSMenuItemTarget class]]) {
470-
// Get the MenuItemID from the associated object
470+
// Get the MenuItemId from the associated object
471471
NSNumber* siblingIdObj = objc_getAssociatedObject(sibling, kMenuItemIdKey);
472472
if (siblingIdObj) {
473-
MenuItemID siblingId = [siblingIdObj longValue];
473+
MenuItemId siblingId = [siblingIdObj longValue];
474474
// Find the corresponding MenuItem in the parent menu's items
475475
// This is a simplified approach - in practice, you might need to store
476476
// a reference to the parent menu or use a different strategy
@@ -514,7 +514,7 @@ - (void)menuDidClose:(NSMenu*)menu {
514514
}
515515

516516
// Add event listeners to forward submenu events
517-
MenuItemID menu_item_id = id;
517+
MenuItemId menu_item_id = id;
518518
MenuItem* self = this;
519519
pimpl_->submenu_opened_listener_id_ = submenu->AddListener<MenuOpenedEvent>(
520520
[self, menu_item_id](const MenuOpenedEvent& event) {
@@ -627,15 +627,15 @@ - (void)menuDidClose:(NSMenu*)menu {
627627
objc_setAssociatedObject(nsMenu, kMenuIdKey, [NSNumber numberWithLong:id],
628628
OBJC_ASSOCIATION_RETAIN_NONATOMIC);
629629
// 设置默认的 Block 处理器，直接发送事件
630-
pimpl_->delegate_.openedBlock = ^(MenuID menu_id) {
630+
pimpl_->delegate_.openedBlock = ^(MenuId menu_id) {
631631
try {
632632
EmitSync<MenuOpenedEvent>(menu_id);
633633
} catch (...) {
634634
// Protect against event emission exceptions
635635
}
636636
};
637637

638-
pimpl_->delegate_.closedBlock = ^(MenuID menu_id) {
638+
pimpl_->delegate_.closedBlock = ^(MenuId menu_id) {
639639
try {
640640
EmitSync<MenuClosedEvent>(menu_id);
641641
} catch (...) {
@@ -651,15 +651,15 @@ - (void)menuDidClose:(NSMenu*)menu {
651651
OBJC_ASSOCIATION_RETAIN_NONATOMIC);
652652

653653
// 设置默认的 Block 处理器，直接发送事件
654-
pimpl_->delegate_.openedBlock = ^(MenuID menu_id) {
654+
pimpl_->delegate_.openedBlock = ^(MenuId menu_id) {
655655
try {
656656
EmitSync<MenuOpenedEvent>(menu_id);
657657
} catch (...) {
658658
// Protect against event emission exceptions
659659
}
660660
};
661661

662-
pimpl_->delegate_.closedBlock = ^(MenuID menu_id) {
662+
pimpl_->delegate_.closedBlock = ^(MenuId menu_id) {
663663
try {
664664
EmitSync<MenuClosedEvent>(menu_id);
665665
} catch (...) {
@@ -706,7 +706,7 @@ - (void)menuDidClose:(NSMenu*)menu {
706706
return false;
707707
}
708708

709-
bool Menu::RemoveItemById(MenuItemID item_id) {
709+
bool Menu::RemoveItemById(MenuItemId item_id) {
710710
for (auto it = pimpl_->items_.begin(); it != pimpl_->items_.end(); ++it) {
711711
if ((*it)->id == item_id) {
712712
[pimpl_->ns_menu_ removeItem:(__bridge NSMenuItem*)(*it)->GetNativeObject()];
@@ -752,7 +752,7 @@ - (void)menuDidClose:(NSMenu*)menu {
752752
return pimpl_->items_[index];
753753
}
754754

755-
std::shared_ptr<MenuItem> Menu::GetItemById(MenuItemID item_id) const {
755+
std::shared_ptr<MenuItem> Menu::GetItemById(MenuItemId item_id) const {
756756
for (const auto& item : pimpl_->items_) {
757757
if (item->id == item_id) {
758758
return item;

‎src/platform/windows/menu_windows.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
namespace nativeapi {
1111

1212
// Global ID generators
13-
static std::atomic<MenuItemID> g_next_menu_item_id{1};
14-
static std::atomic<MenuID> g_next_menu_id{1};
13+
static std::atomic<MenuItemId> g_next_menu_item_id{1};
14+
static std::atomic<MenuId> g_next_menu_id{1};
1515

1616
// Helper function to convert KeyboardAccelerator to Windows accelerator
1717
std::pair<UINT, UINT> ConvertAccelerator(
@@ -397,7 +397,7 @@ bool Menu::RemoveItem(std::shared_ptr<MenuItem> item) {
397397
return false;
398398
}
399399

400-
bool Menu::RemoveItemById(MenuItemID item_id) {
400+
bool Menu::RemoveItemById(MenuItemId item_id) {
401401
for (auto it = pimpl_->items_.begin(); it != pimpl_->items_.end(); ++it) {
402402
if ((*it)->id == item_id) {
403403
RemoveMenu(pimpl_->hmenu_, item_id, MF_BYCOMMAND);
@@ -444,7 +444,7 @@ std::shared_ptr<MenuItem> Menu::GetItemAt(size_t index) const {
444444
return pimpl_->items_[index];
445445
}
446446

447-
std::shared_ptr<MenuItem> Menu::GetItemById(MenuItemID item_id) const {
447+
std::shared_ptr<MenuItem> Menu::GetItemById(MenuItemId item_id) const {
448448
for (const auto& item : pimpl_->items_) {
449449
if (item->id == item_id) {
450450
return item;

0 commit comments

Comments
 (0)