mirror of
https://git.sr.ht/~eliasnaur/gio
synced 2026-07-07 02:15:34 +00:00
io/semantic: [API] replace DisabledOp with EnabledOp
The double-negative DisabledOp is harder to understand than a straightforward EnabledOp. Note that the absence of an EnabledOp implies still means that the widget is enabled. Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
@@ -309,11 +309,11 @@ func (c *pointerCollector) semanticSelected(selected bool) {
|
||||
area.semantic.content.selected = selected
|
||||
}
|
||||
|
||||
func (c *pointerCollector) semanticDisabled(disabled bool) {
|
||||
func (c *pointerCollector) semanticEnabled(enabled bool) {
|
||||
areaID := c.currentArea()
|
||||
area := &c.q.areas[areaID]
|
||||
area.semantic.valid = true
|
||||
area.semantic.content.disabled = disabled
|
||||
area.semantic.content.disabled = !enabled
|
||||
}
|
||||
|
||||
func (c *pointerCollector) cursor(cursor pointer.Cursor) {
|
||||
|
||||
+3
-3
@@ -546,11 +546,11 @@ func (q *Router) collect() {
|
||||
} else {
|
||||
pc.semanticSelected(false)
|
||||
}
|
||||
case ops.TypeSemanticDisabled:
|
||||
case ops.TypeSemanticEnabled:
|
||||
if encOp.Data[1] != 0 {
|
||||
pc.semanticDisabled(true)
|
||||
pc.semanticEnabled(true)
|
||||
} else {
|
||||
pc.semanticDisabled(false)
|
||||
pc.semanticEnabled(false)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -78,7 +78,7 @@ func TestSemanticDescription(t *testing.T) {
|
||||
semantic.DescriptionOp("description").Add(&ops)
|
||||
semantic.LabelOp("label").Add(&ops)
|
||||
semantic.Button.Add(&ops)
|
||||
semantic.DisabledOp(true).Add(&ops)
|
||||
semantic.EnabledOp(false).Add(&ops)
|
||||
semantic.SelectedOp(true).Add(&ops)
|
||||
var r Router
|
||||
r.Frame(&ops)
|
||||
|
||||
@@ -36,8 +36,8 @@ const (
|
||||
// boolean state.
|
||||
type SelectedOp bool
|
||||
|
||||
// DisabledOp describes the disabled state.
|
||||
type DisabledOp bool
|
||||
// EnabledOp describes the enabled state.
|
||||
type EnabledOp bool
|
||||
|
||||
func (l LabelOp) Add(o *op.Ops) {
|
||||
data := ops.Write1String(&o.Internal, ops.TypeSemanticLabelLen, string(l))
|
||||
@@ -63,10 +63,10 @@ func (s SelectedOp) Add(o *op.Ops) {
|
||||
}
|
||||
}
|
||||
|
||||
func (d DisabledOp) Add(o *op.Ops) {
|
||||
data := ops.Write(&o.Internal, ops.TypeSemanticDisabledLen)
|
||||
data[0] = byte(ops.TypeSemanticDisabled)
|
||||
if d {
|
||||
func (e EnabledOp) Add(o *op.Ops) {
|
||||
data := ops.Write(&o.Internal, ops.TypeSemanticEnabledLen)
|
||||
data[0] = byte(ops.TypeSemanticEnabled)
|
||||
if e {
|
||||
data[1] = 1
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user