From 34848f616b1681001e32a74a9c47ea023f4fa8ab Mon Sep 17 00:00:00 2001 From: Sasha Koshka Date: Mon, 9 Jan 2023 21:25:11 -0500 Subject: [PATCH] Moved element core to new package --- elements/basic/button.go | 7 ++++--- elements/basic/label.go | 7 ++++--- elements/basic/test.go | 7 ++++--- elements/{basic => core}/core.go | 2 +- elements/layouts/vertical.go | 1 + 5 files changed, 14 insertions(+), 10 deletions(-) rename elements/{basic => core}/core.go (99%) diff --git a/elements/basic/button.go b/elements/basic/button.go index 0a84002..328976a 100644 --- a/elements/basic/button.go +++ b/elements/basic/button.go @@ -4,10 +4,11 @@ import "image" import "git.tebibyte.media/sashakoshka/tomo" import "git.tebibyte.media/sashakoshka/tomo/theme" import "git.tebibyte.media/sashakoshka/tomo/artist" +import "git.tebibyte.media/sashakoshka/tomo/elements/core" type Button struct { - *Core - core CoreControl + *core.Core + core core.CoreControl pressed bool enabled bool @@ -20,7 +21,7 @@ type Button struct { func NewButton (text string) (element *Button) { element = &Button { enabled: true } - element.Core, element.core = NewCore(element) + element.Core, element.core = core.NewCore(element) element.drawer.SetFace(theme.FontFaceRegular()) element.SetText(text) return diff --git a/elements/basic/label.go b/elements/basic/label.go index a868d93..8500d69 100644 --- a/elements/basic/label.go +++ b/elements/basic/label.go @@ -4,10 +4,11 @@ import "image" import "git.tebibyte.media/sashakoshka/tomo" import "git.tebibyte.media/sashakoshka/tomo/theme" import "git.tebibyte.media/sashakoshka/tomo/artist" +import "git.tebibyte.media/sashakoshka/tomo/elements/core" type Label struct { - *Core - core CoreControl + *core.Core + core core.CoreControl text string drawer artist.TextDrawer @@ -15,7 +16,7 @@ type Label struct { func NewLabel (text string) (element *Label) { element = &Label { } - element.Core, element.core = NewCore(element) + element.Core, element.core = core.NewCore(element) face := theme.FontFaceRegular() element.drawer.SetFace(face) element.SetText(text) diff --git a/elements/basic/test.go b/elements/basic/test.go index 498f0ab..6a45e76 100644 --- a/elements/basic/test.go +++ b/elements/basic/test.go @@ -4,17 +4,18 @@ import "image" import "image/color" import "git.tebibyte.media/sashakoshka/tomo" import "git.tebibyte.media/sashakoshka/tomo/artist" +import "git.tebibyte.media/sashakoshka/tomo/elements/core" // Test is a simple element that can be used as a placeholder. type Test struct { - *Core - core CoreControl + *core.Core + core core.CoreControl } // NewTest creates a new test element. func NewTest () (element *Test) { element = &Test { } - element.Core, element.core = NewCore(element) + element.Core, element.core = core.NewCore(element) element.core.SetMinimumSize(32, 32) return } diff --git a/elements/basic/core.go b/elements/core/core.go similarity index 99% rename from elements/basic/core.go rename to elements/core/core.go index ee09d01..6828824 100644 --- a/elements/basic/core.go +++ b/elements/core/core.go @@ -1,4 +1,4 @@ -package basic +package core import "image" import "image/color" diff --git a/elements/layouts/vertical.go b/elements/layouts/vertical.go index 62fc9df..c196dbb 100644 --- a/elements/layouts/vertical.go +++ b/elements/layouts/vertical.go @@ -2,6 +2,7 @@ package layouts import "git.tebibyte.media/sashakoshka/tomo" import "git.tebibyte.media/sashakoshka/tomo/artist" +import "git.tebibyte.media/sashakoshka/tomo/elements/core" // Vertical lays its children out vertically. It can contain any number of // children. When an child is added to the layout, it can either be set to