From ab1b406278368c1f37a2578cf86f861abeaa1a92 Mon Sep 17 00:00:00 2001 From: Alexei Anoshenko Date: Fri, 1 Jul 2022 18:01:25 +0300 Subject: [PATCH] Bug fixing --- app_styles.css | 9 +++++++++ popup.go | 2 +- viewUtils.go | 13 +++++++------ 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/app_styles.css b/app_styles.css index 2dc290d..57b8ab0 100644 --- a/app_styles.css +++ b/app_styles.css @@ -15,6 +15,15 @@ div { -ms-user-select: none; user-select: none; } + +p, h1, h2, h3, h4, h5, h6, blockquote, code { + -webkit-user-select: text; + -moz-user-select: text; + -ms-user-select: text; + user-select: text; +} + + /* div:focus { outline: none; diff --git a/popup.go b/popup.go index 477b8e0..d2db464 100644 --- a/popup.go +++ b/popup.go @@ -235,7 +235,7 @@ func (popup *popupData) init(view View, params Params) { Style: "ruiPopupLayer", CellVerticalAlign: vAlign, CellHorizontalAlign: hAlign, - Content: popupView, + Content: NewColumnLayout(session, Params{Content: popupView}), MaxWidth: Percent(100), MaxHeight: Percent(100), }) diff --git a/viewUtils.go b/viewUtils.go index a782472..b6d6dff 100644 --- a/viewUtils.go +++ b/viewUtils.go @@ -70,12 +70,13 @@ func IsDisabled(view View, subviewID string) bool { if subviewID != "" { view = ViewByID(view, subviewID) } - - if disabled, _ := boolProperty(view, Disabled, view.Session()); disabled { - return true - } - if parent := view.Parent(); parent != nil { - return IsDisabled(parent, "") + if view != nil { + if disabled, _ := boolProperty(view, Disabled, view.Session()); disabled { + return true + } + if parent := view.Parent(); parent != nil { + return IsDisabled(parent, "") + } } return false }