From 31489dbc0372e60004ee129fec79157e6bf0a7bd Mon Sep 17 00:00:00 2001 From: Alexei Anoshenko <2277098+anoshenko@users.noreply.github.com> Date: Fri, 7 Feb 2025 22:14:21 +0300 Subject: [PATCH] Bug fixing --- app_styles.css | 5 +++++ checkbox.go | 2 +- columnLayout.go | 2 +- gridLayout.go | 6 ------ tabsLayout.go | 2 +- view.go | 9 --------- viewsContainer.go | 5 ----- 7 files changed, 8 insertions(+), 23 deletions(-) diff --git a/app_styles.css b/app_styles.css index 30fd215..09e4dbd 100644 --- a/app_styles.css +++ b/app_styles.css @@ -147,6 +147,11 @@ ul:focus { .ruiListLayout { display: flex; + overflow: auto; +} + +.ruiColumnLayout { + overflow: auto; } .ruiStackLayout { diff --git a/checkbox.go b/checkbox.go index 8328d5b..ce13e1d 100644 --- a/checkbox.go +++ b/checkbox.go @@ -197,7 +197,7 @@ func (button *checkboxData) cssStyle(self View, builder cssBuilder) { builder.add("align-items", "stretch") builder.add("justify-items", "stretch") - button.viewsContainerData.cssStyle(self, builder) + button.viewData.cssStyle(self, builder) } func checkboxHtml(button View, buffer *strings.Builder, checked bool) (int, int) { diff --git a/columnLayout.go b/columnLayout.go index 9f51cec..2a0a64a 100644 --- a/columnLayout.go +++ b/columnLayout.go @@ -140,9 +140,9 @@ func newColumnLayout(session Session) View { func (columnLayout *columnLayoutData) init(session Session) { columnLayout.viewsContainerData.init(session) columnLayout.tag = "ColumnLayout" + columnLayout.systemClass = "ruiColumnLayout" columnLayout.normalize = normalizeColumnLayoutTag columnLayout.changed = columnLayout.propertyChanged - //columnLayout.systemClass = "ruiColumnLayout" } func normalizeColumnLayoutTag(tag PropertyName) PropertyName { diff --git a/gridLayout.go b/gridLayout.go index bad0a78..ff1474c 100644 --- a/gridLayout.go +++ b/gridLayout.go @@ -505,12 +505,6 @@ func gridCellSizes(properties Properties, tag PropertyName, session Session) []S return []SizeUnit{} } -/* -func (gridLayout *gridLayoutData) cssStyle(self View, builder cssBuilder) { - gridLayout.viewsContainerData.cssStyle(self, builder) -} -*/ - // GetCellVerticalAlign returns the vertical align of a GridLayout cell content: TopAlign (0), BottomAlign (1), CenterAlign (2), StretchAlign (3) // If the second argument (subviewID) is not specified or it is "" then a value from the first argument (view) is returned. func GetCellVerticalAlign(view View, subviewID ...string) int { diff --git a/tabsLayout.go b/tabsLayout.go index 99de2c7..24bd036 100644 --- a/tabsLayout.go +++ b/tabsLayout.go @@ -666,7 +666,7 @@ func (tabsLayout *tabsLayoutData) htmlProperties(self View, buffer *strings.Buil } func (tabsLayout *tabsLayoutData) cssStyle(self View, builder cssBuilder) { - tabsLayout.viewsContainerData.cssStyle(self, builder) + tabsLayout.viewData.cssStyle(self, builder) switch tabsLayout.tabsLocation() { case TopTabs: builder.add(`grid-template-rows`, `auto 1fr`) diff --git a/view.go b/view.go index 621296e..2338651 100644 --- a/view.go +++ b/view.go @@ -805,15 +805,6 @@ func (view *viewData) addToCSSStyle(addCSS map[string]string) { func (view *viewData) cssStyle(self View, builder cssBuilder) { view.viewStyle.cssViewStyle(builder, view.session) - /* - switch GetVisibility(view) { - case Invisible: - builder.add(`visibility`, `hidden`) - - case Gone: - builder.add(`display`, `none`) - } - */ if view.addCSS != nil { for tag, value := range view.addCSS { builder.add(tag, value) diff --git a/viewsContainer.go b/viewsContainer.go index 0add036..7bbe473 100644 --- a/viewsContainer.go +++ b/viewsContainer.go @@ -155,11 +155,6 @@ func (container *viewsContainerData) ViewIndex(view View) int { return -1 } -func (container *viewsContainerData) cssStyle(self View, builder cssBuilder) { - container.viewData.cssStyle(self, builder) - builder.add(`overflow`, `auto`) -} - func (container *viewsContainerData) htmlSubviews(self View, buffer *strings.Builder) { if container.views != nil { for _, view := range container.views {