diff options
| author | Ben Clayton <bclayton@google.com> | 2015-06-26 17:33:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-06-26 17:33:45 +0000 |
| commit | bafe1fa8d26758a86e2055836807bb71ef9327f0 (patch) | |
| tree | f77da71527d41518f311cb7bdd7c682d9abc1a1b | |
| parent | d9aa918108d075493c967b321d4b2875b136afe0 (diff) | |
| parent | 0a8c32ea3c5e4afba85aaa6feaeeb22e112c58db (diff) | |
| download | gpu-bafe1fa8d26758a86e2055836807bb71ef9327f0.tar.gz | |
Merge "Use a monospace font for the memory view" into studio-1.4-dev
| -rw-r--r-- | _experimental/client/application_context.go | 5 | ||||
| -rw-r--r-- | _experimental/client/memory_adapter.go | 8 | ||||
| -rw-r--r-- | _experimental/client/theme.go | 6 |
3 files changed, 15 insertions, 4 deletions
diff --git a/_experimental/client/application_context.go b/_experimental/client/application_context.go index 1c4f9c388..f5965a7b4 100644 --- a/_experimental/client/application_context.go +++ b/_experimental/client/application_context.go @@ -32,6 +32,7 @@ import ( "android.googlesource.com/platform/tools/gpu/memory" "android.googlesource.com/platform/tools/gpu/service" "github.com/google/gxui" + "github.com/google/gxui/gxfont" ) const mtu = 1024 @@ -43,6 +44,7 @@ var ( type ApplicationContext struct { Config theme gxui.Theme + monospace gxui.Font logger *log.Splitter rpc service.RPC captureID service.CaptureId @@ -136,9 +138,12 @@ func CreateApplicationContext(theme gxui.Theme, config Config) (*ApplicationCont } rpc := service.CreateClient(rpcSocket, rpcSocket, mtu) + monospace, _ := theme.Driver().CreateFont(gxfont.Monospace, 12) + appCtx := &ApplicationContext{ Config: config, theme: theme, + monospace: monospace, logger: &log.Splitter{}, rpc: rpc, dropDownOverlay: dropDownOverlay, diff --git a/_experimental/client/memory_adapter.go b/_experimental/client/memory_adapter.go index 614874e89..864254323 100644 --- a/_experimental/client/memory_adapter.go +++ b/_experimental/client/memory_adapter.go @@ -103,13 +103,13 @@ func (a *MemoryAdapter) Create(t gxui.Theme, index int) gxui.Control { for len(data) >= dataTypeSize { switch { case interval.Contains(&writes, offset): - ll.AddChild(CreateLabel(t, dataType.Read(data).String()+" ", WRITE_MEMORY_COLOR, true)) + ll.AddChild(CreateMonospaceLabel(a.appCtx, dataType.Read(data).String()+" ", WRITE_MEMORY_COLOR, true)) case interval.Contains(&reads, offset): - ll.AddChild(CreateLabel(t, dataType.Read(data).String()+" ", READ_MEMORY_COLOR, true)) + ll.AddChild(CreateMonospaceLabel(a.appCtx, dataType.Read(data).String()+" ", READ_MEMORY_COLOR, true)) case interval.Contains(&observed, offset): - ll.AddChild(CreateLabel(t, dataType.Read(data).String()+" ", STALE_MEMORY_COLOR, true)) + ll.AddChild(CreateMonospaceLabel(a.appCtx, dataType.Read(data).String()+" ", STALE_MEMORY_COLOR, true)) default: - ll.AddChild(CreateLabel(t, dataType.Unknown()+" ", STALE_MEMORY_COLOR, true)) + ll.AddChild(CreateMonospaceLabel(a.appCtx, dataType.Unknown()+" ", STALE_MEMORY_COLOR, true)) } offset += uint64(dataTypeSize) data = data[dataTypeSize:] diff --git a/_experimental/client/theme.go b/_experimental/client/theme.go index 55fbe11ab..b49d41f44 100644 --- a/_experimental/client/theme.go +++ b/_experimental/client/theme.go @@ -42,3 +42,9 @@ func CreateLabel(t gxui.Theme, s string, c gxui.Color, active bool) gxui.Label { l.SetMargin(math.Spacing{}) return l } + +func CreateMonospaceLabel(appCtx *ApplicationContext, s string, c gxui.Color, active bool) gxui.Label { + l := CreateLabel(appCtx.theme, s, c, active) + l.SetFont(appCtx.monospace) + return l +} |