Skip to content

Commit f19efdd

Browse files
committed
Rename MenuItem text methods to label methods
1 parent ac59dc0 commit f19efdd

File tree

3 files changed

+25
-25
lines changed

3 files changed

+25
-25
lines changed

Sources/NativeAPI/Menu.swift

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,10 @@ public class MenuItem {
171171

172172
/// Create a new menu item.
173173
/// - Parameters:
174-
/// - text: The display text for the menu item
174+
/// - label: The display label for the menu item
175175
/// - type: The type of menu item to create
176-
public init(_ text: String = "", type: MenuItemType = .normal) {
177-
let nativeItem = native_menu_item_create(text, type.nativeValue)
176+
public init(_ label: String = "", type: MenuItemType = .normal) {
177+
let nativeItem = native_menu_item_create(label, type.nativeValue)
178178
self.nativeItem = nativeItem!
179179
}
180180

@@ -201,20 +201,20 @@ public class MenuItem {
201201
return MenuItemType(nativeValue: nativeType)
202202
}
203203

204-
/// Set the display text for the menu item.
205-
/// - Parameter text: The text to display
206-
public func setText(_ text: String) {
207-
native_menu_item_set_text(nativeItem, text)
204+
/// Set the display label for the menu item.
205+
/// - Parameter label: The label to display
206+
public func setLabel(_ label: String) {
207+
native_menu_item_set_label(nativeItem, label)
208208
}
209209

210-
/// Get the current display text of the menu item.
211-
/// - Returns: The current text as a string
212-
public func getText() -> String {
210+
/// Get the current display label of the menu item.
211+
/// - Returns: The current label as a string
212+
public func getLabel() -> String {
213213
let bufferSize = 1024
214214
let buffer = UnsafeMutablePointer<CChar>.allocate(capacity: bufferSize)
215215
defer { buffer.deallocate() }
216216

217-
let result = native_menu_item_get_text(nativeItem, buffer, bufferSize)
217+
let result = native_menu_item_get_label(nativeItem, buffer, bufferSize)
218218
guard result >= 0 else { return "" }
219219

220220
return String(cString: buffer)

Tests/NativeAPITests/MenuTests.swift

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ final class MenuTests: XCTestCase {
1616
func testMenuItemCreation() {
1717
let item = MenuItem("Test Item", type: .normal)
1818
XCTAssertGreaterThan(item.id, 0)
19-
XCTAssertEqual(item.getText(), "Test Item")
19+
XCTAssertEqual(item.getLabel(), "Test Item")
2020
XCTAssertEqual(item.getType(), .normal)
2121
XCTAssertTrue(item.isEnabled())
2222
XCTAssertTrue(item.isVisible())
@@ -40,9 +40,9 @@ final class MenuTests: XCTestCase {
4040
func testMenuItemProperties() {
4141
let item = MenuItem("Test", type: .normal)
4242

43-
// Test text property
44-
item.setText("Updated Text")
45-
XCTAssertEqual(item.getText(), "Updated Text")
43+
// Test label property
44+
item.setLabel("Updated Text")
45+
XCTAssertEqual(item.getLabel(), "Updated Text")
4646

4747
// Test icon property
4848
item.setIcon("test-icon.png")
@@ -108,12 +108,12 @@ final class MenuTests: XCTestCase {
108108
// Test getting items
109109
let retrievedItem = menu.getItemAt(0)
110110
XCTAssertNotNil(retrievedItem)
111-
XCTAssertEqual(retrievedItem?.getText(), "Item 1")
111+
XCTAssertEqual(retrievedItem?.getLabel(), "Item 1")
112112

113113
// Test finding items
114114
let foundItem = menu.findItemByText("Item 2")
115115
XCTAssertNotNil(foundItem)
116-
XCTAssertEqual(foundItem?.getText(), "Item 2")
116+
XCTAssertEqual(foundItem?.getLabel(), "Item 2")
117117

118118
// Test removing items
119119
let removed = menu.removeItem(item1)
@@ -150,9 +150,9 @@ final class MenuTests: XCTestCase {
150150
menu.insertItem(item2, at: 1)
151151

152152
XCTAssertEqual(menu.getItemCount(), 3)
153-
XCTAssertEqual(menu.getItemAt(0)?.getText(), "Item 1")
154-
XCTAssertEqual(menu.getItemAt(1)?.getText(), "Item 2")
155-
XCTAssertEqual(menu.getItemAt(2)?.getText(), "Item 3")
153+
XCTAssertEqual(menu.getItemAt(0)?.getLabel(), "Item 1")
154+
XCTAssertEqual(menu.getItemAt(1)?.getLabel(), "Item 2")
155+
XCTAssertEqual(menu.getItemAt(2)?.getLabel(), "Item 3")
156156
}
157157

158158
func testSubmenus() {
@@ -177,7 +177,7 @@ final class MenuTests: XCTestCase {
177177
let item = MenuItem("Test Item", type: .normal)
178178

179179
item.onClicked { menuItem in
180-
XCTAssertEqual(menuItem.getText(), "Test Item")
180+
XCTAssertEqual(menuItem.getLabel(), "Test Item")
181181
}
182182

183183
menu.addItem(item)
@@ -233,8 +233,8 @@ final class MenuTests: XCTestCase {
233233

234234
let allItems = menu.getAllItems()
235235
XCTAssertEqual(allItems.count, 3)
236-
XCTAssertEqual(allItems[0].getText(), "Item 1")
237-
XCTAssertEqual(allItems[1].getText(), "Item 2")
236+
XCTAssertEqual(allItems[0].getLabel(), "Item 1")
237+
XCTAssertEqual(allItems[1].getLabel(), "Item 2")
238238
XCTAssertEqual(allItems[2].getType(), .separator)
239239
}
240240

@@ -260,7 +260,7 @@ final class MenuTests: XCTestCase {
260260
let removed = menu.removeItemAt(0)
261261
XCTAssertTrue(removed)
262262
XCTAssertEqual(menu.getItemCount(), 1)
263-
XCTAssertEqual(menu.getItemAt(0)?.getText(), "Item 2")
263+
XCTAssertEqual(menu.getItemAt(0)?.getLabel(), "Item 2")
264264
}
265265

266266
func testFindNonExistentItem() {

0 commit comments

Comments
 (0)