-
-
Notifications
You must be signed in to change notification settings - Fork 36
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add toggleStyle modifier with .button and .switch styles (#69)
* Switch now functions as expected, added Switch to GtkCodeGen * Renamed occurances of backendSwitch to switchWidget * Work on merging the two toggle types into one with a modifier * Merged Toggle and Switch into Toggle and added a modifer to change the style * Reworked ControlsExample to be a lot more visually clean * Remove Switch.swift as it is no longer needed * Resolved most requested changes selectedToggleStyle now a var, formatting issues have been fixed Private structs no longer private, init property removed, modifier changed to use variable * One set of pointless parenthesis managed to escape me * Set onChange in the createSwitch function
- Loading branch information
1 parent
ac7de2e
commit 6a053a7
Showing
8 changed files
with
323 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,153 @@ | ||
| import CGtk | ||
|
|
||
| /// `GtkSwitch` is a "light switch" that has two states: on or off. | ||
| /// | ||
| ///  | ||
| /// | ||
| /// The user can control which state should be active by clicking the | ||
| /// empty area, or by dragging the handle. | ||
| /// | ||
| /// `GtkSwitch` can also handle situations where the underlying state | ||
| /// changes with a delay. In this case, the slider position indicates | ||
| /// the user's recent change (as indicated by the [property@Gtk.Switch:active] | ||
| /// property), and the color indicates whether the underlying state (represented | ||
| /// by the [property@Gtk.Switch:state] property) has been updated yet. | ||
| /// | ||
| ///  | ||
| /// | ||
| /// See [signal@Gtk.Switch::state-set] for details. | ||
| /// | ||
| /// # CSS nodes | ||
| /// | ||
| /// ``` | ||
| /// switch | ||
| /// ├── image | ||
| /// ├── image | ||
| /// ╰── slider | ||
| /// ``` | ||
| /// | ||
| /// `GtkSwitch` has four css nodes, the main node with the name switch and | ||
| /// subnodes for the slider and the on and off images. Neither of them is | ||
| /// using any style classes. | ||
| /// | ||
| /// # Accessibility | ||
| /// | ||
| /// `GtkSwitch` uses the %GTK_ACCESSIBLE_ROLE_SWITCH role. | ||
| public class Switch: Widget, Actionable { | ||
| /// Creates a new `GtkSwitch` widget. | ||
| override public init() { | ||
| super.init() | ||
| widgetPointer = gtk_switch_new() | ||
| } | ||
|
|
||
| override func didMoveToParent() { | ||
| removeSignals() | ||
|
|
||
| super.didMoveToParent() | ||
|
|
||
| addSignal(name: "activate") { [weak self] () in | ||
| guard let self = self else { return } | ||
| self.activate?(self) | ||
| } | ||
|
|
||
| let handler1: | ||
| @convention(c) (UnsafeMutableRawPointer, Bool, UnsafeMutableRawPointer) -> Void = | ||
| { _, value1, data in | ||
| SignalBox1<Bool>.run(data, value1) | ||
| } | ||
|
|
||
| addSignal(name: "state-set", handler: gCallback(handler1)) { [weak self] (_: Bool) in | ||
| guard let self = self else { return } | ||
| self.stateSet?(self) | ||
| } | ||
|
|
||
| let handler2: | ||
| @convention(c) (UnsafeMutableRawPointer, OpaquePointer, UnsafeMutableRawPointer) -> Void = | ||
| { _, value1, data in | ||
| SignalBox1<OpaquePointer>.run(data, value1) | ||
| } | ||
|
|
||
| addSignal(name: "notify::active", handler: gCallback(handler2)) { | ||
| [weak self] (_: OpaquePointer) in | ||
| guard let self = self else { return } | ||
| self.notifyActive?(self) | ||
| } | ||
|
|
||
| let handler3: | ||
| @convention(c) (UnsafeMutableRawPointer, OpaquePointer, UnsafeMutableRawPointer) -> Void = | ||
| { _, value1, data in | ||
| SignalBox1<OpaquePointer>.run(data, value1) | ||
| } | ||
|
|
||
| addSignal(name: "notify::state", handler: gCallback(handler3)) { | ||
| [weak self] (_: OpaquePointer) in | ||
| guard let self = self else { return } | ||
| self.notifyState?(self) | ||
| } | ||
|
|
||
| let handler4: | ||
| @convention(c) (UnsafeMutableRawPointer, OpaquePointer, UnsafeMutableRawPointer) -> Void = | ||
| { _, value1, data in | ||
| SignalBox1<OpaquePointer>.run(data, value1) | ||
| } | ||
|
|
||
| addSignal(name: "notify::action-name", handler: gCallback(handler4)) { | ||
| [weak self] (_: OpaquePointer) in | ||
| guard let self = self else { return } | ||
| self.notifyActionName?(self) | ||
| } | ||
|
|
||
| let handler5: | ||
| @convention(c) (UnsafeMutableRawPointer, OpaquePointer, UnsafeMutableRawPointer) -> Void = | ||
| { _, value1, data in | ||
| SignalBox1<OpaquePointer>.run(data, value1) | ||
| } | ||
|
|
||
| addSignal(name: "notify::action-target", handler: gCallback(handler5)) { | ||
| [weak self] (_: OpaquePointer) in | ||
| guard let self = self else { return } | ||
| self.notifyActionTarget?(self) | ||
| } | ||
| } | ||
|
|
||
| /// Whether the `GtkSwitch` widget is in its on or off state. | ||
| @GObjectProperty(named: "active") public var active: Bool | ||
|
|
||
| /// The backend state that is controlled by the switch. | ||
| /// | ||
| /// See [signal@Gtk.Switch::state-set] for details. | ||
| @GObjectProperty(named: "state") public var state: Bool | ||
|
|
||
| @GObjectProperty(named: "action-name") public var actionName: String? | ||
|
|
||
| /// Emitted to animate the switch. | ||
| /// | ||
| /// Applications should never connect to this signal, | ||
| /// but use the [property@Gtk.Switch:active] property. | ||
| public var activate: ((Switch) -> Void)? | ||
|
|
||
| /// Emitted to change the underlying state. | ||
| /// | ||
| /// The ::state-set signal is emitted when the user changes the switch | ||
| /// position. The default handler keeps the state in sync with the | ||
| /// [property@Gtk.Switch:active] property. | ||
| /// | ||
| /// To implement delayed state change, applications can connect to this | ||
| /// signal, initiate the change of the underlying state, and call | ||
| /// [method@Gtk.Switch.set_state] when the underlying state change is | ||
| /// complete. The signal handler should return %TRUE to prevent the | ||
| /// default handler from running. | ||
| /// | ||
| /// Visually, the underlying state is represented by the trough color of | ||
| /// the switch, while the [property@Gtk.Switch:active] property is | ||
| /// represented by the position of the switch. | ||
| public var stateSet: ((Switch) -> Void)? | ||
|
|
||
| public var notifyActive: ((Switch) -> Void)? | ||
|
|
||
| public var notifyState: ((Switch) -> Void)? | ||
|
|
||
| public var notifyActionName: ((Switch) -> Void)? | ||
|
|
||
| public var notifyActionTarget: ((Switch) -> Void)? | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,41 @@ | ||
| /// A control that is either on or off. | ||
| public struct Toggle: ElementaryView, View { | ||
| /// The label to show on the toggle button. | ||
| private var label: String | ||
| /// Whether the button is active or not. | ||
| private var active: Binding<Bool> | ||
| public struct Toggle: View { | ||
| /// The style of toggle shown. | ||
| var selectedToggleStyle: ToggleStyle | ||
| /// The label to be shown on or beside the toggle. | ||
| var label: String | ||
| /// Whether the toggle is active or not. | ||
| var active: Binding<Bool> | ||
|
|
||
| /// Creates a toggle button that displays a custom label. | ||
| /// Creates a toggle that displays a custom label. | ||
| public init(_ label: String, active: Binding<Bool>) { | ||
| self.selectedToggleStyle = .button | ||
| self.label = label | ||
| self.active = active | ||
| } | ||
|
|
||
| public func asWidget<Backend: AppBackend>( | ||
| backend: Backend | ||
| ) -> Backend.Widget { | ||
| return backend.createToggle( | ||
| label: label, | ||
| active: active.wrappedValue, | ||
| onChange: { newValue in | ||
| self.active.wrappedValue = newValue | ||
| } | ||
| ) | ||
| public var body: some View { | ||
| switch selectedToggleStyle { | ||
| case .switch: | ||
| HStack { | ||
| Text(label) | ||
| ToggleSwitch(active: active) | ||
| } | ||
| case .button: | ||
| ToggleButton(label, active: active) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public func update<Backend: AppBackend>( | ||
| _ widget: Backend.Widget, | ||
| backend: Backend | ||
| ) { | ||
| backend.setLabel(ofButton: widget, to: label) | ||
| backend.setIsActive(ofToggle: widget, to: active.wrappedValue) | ||
| backend.setOnChange(ofToggle: widget) { newActiveState in | ||
| active.wrappedValue = newActiveState | ||
| } | ||
| extension Toggle { | ||
| /// Sets the style of the toggle. | ||
| public func toggleStyle(_ selectedToggleStyle: ToggleStyle) -> Toggle { | ||
| var toggle = self | ||
| toggle.selectedToggleStyle = selectedToggleStyle | ||
| return toggle | ||
| } | ||
| } | ||
|
|
||
| public enum ToggleStyle { | ||
| case `switch` | ||
| case button | ||
| } |
Oops, something went wrong.