Moved containers into a separate package

This commit is contained in:
Sasha Koshka
2023-03-16 14:22:56 -04:00
parent c55925d152
commit a4ef28cdd0
22 changed files with 65 additions and 45 deletions

View File

@@ -1,4 +1,4 @@
package basicElements
package containers
import "image"
import "git.tebibyte.media/sashakoshka/tomo/input"
@@ -31,7 +31,7 @@ type Container struct {
// NewContainer creates a new container.
func NewContainer (layout layouts.Layout) (element *Container) {
element = &Container { }
element.theme.Case = theme.C("basic", "container")
element.theme.Case = theme.C("containers", "container")
element.Core, element.core = core.NewCore(element, element.redoAll)
element.Propagator = core.NewPropagator(element, element.core)
element.SetLayout(layout)

View File

@@ -1,4 +1,4 @@
package basicElements
package containers
import "image"
import "git.tebibyte.media/sashakoshka/tomo/theme"
@@ -28,7 +28,7 @@ type DocumentContainer struct {
// NewDocumentContainer creates a new document container.
func NewDocumentContainer () (element *DocumentContainer) {
element = &DocumentContainer { }
element.theme.Case = theme.C("basic", "documentContainer")
element.theme.Case = theme.C("containers", "documentContainer")
element.Core, element.core = core.NewCore(element, element.redoAll)
element.Propagator = core.NewPropagator(element, element.core)
return

View File

@@ -1,4 +1,4 @@
package basicElements
package containers
import "image"
import "git.tebibyte.media/sashakoshka/tomo/input"
@@ -7,6 +7,7 @@ import "git.tebibyte.media/sashakoshka/tomo/config"
import "git.tebibyte.media/sashakoshka/tomo/canvas"
import "git.tebibyte.media/sashakoshka/tomo/elements"
import "git.tebibyte.media/sashakoshka/tomo/elements/core"
import "git.tebibyte.media/sashakoshka/tomo/elements/basic"
// ScrollContainer is a container that is capable of holding a scrollable
// element.
@@ -16,8 +17,8 @@ type ScrollContainer struct {
core core.CoreControl
child elements.Scrollable
horizontal *ScrollBar
vertical *ScrollBar
horizontal *basicElements.ScrollBar
vertical *basicElements.ScrollBar
config config.Wrapped
theme theme.Wrapped
@@ -30,12 +31,12 @@ type ScrollContainer struct {
// bars.
func NewScrollContainer (horizontal, vertical bool) (element *ScrollContainer) {
element = &ScrollContainer { }
element.theme.Case = theme.C("basic", "scrollContainer")
element.theme.Case = theme.C("containers", "scrollContainer")
element.Core, element.core = core.NewCore(element, element.redoAll)
element.Propagator = core.NewPropagator(element, element.core)
if horizontal {
element.horizontal = NewScrollBar(false)
element.horizontal = basicElements.NewScrollBar(false)
element.setUpChild(element.horizontal)
element.horizontal.OnScroll (func (viewport image.Point) {
if element.child != nil {
@@ -49,7 +50,7 @@ func NewScrollContainer (horizontal, vertical bool) (element *ScrollContainer) {
})
}
if vertical {
element.vertical = NewScrollBar(true)
element.vertical = basicElements.NewScrollBar(true)
element.setUpChild(element.vertical)
element.vertical.OnScroll (func (viewport image.Point) {
if element.child != nil {