mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Add docs and add isSelected arg

Browse source
This commit is contained in:
Samuel Attard 2017-05-03 20:25:50 +10:00
parent 225ccab3d2
commit 718dc732ad
No known key found for this signature in database
GPG key ID: E89DDE5742D58C4E
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
atom/browser/ui/cocoa/atom_touch_bar.mm
View file

@ -224,6 +224,7 @@ static NSString* const ImageScrubberItemIdentifier = @"scrubber.image.item";
NSString* item_id = [NSString stringWithFormat:@"%ld", ((NSSegmentedControl*)sender).tag]; NSString* item_id = [NSString stringWithFormat:@"%ld", ((NSSegmentedControl*)sender).tag];
base::DictionaryValue details; base::DictionaryValue details;
details.SetInteger("selectedIndex", ((NSSegmentedControl*)sender).selectedSegment); details.SetInteger("selectedIndex", ((NSSegmentedControl*)sender).selectedSegment);
details.SetBoolean("isSelected", [((NSSegmentedControl*)sender) isSelectedForSegment:((NSSegmentedControl*)sender).selectedSegment]);
window_->NotifyTouchBarItemInteraction([item_id UTF8String], window_->NotifyTouchBarItemInteraction([item_id UTF8String],
details); details);
} }

7
docs/api/touch-bar-segmented-control.md
View file

@ -21,10 +21,15 @@ Process: [Main](../tutorial/quick-start.md#main-process)
* `small-square` - The control is displayed using the small square style. * `small-square` - The control is displayed using the small square style.
* `separated` - The segments in the control are displayed very close to each * `separated` - The segments in the control are displayed very close to each
other but not touching. other but not touching.
* `mode` String - (Optional) The selection mode of the control:
* `single` - Default. One item selected at a time, selecting one deselects the previously selected item
* `multiple` - Multiple items can be selected at a time
* `buttons` - Make the segments act as buttons, each segment can be pressed and released but never marked as active
* `segments` [SegmentedControlSegment[]](structures/segmented-control-segment.md) - An array of segments to place in this control * `segments` [SegmentedControlSegment[]](structures/segmented-control-segment.md) - An array of segments to place in this control
* `selectedIndex` Integer (Optional) - The index of the currently selected segment, will update automatically with user interaction * `selectedIndex` Integer (Optional) - The index of the currently selected segment, will update automatically with user interaction. When the mode is multiple will be the last selected item
* `change` Function - Called when the user selects a new segment * `change` Function - Called when the user selects a new segment
* `selectedIndex` Integer - The index of the segment the user selected * `selectedIndex` Integer - The index of the segment the user selected
* `isSelected` Boolean - Whether as a result of user selection the segment is selected or not
### Instance Properties ### Instance Properties

2
lib/browser/api/touch-bar.js
View file

@ -274,7 +274,7 @@ TouchBar.TouchBarSegmentedControl = class TouchBarSegmentedControl extends Touch
if (typeof change === 'function') { if (typeof change === 'function') {
this.onInteraction = (details) => { this.onInteraction = (details) => {
this._selectedIndex = details.selectedIndex this._selectedIndex = details.selectedIndex
change(details.selectedIndex) change(details.selectedIndex, details.isSelected)
} }
} }
} }