From bda315e6870ba8139570fb3eebafab40d7cb683f Mon Sep 17 00:00:00 2001 From: Chris Waldon Date: Tue, 2 Jun 2020 16:26:22 -0400 Subject: [PATCH] example/kitchen: add a button that is {dis,en}abled by the switch This adds a simple button that defaults to being disabled, but can be enabled by toggling the state of the existing Switch widget. Signed-off-by: Chris Waldon --- cmd/go.mod | 2 +- cmd/go.sum | 4 ++-- example/go.mod | 2 +- example/go.sum | 4 ++-- example/kitchen/kitchen.go | 12 ++++++++++++ 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/cmd/go.mod b/cmd/go.mod index 2c0d7b81..2d1e7075 100644 --- a/cmd/go.mod +++ b/cmd/go.mod @@ -3,7 +3,7 @@ module gioui.org/cmd go 1.13 require ( - gioui.org v0.0.0-20200607143106-f710bdf8e8f1 + gioui.org v0.0.0-20200608081650-cc5f8fcffe5e github.com/chromedp/cdproto v0.0.0-20191114225735-6626966fbae4 github.com/chromedp/chromedp v0.5.2 golang.org/x/image v0.0.0-20190802002840-cff245a6509b diff --git a/cmd/go.sum b/cmd/go.sum index 85ac386c..a3093023 100644 --- a/cmd/go.sum +++ b/cmd/go.sum @@ -1,6 +1,6 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -gioui.org v0.0.0-20200607143106-f710bdf8e8f1 h1:mkhlEjXxmINvmSyI+MMwSJUFHFYoBd/7hPvijrO9v/w= -gioui.org v0.0.0-20200607143106-f710bdf8e8f1/go.mod h1:AHI9rFr6AEEHCb8EPVtb/p5M+NMJRKH58IOp8O3Je04= +gioui.org v0.0.0-20200608081650-cc5f8fcffe5e h1:wWD3WymEmOX/OVmZ2Zj1jgr/exF3UOJEgM70R2V14nM= +gioui.org v0.0.0-20200608081650-cc5f8fcffe5e/go.mod h1:AHI9rFr6AEEHCb8EPVtb/p5M+NMJRKH58IOp8O3Je04= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802 h1:1BDTz0u9nC3//pOCMdNH+CiXJVYJh5UQNCOBG7jbELc= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/chromedp/cdproto v0.0.0-20191114225735-6626966fbae4 h1:QD3KxSJ59L2lxG6MXBjNHxiQO2RmxTQ3XcK+wO44WOg= diff --git a/example/go.mod b/example/go.mod index f518d30c..8815deec 100644 --- a/example/go.mod +++ b/example/go.mod @@ -3,7 +3,7 @@ module gioui.org/example go 1.13 require ( - gioui.org v0.0.0-20200607143106-f710bdf8e8f1 + gioui.org v0.0.0-20200608081650-cc5f8fcffe5e github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72 github.com/google/go-github/v24 v24.0.1 diff --git a/example/go.sum b/example/go.sum index efcc6a8c..ba927523 100644 --- a/example/go.sum +++ b/example/go.sum @@ -1,7 +1,7 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -gioui.org v0.0.0-20200607143106-f710bdf8e8f1 h1:mkhlEjXxmINvmSyI+MMwSJUFHFYoBd/7hPvijrO9v/w= -gioui.org v0.0.0-20200607143106-f710bdf8e8f1/go.mod h1:AHI9rFr6AEEHCb8EPVtb/p5M+NMJRKH58IOp8O3Je04= +gioui.org v0.0.0-20200608081650-cc5f8fcffe5e h1:wWD3WymEmOX/OVmZ2Zj1jgr/exF3UOJEgM70R2V14nM= +gioui.org v0.0.0-20200608081650-cc5f8fcffe5e/go.mod h1:AHI9rFr6AEEHCb8EPVtb/p5M+NMJRKH58IOp8O3Je04= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7 h1:SCYMcCJ89LjRGwEa0tRluNRiMjZHalQZrVrvTbPh+qw= github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7/go.mod h1:482civXOzJJCPzJ4ZOX/pwvXBWSnzD4OKMdH4ClKGbk= diff --git a/example/kitchen/kitchen.go b/example/kitchen/kitchen.go index bd89b848..82906822 100644 --- a/example/kitchen/kitchen.go +++ b/example/kitchen/kitchen.go @@ -147,6 +147,7 @@ var ( iconTextButton = new(widget.Clickable) iconButton = new(widget.Clickable) flatBtn = new(widget.Clickable) + disableBtn = new(widget.Clickable) radioButtonsGroup = new(widget.Enum) list = &layout.List{ Axis: layout.Vertical, @@ -266,6 +267,17 @@ func kitchen(gtx layout.Context, th *material.Theme) layout.Dimensions { material.Switch(th, swtch).Layout, ) }), + layout.Rigid(func(gtx C) D { + return layout.Inset{Left: unit.Dp(16)}.Layout(gtx, func(gtx C) D { + text := "enabled" + if !swtch.Value { + text = "disabled" + gtx = gtx.Disabled() + } + btn := material.Button(th, disableBtn, text) + return btn.Layout(gtx) + }) + }), ) }, func(gtx C) D {